activated activateneighbors experiment

FOU.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.5.1">
+<Project Sdk="Godot.NET.Sdk/4.4.1">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>

FOU.csproj.old.1

@@ -1,12 +0,0 @@
-<Project Sdk="Godot.NET.Sdk/4.4.1">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <EnableDynamicLoading>true</EnableDynamicLoading>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="benchmark.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="UI\" />
-  </ItemGroup>
-</Project>

Scenes/main.tscn

@@ -87,10 +87,3 @@ size_flags_vertical = 1
 max_value = 10.0
 step = 0.01
 value = 1.0
-
-[node name="ToolbarMarginContainer2" parent="CanvasLayer/TopUI" instance=ExtResource("5_kry3j")]
-layout_mode = 0
-offset_left = 860.0
-offset_top = 5.0
-offset_right = 1060.0
-offset_bottom = 69.0

Scripts/Chunk.cs

@@ -13,7 +13,6 @@ public class Chunk {
     public Chunk NeighborS = null;
     public Chunk NeighborW = null;
 
-    private readonly Image image;
     private readonly int sizeX;
     private readonly int sizeY;
     private readonly HashSet<Element> activeElements;
@@ -33,9 +32,6 @@ public class Chunk {
         }
 
         activeElements = new HashSet<Element>(sizeX * sizeY);
-
-        image = Image.CreateEmpty(sizeX, sizeY, false, Image.Format.Rgb8);
-        image.Fill(Colors.Black);
     }
 
     public void Update() {
@@ -90,10 +86,6 @@ public class Chunk {
         return activeElements.Count;
     }
 
-    public void Swap(Element what, Vector2I pos) {
-        Swap(what, Get(pos));
-    }
-
     public Element Get(Vector2I pos) {
         Element e = null;
 
@@ -129,6 +121,10 @@ public class Chunk {
         return Get(pos)?.GetType() == typeof(Element);
     }
 
+    public void Swap(Element what, Vector2I pos) {
+        Swap(what, Get(pos));
+    }
+
     private void Swap(Element what, Element swapTo) {
         if (what == null || swapTo == null) {
             GD.PrintErr("Trying to swap null");
@@ -155,8 +151,16 @@ public class Chunk {
 
         what.Active = true;
         what.Moved();
+        if (what.IsEmpty())
+            what.ActivateNeighbors();
+
         swapTo.Active = true;
         swapTo.Moved();
+        if (swapTo.IsEmpty())
+            swapTo.ActivateNeighbors();
+
+        // TODO:
+        // if either "what" or "swapTo" is empty, re-activate all neighbors of the now empty ones
     }
 
     public override string ToString() {

Scripts/Elements/Element.cs

@@ -131,4 +131,23 @@ public class Element{
     public bool IsEmpty() {
         return GetType() == typeof(Element);
     }
+
+    public virtual void ActivateNeighbors() {
+
+        Element n = Chunk.Get(Position + Vector2I.Up);
+        if (n != null && !n.IsEmpty())
+            n.Active = true;
+        //
+        // Element e = Chunk.Get(Position + Vector2I.Right);
+        // if (e != null && !e.IsEmpty())
+        //     e.Active = true;
+        //
+        // Element s = Chunk.Get(Position + Vector2I.Down);
+        // if (null != s && !s.IsEmpty())
+        //     s.Active = true;
+        //
+        // Element w = Chunk.Get(Position + Vector2I.Left);
+        // if (null != w && !w.IsEmpty())
+        //     w.Active = true;
+    }
 }

Scripts/Elements/Liquid.cs

@@ -24,11 +24,30 @@ public abstract class Liquid : Element {
 
         if (Chunk.IsEmpty(Position + Vector2I.Down))
             Chunk.Swap(this, Position + Vector2I.Down);
+        else if (Chunk.IsEmpty(Position + randomDirection))
+            Chunk.Swap(this, Position + randomDirection);
+        else if (Chunk.IsEmpty(Position + randomDirection * VERTICAL_OPPOSITE))
+            Chunk.Swap(this, Position + randomDirection * VERTICAL_OPPOSITE);
 
         else if (Chunk.IsEmpty(Position + randomDirection))
-            Chunk.Swap(this, Position + Vector2I.Right * randomDirection);
+            Chunk.Swap(this, Position + Vector2I.Right + randomDirection);
+        else if (Chunk.IsEmpty(Position - randomDirection))
+            Chunk.Swap(this, Position + Vector2I.Right + randomDirection * VERTICAL_OPPOSITE);
+    }
 
-        else if (Chunk.IsEmpty(Position + randomDirection))
+    public override void ActivateNeighbors() {
-            Chunk.Swap(this, Position + Vector2I.Right * randomDirection * VERTICAL_OPPOSITE);
+
+        Element n = Chunk.Get(Position + Vector2I.Up);
+        if (n != null && !n.IsEmpty())
+            n.Active = true;
+
+        // only activate liquids left or right
+        Element e = Chunk.Get(Position + Vector2I.Right);
+        if (e != null && e.GetType() == typeof(Liquid))
+            e.Active = true;
+
+        Element s = Chunk.Get(Position + Vector2I.Down);
+        if (null != s && s.GetType() == typeof(Liquid))
+            s.Active = true;
     }
 }

project.godot

@@ -12,7 +12,7 @@ config_version=5
 
 config/name="FOU"
 run/main_scene="res://Scenes/main.tscn"
-config/features=PackedStringArray("4.5", "C#", "Forward Plus")
+config/features=PackedStringArray("4.4", "C#", "Forward Plus")
 config/icon="res://icon.svg"
 
 [dotnet]