From e2b8cbfdd5aae71ebdf71fad6d6cbadf58ad1303 Mon Sep 17 00:00:00 2001
From: griffi-gh <prasol258@gmail.com>
Date: Fri, 17 Feb 2023 22:25:53 +0100
Subject: [PATCH] Better tree gen

---
 kubi-shared/src/worldgen.rs | 14 ++++++++------
 kubi/src/rendering/world.rs |  2 +-
 kubi/src/world/queue.rs     |  3 +++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/kubi-shared/src/worldgen.rs b/kubi-shared/src/worldgen.rs
index 7171773..1227a87 100644
--- a/kubi-shared/src/worldgen.rs
+++ b/kubi-shared/src/worldgen.rs
@@ -114,14 +114,16 @@ pub fn generate_world(chunk_position: IVec3, seed: u64) -> (BlockData, Vec<Queue
       }
       //place trees!
       if rng_map_a[x][z] < 0.001 {
+        //Place wood (no smart_place needed here!)
+        let tree_height = 4 + (rng_map_b[x][z] * 3.).round() as i32;
+        for tree_y in 0..tree_height {
+          if let Some(y) = local_y_position(height + 1 + tree_y, chunk_position) {
+            blocks[x][y][z] = Block::Wood;
+          }
+        }
+        //Place leaf blocks
         if let Some(y) = local_y_position(height + 1, chunk_position) {
           let tree_pos = ivec3(x as i32, y as i32, z as i32);
-          let tree_height = 4 + (rng_map_b[x][z] * 3.).round() as i32;
-          for tree_y in 0..tree_height {
-            if let Some(y) = local_y_position(offset.y + tree_y, chunk_position) {
-              blocks[x][y][z] = Block::Wood;
-            }
-          }
           // Part that wraps around the tree
           {
             let tree_leaf_height = tree_height - 3;
diff --git a/kubi/src/rendering/world.rs b/kubi/src/rendering/world.rs
index 86eccce..77a3082 100644
--- a/kubi/src/rendering/world.rs
+++ b/kubi/src/rendering/world.rs
@@ -142,7 +142,7 @@ pub fn draw_current_chunk_border(
         Quat::default(), 
         world_position
       ).to_cols_array_2d(),
-      color: [0.15f32; 4],
+      color: [0.25f32; 4],
       view: view,
       perspective: perspective,
     },
diff --git a/kubi/src/world/queue.rs b/kubi/src/world/queue.rs
index 1af456c..670e909 100644
--- a/kubi/src/world/queue.rs
+++ b/kubi/src/world/queue.rs
@@ -32,6 +32,9 @@ pub fn apply_queued_blocks(
   //maybe i need to check for desired/current state here before marking as  dirty?
   queue.queue.retain(|&event| {
     if let Some(block) = world.get_block_mut(event.position) {
+      if event.soft && *block != Block::Air {
+        return false
+      }
       *block = event.value;
       //mark chunk as dirty
       let (chunk_pos, block_pos) = ChunkStorage::to_chunk_coords(event.position);