Better snow noise

world/src/column/mod.rs

@@ -175,7 +175,7 @@ impl<'a> Sampler for ColumnGen<'a> {
                 .small_nz
                 .get((wposf_turb.div(150.0)).into_array()) as f32)
                 .abs()
-                .mul(chaos.max(0.1))
+                .mul(chaos.max(0.15))
                 .mul(64.0);
 
         let is_cliffs = sim_chunk.is_cliffs;
@@ -373,7 +373,7 @@ impl<'a> Sampler for ColumnGen<'a> {
             temp.sub(CONFIG.snow_temp)
                 .max(-humidity.sub(CONFIG.desert_hum))
                 .mul(16.0)
-                .add((marble_small - 0.5) * 2.0),
+                .add((marble_small - 0.5) * 0.5),
         );
 
         // Work out if we're on a path or near a town

world/src/sim/mod.rs

@@ -1,13 +1,11 @@
-mod util;
 mod location;
 mod settlement;
+mod util;
 
 // Reexports
 pub use self::location::Location;
 pub use self::settlement::Settlement;
-use self::util::{
-    cdf_irwin_hall, InverseCdf, uniform_idx_as_vec2, uniform_noise,
-};
+use self::util::{cdf_irwin_hall, uniform_idx_as_vec2, uniform_noise, InverseCdf};
 
 use crate::{
     all::ForestKind,
@@ -143,7 +141,7 @@ impl WorldSim {
                 .mul(1.0) as f32
                 + gen_ctx
                     .hill_nz
-                    .get((wposf.div(500.0)).into_array())
+                    .get((wposf.div(400.0)).into_array())
                     .mul(0.3) as f32)
                 .add(0.3)
                 .max(0.0)
@@ -229,7 +227,7 @@ impl WorldSim {
                 (0.0 + alt_main
                     + (gen_ctx.small_nz.get((wposf.div(300.0)).into_array()) as f32)
                         .mul(alt_main.max(0.25))
-                        .mul(0.2))
+                        .mul(0.3))
                 .add(1.0)
                 .mul(0.5)
             };
@@ -239,8 +237,7 @@ impl WorldSim {
             // alt_pre, then multiply by CONFIG.mountain_scale and add to the base and sea level to
             // get an adjusted value, then multiply the whole thing by map_edge_factor
             // (TODO: compute final bounds).
-            (alt_base[posi].1 + alt_main.mul(chaos[posi].1))
-                .mul(map_edge_factor(posi))
+            (alt_base[posi].1 + alt_main.mul(chaos[posi].1)).mul(map_edge_factor(posi))
         });
 
         let gen_cdf = GenCdf {
@@ -533,7 +530,8 @@ impl SimChunk {
 
         let alt_base = alt_base.mul(CONFIG.mountain_scale);
         let alt = CONFIG
-            .sea_level.mul(map_edge_factor)
+            .sea_level
+            .mul(map_edge_factor)
             .add(alt_pre.mul(CONFIG.mountain_scale));
 
         let cliff = gen_ctx.cliff_nz.get((wposf.div(2048.0)).into_array()) as f32 + chaos * 0.2;

world/src/sim/util.rs

@@ -1,8 +1,5 @@
-use common::{
-    terrain::TerrainChunkSize,
-    vol::VolSize,
-};
 use super::WORLD_SIZE;
+use common::{terrain::TerrainChunkSize, vol::VolSize};
 use vek::*;
 
 /// Computes the cumulative distribution function of the weighted sum of k independent,