Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better spot altitude

Browse Source
This commit is contained in:
Joshua Barretto 2021-06-23 19:16:48 +01:00
parent 347a9e1fbf
commit ac9187002b
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
world/src/canvas.rs
View File

@ -1,18 +1,18 @@
use crate::{
block::{block_from_structure, ZCache},
column::ColumnSample,
column::{ColumnGen, ColumnSample},
index::IndexRef,
land::Land,
layer::spot::Spot,
sim::{SimChunk, WorldSim},
util::Grid,
util::{Grid, Sampler},
};
use common::{
generation::EntityInfo,
terrain::{Block, Structure, TerrainChunk, TerrainChunkSize},
vol::{ReadVol, RectVolSize, WriteVol},
};
use std::ops::Deref;
use std::{borrow::Cow, ops::Deref};
use vek::*;
#[derive(Copy, Clone)]
@ -37,14 +37,26 @@ impl<'a> CanvasInfo<'a> {
.into()
}
pub fn col(&self, pos: Vec2<i32>) -> Option<&'a ColumnSample> {
pub fn col(&self, wpos: Vec2<i32>) -> Option<&'a ColumnSample> {
self.column_grid
.get(self.column_grid_border + pos - self.wpos())
.get(self.column_grid_border + wpos - self.wpos())
.map(Option::as_ref)
.flatten()
.map(|zc| &zc.sample)
}
/// Attempt to get the data for the given column, generating it if we don't
/// have it.
///
/// This function does not (currently) cache generated columns.
pub fn col_or_gen(&self, wpos: Vec2<i32>) -> Option<Cow<'a, ColumnSample>> {
self.col(wpos).map(Cow::Borrowed).or_else(|| {
Some(Cow::Owned(
ColumnGen::new(self.chunks()).get((wpos, self.index()))?,
))
})
}
pub fn nearby_spots(&self) -> impl Iterator<Item = (Vec2<i32>, Spot, u32)> + '_ {
(-1..2)
.map(|x| (-1..2).map(move |y| Vec2::new(x, y)))

11
world/src/layer/spot.rs
View File

@ -24,14 +24,14 @@ impl Spot {
Spot::Camp,
world,
10.0,
|g, c| g < 0.25 && !c.near_cliffs() && !c.river.near_water(),
|g, c| g < 0.25 && !c.near_cliffs() && !c.river.near_water() && !c.path.0.is_way(),
false,
);
Self::generate_spots(
Spot::BanditCamp,
world,
10.0,
|g, c| g < 0.25 && !c.near_cliffs() && !c.river.near_water(),
|g, c| g < 0.25 && !c.near_cliffs() && !c.river.near_water() && !c.path.0.is_way(),
false,
);
}
@ -90,7 +90,12 @@ pub fn apply_spots_to(canvas: &mut Canvas, dynamic_rng: &mut impl Rng) {
Spot::BanditCamp => {
let structures = Structure::load_group("dungeon_entrances").read();
let structure = structures.choose(&mut rng).unwrap();
let origin = spot_wpos.with_z(canvas.land().get_alt_approx(spot_wpos) as i32);
let origin = spot_wpos.with_z(
canvas
.col_or_gen(spot_wpos)
.map(|c| c.alt as i32)
.unwrap_or(0),
);
canvas.blit_structure(origin, &structure, seed);
let spawn_radius = 12;