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

Merge remote-tracking branch 'origin/sharp/jungle' into sharp/jungle

Browse Source
This commit is contained in:
Joshua Yanovski 2019-08-23 01:10:48 +02:00
commit d7f567a862
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
world/src/column/mod.rs
View File

@ -163,13 +163,19 @@ impl<'a> Sampler for ColumnGen<'a> {
*/ */
let river = 0.0; let river = 0.0;
let cliff_hill = let cliff_hill = (sim
(sim.gen_ctx.small_nz.get((wposf.div(128.0)).into_array()) as f32).mul(16.0); .gen_ctx
.small_nz
.get((wposf_turb.div(128.0)).into_array()) as f32)
.mul(24.0);
let riverless_alt = sim.get_interpolated(wpos, |chunk| chunk.alt)? let riverless_alt = sim.get_interpolated(wpos, |chunk| chunk.alt)?
+ (sim.gen_ctx.small_nz.get((wposf.div(256.0)).into_array()) as f32) + (sim
.gen_ctx
.small_nz
.get((wposf_turb.div(150.0)).into_array()) as f32)
.abs() .abs()
.mul(chaos.max(0.15)) .mul(chaos.max(0.1))
.mul(64.0); .mul(64.0);
let is_cliffs = sim_chunk.is_cliffs; let is_cliffs = sim_chunk.is_cliffs;
@ -206,8 +212,8 @@ impl<'a> Sampler for ColumnGen<'a> {
.mul(0.5) .mul(0.5)
.add(marble_small.sub(0.5).mul(0.25)); .add(marble_small.sub(0.5).mul(0.25));
let temp = temp.add((marble - 0.5) * 0.5); let temp = temp.add((marble - 0.5) * 0.25);
let humidity = humidity.add((marble - 0.5) * 0.5); let humidity = humidity.add((marble - 0.5) * 0.25);
// Colours // Colours
let cold_grass = Rgb::new(0.0, 0.5, 0.25); let cold_grass = Rgb::new(0.0, 0.5, 0.25);