From 4a4d40e0fa84b3b341baaf0ae3ee77af3262ba14 Mon Sep 17 00:00:00 2001
From: hheik <4469778+hheik@users.noreply.github.com>
Date: Sun, 25 Dec 2022 18:58:38 +0200
Subject: [PATCH] feat: liquids stabilise a bit better

---
 src/game/debug/terrain.rs |  4 ++--
 src/terrain2d.rs          | 23 +++++++++++------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/game/debug/terrain.rs b/src/game/debug/terrain.rs
index 8bb3409..ee5cd13 100644
--- a/src/game/debug/terrain.rs
+++ b/src/game/debug/terrain.rs
@@ -7,8 +7,8 @@ pub struct TerrainDebugPlugin;
 impl Plugin for TerrainDebugPlugin {
     fn build(&self, app: &mut App) {
         app.insert_resource(TerrainBrush2D::default())
-            .add_system(debug_painter)
-            .add_system_to_stage(TerrainStages::EventHandler, dirty_rect_visualizer);
+            // .add_system_to_stage(TerrainStages::EventHandler, dirty_rect_visualizer)
+            .add_system(debug_painter);
     }
 }
 
diff --git a/src/terrain2d.rs b/src/terrain2d.rs
index 9f76923..d00053b 100644
--- a/src/terrain2d.rs
+++ b/src/terrain2d.rs
@@ -77,17 +77,16 @@ fn terrain_simulation(mut terrain: ResMut<Terrain2D>, frame_counter: Res<FrameCo
         .clone();
 
     for chunk_index in indices.iter() {
-        // // DEBUG: mark few chunks dirty in interval
-        // if let Some(chunk) = terrain.index_to_chunk_mut(&chunk_index) {
-        //     let interval = 2;
-        //     if frame_counter.frame % interval == 0 {
-        //         let i = ((frame_counter.frame / interval) % 100) as i32;
-        //         if (chunk_index.y % 10) * 10 + (chunk_index.x % 10) == i {
-        //             chunk.mark_all_dirty();
-        //             println!("chunk {:?} is now dirty", chunk_index);
-        //         }
-        //     }
-        // };
+        // Mark few chunks dirty in interval. Should help activate stale chunks 
+        if let Some(chunk) = terrain.index_to_chunk_mut(&chunk_index) {
+            let interval = 1;
+            if frame_counter.frame % interval == 0 {
+                let i = ((frame_counter.frame / interval) % 100) as i32;
+                if (chunk_index.y % 10) * 10 + (chunk_index.x % 10) == i {
+                    chunk.mark_all_dirty();
+                }
+            }
+        };
 
         if let Some(rect) = &terrain
             .index_to_chunk(&chunk_index)
@@ -144,7 +143,7 @@ fn terrain_simulation(mut terrain: ResMut<Terrain2D>, frame_counter: Res<FrameCo
 
                             // Check if there is space to the side
                             let mut dirs = vec![Vector2I::RIGHT, Vector2I::LEFT];
-                            if (frame_counter.frame / 3) % 2 == 0 {
+                            if ((frame_counter.frame / 73) % 2) as i32 == global.y % 2 {
                                 dirs.reverse();
                             }
                             for dir in dirs.iter() {