From e671d8473c775ba6fdcf7794228cd7626c71db8b Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Mon, 10 Jun 2019 16:16:54 +0100
Subject: [PATCH] Bluer snow, altered rock colour

---
 voxygen/shaders/terrain.vert            | 2 +-
 voxygen/src/render/pipelines/terrain.rs | 6 +++---
 world/src/block/mod.rs                  | 8 ++++----
 world/src/column/mod.rs                 | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/voxygen/shaders/terrain.vert b/voxygen/shaders/terrain.vert
index 1a448dbba3..7b1d416925 100644
--- a/voxygen/shaders/terrain.vert
+++ b/voxygen/shaders/terrain.vert
@@ -28,7 +28,7 @@ void main() {
 		float((v_col_light >>  8) & 0xFFu),
 		float((v_col_light >> 16) & 0xFFu),
 		float((v_col_light >> 24) & 0xFFu)
-	) / 255.0;
+	) / 200.0;
 
 	f_light = float(v_col_light & 0xFFu) / 255.0;
 
diff --git a/voxygen/src/render/pipelines/terrain.rs b/voxygen/src/render/pipelines/terrain.rs
index 324767b735..83d7c9b554 100644
--- a/voxygen/src/render/pipelines/terrain.rs
+++ b/voxygen/src/render/pipelines/terrain.rs
@@ -53,9 +53,9 @@ impl Vertex {
                 | ((pos.z as u32) & 0x1FFF) << 16
                 | ((norm_bits as u32) & 0x7) << 29,
             col_light: 0
-                | ((col.r.mul(255.0) as u32) & 0xFF) << 8
-                | ((col.g.mul(255.0) as u32) & 0xFF) << 16
-                | ((col.b.mul(255.0) as u32) & 0xFF) << 24
+                | ((col.r.mul(200.0) as u32) & 0xFF) << 8
+                | ((col.g.mul(200.0) as u32) & 0xFF) << 16
+                | ((col.b.mul(200.0) as u32) & 0xFF) << 24
                 | ((light.mul(255.0) as u32) & 0xFF) << 0,
         }
     }
diff --git a/world/src/block/mod.rs b/world/src/block/mod.rs
index 48c6f521fc..0d8f6014d4 100644
--- a/world/src/block/mod.rs
+++ b/world/src/block/mod.rs
@@ -62,16 +62,16 @@ impl<'a> Sampler for BlockGen<'a> {
         let warp = (self.world.sim()
             .gen_ctx
             .warp_nz
-            .get((wposf.div(Vec3::new(120.0, 120.0, 140.0))).into_array())
+            .get((wposf.div(Vec3::new(150.0, 150.0, 150.0))).into_array())
             as f32)
             .mul((chaos - 0.1).max(0.0))
-            .mul(120.0);
+            .mul(130.0);
 
         let is_cliff = if cliff > 0.0 {
             (self.world.sim()
             .gen_ctx
             .warp_nz
-            .get((wposf.div(Vec3::new(300.0, 300.0, 800.0))).into_array())
+            .get((wposf.div(Vec3::new(300.0, 300.0, 1500.0))).into_array())
             as f32) * cliff > 0.3
         } else {
             false
@@ -105,7 +105,7 @@ impl<'a> Sampler for BlockGen<'a> {
         let dirt = Block::new(1, Rgb::new(128, 90, 0));
         let sand = Block::new(1, Rgb::new(180, 150, 50));
         let water = Block::new(1, Rgb::new(100, 150, 255));
-        let warm_stone = Block::new(1, Rgb::new(165, 165, 90));
+        let warm_stone = Block::new(1, Rgb::new(165, 165, 130));
 
         let block = if (wposf.z as f32) < height - 2.0 {
             // Underground
diff --git a/world/src/column/mod.rs b/world/src/column/mod.rs
index fc625b5d67..7faa8b104d 100644
--- a/world/src/column/mod.rs
+++ b/world/src/column/mod.rs
@@ -65,7 +65,7 @@ impl<'a> Sampler for ColumnGen<'a> {
         let warm_stone = Rgb::new(0.65, 0.65, 0.35);
         let beach_sand = Rgb::new(0.93, 0.84, 0.4);
         let desert_sand = Rgb::new(0.98, 0.8, 0.15);
-        let snow = Rgb::broadcast(1.0);
+        let snow = Rgb::new(0.9, 0.9, 1.3);
 
         let grass = Rgb::lerp(cold_grass, warm_grass, marble);
         let sand = Rgb::lerp(beach_sand, desert_sand, marble);