From de4938ee6a665fd489ab95d95151321a300e2f02 Mon Sep 17 00:00:00 2001
From: griffi-gh <prasol258@gmail.com>
Date: Fri, 17 Feb 2023 22:03:45 +0100
Subject: [PATCH] soft updates

---
 kubi-shared/src/worldgen.rs | 4 +++-
 kubi/src/block_placement.rs | 1 +
 kubi/src/rendering/world.rs | 2 +-
 kubi/src/world/loading.rs   | 1 +
 kubi/src/world/queue.rs     | 4 +++-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/kubi-shared/src/worldgen.rs b/kubi-shared/src/worldgen.rs
index 1ba5515..7171773 100644
--- a/kubi-shared/src/worldgen.rs
+++ b/kubi-shared/src/worldgen.rs
@@ -118,7 +118,9 @@ pub fn generate_world(chunk_position: IVec3, seed: u64) -> (BlockData, Vec<Queue
           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 {
-            smart_place(&mut blocks, tree_pos + IVec3::Y * tree_y, Block::Wood);
+            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
           {
diff --git a/kubi/src/block_placement.rs b/kubi/src/block_placement.rs
index 7b2b93c..324a08c 100644
--- a/kubi/src/block_placement.rs
+++ b/kubi/src/block_placement.rs
@@ -69,6 +69,7 @@ fn block_placement_system(
     block_event_queue.push(BlockUpdateEvent {
       position: place_position,
       value: place_block,
+      soft: place_block != Block::Air,
     });
     //send event
     entities.add_entity(
diff --git a/kubi/src/rendering/world.rs b/kubi/src/rendering/world.rs
index 77a3082..86eccce 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.25f32; 4],
+      color: [0.15f32; 4],
       view: view,
       perspective: perspective,
     },
diff --git a/kubi/src/world/loading.rs b/kubi/src/world/loading.rs
index 8866058..0b7338c 100644
--- a/kubi/src/world/loading.rs
+++ b/kubi/src/world/loading.rs
@@ -203,6 +203,7 @@ fn process_completed_tasks(
           queue.push(BlockUpdateEvent {
             position: event.position,
             value: event.block_type,
+            soft: true,
           });
         }
 
diff --git a/kubi/src/world/queue.rs b/kubi/src/world/queue.rs
index 718228c..1af456c 100644
--- a/kubi/src/world/queue.rs
+++ b/kubi/src/world/queue.rs
@@ -7,7 +7,9 @@ use super::ChunkStorage;
 #[derive(Clone, Copy, Debug)]
 pub struct BlockUpdateEvent {
   pub position: IVec3,
-  pub value: Block
+  pub value: Block,
+  //Only replace air blocks
+  pub soft: bool,
 }
 
 #[derive(Unique, Default, Clone)]