From 80635cd596e8be47dd66af96985716d553af21c9 Mon Sep 17 00:00:00 2001
From: griffi-gh <prasol258@gmail.com>
Date: Sat, 18 Feb 2023 00:58:31 +0100
Subject: [PATCH] river generation

---
 kubi-shared/src/block.rs    |  8 ++++++++
 kubi-shared/src/worldgen.rs | 33 +++++++++++++++++++++++++++------
 kubi/src/prefabs.rs         |  1 +
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/kubi-shared/src/block.rs b/kubi-shared/src/block.rs
index 558e1df..c428078 100644
--- a/kubi-shared/src/block.rs
+++ b/kubi-shared/src/block.rs
@@ -19,6 +19,7 @@ pub enum BlockTexture {
   GrassSideSnow,
   Cobblestone,
   Planks,
+  WaterSolid,
 }
 
 #[derive(Encode, Decode, Clone, Copy, Debug, PartialEq, Eq, EnumIter)]
@@ -36,6 +37,7 @@ pub enum Block {
   Torch,
   Wood,
   Leaf,
+  Water,
 }
 
 impl Block {
@@ -118,6 +120,12 @@ impl Block {
         collision: CollisionType::Solid,
         raycast_collision: true,
       },
+      Self::Water => BlockDescriptor {
+        name: "water",
+        render: RenderType::BinaryTransparency(CubeTexture::all(BlockTexture::WaterSolid)),
+        collision: CollisionType::None,
+        raycast_collision: false,
+      },
     }
   }
 }
diff --git a/kubi-shared/src/worldgen.rs b/kubi-shared/src/worldgen.rs
index 382b094..09cb993 100644
--- a/kubi-shared/src/worldgen.rs
+++ b/kubi-shared/src/worldgen.rs
@@ -125,11 +125,13 @@ pub fn generate_world(chunk_position: IVec3, seed: u64) -> (BlockData, Vec<Queue
         }
         //Generate rivers
         {
+          let river_width = (height as f32 / -5.).clamp(0.5, 1.);
           let river_value = river_noise.get_noise(noise_x, noise_y);
-          if (-0.00625..0.00625).contains(&(river_value.powi(2))) {
+          if ((-0.00625 * river_width)..(0.00625 * river_width)).contains(&(river_value.powi(2))) {
             is_surface = false;
-            river_fill_height = Some(height);
-            height -= (15. * (0.00625 - river_value.powi(2)) * (1. / 0.00625)).round() as i32;
+            river_fill_height = Some(height - 1);
+            //river_fill_height = Some(-3);
+            height -= (river_width * 15. * ((0.00625 * river_width) - river_value.powi(2)) * (1. / (0.00625 * river_width))).round() as i32;
           }
         }
         //Generate ravines
@@ -163,9 +165,28 @@ pub fn generate_world(chunk_position: IVec3, seed: u64) -> (BlockData, Vec<Queue
           within_heightmap = true;
         }
       } else {
-        for y in 0..local_height(height, chunk_position) {
-          blocks[x][y][z] = Block::Stone;
-          within_heightmap = true;
+        if let Some(river_fill_height) = river_fill_height {
+          //Place water
+          for y in 0..local_height(river_fill_height, chunk_position) {
+            blocks[x][y][z] = Block::Water;
+            within_heightmap = true;
+          }
+          //Place stone
+          for y in 0..local_height(height - 1, chunk_position) {
+            blocks[x][y][z] = Block::Stone;
+            within_heightmap = true;
+          }
+          //Place dirt
+          if let Some(y) = local_y_position(height, chunk_position) {
+            blocks[x][y][z] = Block::Dirt;
+            within_heightmap = true;
+          }
+        } else {
+          //Place stone
+          for y in 0..local_height(height, chunk_position) {
+            blocks[x][y][z] = Block::Stone;
+            within_heightmap = true;
+          }
         }
       }
     }
diff --git a/kubi/src/prefabs.rs b/kubi/src/prefabs.rs
index c1ec11b..118b93c 100644
--- a/kubi/src/prefabs.rs
+++ b/kubi/src/prefabs.rs
@@ -31,6 +31,7 @@ impl AssetPaths for BlockTexture {
       Self::GrassSideSnow => "grass_side_snow.png",
       Self::Cobblestone   => "cobblestone.png",
       Self::Planks        => "planks.png",
+      Self::WaterSolid    => "solid_water.png",
     }
   }
 }