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

Improved z caching

Browse Source
This commit is contained in:
Joshua Barretto 2019-07-05 21:37:38 +01:00
parent 3623871775
commit abd07aea09
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
world/src/block/mod.rs
View File

@ -82,10 +82,11 @@ impl<'a> BlockGen<'a> {
column_gen, column_gen,
} = self; } = self;
// Main sample
let sample = Self::sample_column(column_gen, column_cache, wpos)?; let sample = Self::sample_column(column_gen, column_cache, wpos)?;
// Tree samples
let mut tree_samples = [None, None, None, None, None, None, None, None, None]; let mut tree_samples = [None, None, None, None, None, None, None, None, None];
for i in 0..tree_samples.len() { for i in 0..tree_samples.len() {
tree_samples[i] = Self::sample_column( tree_samples[i] = Self::sample_column(
column_gen, column_gen,
@ -129,6 +130,7 @@ impl<'a> BlockGen<'a> {
let tree_samples = &z_cache?.tree_samples; let tree_samples = &z_cache?.tree_samples;
let wpos2d = Vec2::from(wpos);
let wposf = wpos.map(|e| e as f64); let wposf = wpos.map(|e| e as f64);
let (definitely_underground, height, water_height) = let (definitely_underground, height, water_height) =
@ -318,7 +320,8 @@ impl<'a> BlockGen<'a> {
if tree_sample.tree_density if tree_sample.tree_density
> 0.5 + (*tree_seed as f32 / 1000.0).fract() * 0.2 > 0.5 + (*tree_seed as f32 / 1000.0).fract() * 0.2
&& tree_sample.alt > tree_sample.water_level && tree_sample.alt > tree_sample.water_level
&& tree_sample.spawn_rate > 0.5 => && tree_sample.spawn_rate > 0.5
&& wpos2d.distance_squared(*tree_pos) < 20 * 20 =>
{ {
let cliff_height = Self::get_cliff_height( let cliff_height = Self::get_cliff_height(
column_gen, column_gen,