add tick clock and tick counter UI #4

half-earth/materials/cursor.tres

@@ -4,6 +4,6 @@
 
 [resource]
 shader = ExtResource( 1 )
-shader_param/lowColor = Color( 1, 0.960784, 0, 1 )
-shader_param/highColor = Color( 0.921569, 0, 1, 1 )
-shader_param/t = null
+shader_param/baseColor = Color( 0.992157, 1, 0, 1 )
+shader_param/highlightColor = Color( 1, 0, 0.984314, 1 )
+shader_param/isHighlighted = 0

half-earth/materials/tile.tres

@@ -5,6 +5,6 @@
 [resource]
 resource_local_to_scene = true
 shader = ExtResource( 1 )
-shader_param/lowColor = Color( 0, 0, 0, 1 )
-shader_param/highColor = Color( 1, 0.560784, 0, 1 )
-shader_param/t = null
+shader_param/baseColor = Color( 0.0823529, 0, 1, 1 )
+shader_param/highlightColor = Color( 1, 0, 0, 1 )
+shader_param/isHighlighted = null

half-earth/nodes/game.tscn

@@ -16,5 +16,4 @@ Grid = NodePath("../Grid")
 
 [node name="Clock" parent="." instance=ExtResource( 4 )]
 
-[connection signal="OnTick" from="Clock" to="Grid" method="_on_Clock_OnTick"]
 [connection signal="OnTick" from="Clock" to="Debug UI" method="_on_Clock_OnTick"]

half-earth/scripts/GridCursor.cs

@@ -8,18 +8,18 @@ public class GridCursor : Sprite
     private WorldGrid _grid;
     private ShaderMaterial _material;
 
-    private const string T = "t";
+    private const string IS_HIGHLIGHTED = "isHighlighted";
 
     public override void _Ready()
     {
         _grid = GetNode<WorldGrid>(Grid);
         _material = (ShaderMaterial)Material;
     }
-
+    
     public override void _Input(InputEvent @event)
     {
         base._Input(@event);
-
+        
         if (@event is InputEventMouseMotion mouseMoveEvent)
         {
             var pos = mouseMoveEvent.Position;
@@ -37,12 +37,12 @@ public class GridCursor : Sprite
                     {
                         var pos = mouseButtonEvent.Position;
                         _grid.GetGridPos(pos, out var x, out var y);
-                        _grid.SetTileValue(x, y, 1.0f);
-                        _material.SetShaderParam(T, 1f);
+                        _grid.ToggleTileHighlight(x, y);
+                        _material.SetShaderParam(IS_HIGHLIGHTED, 1);
                     }
                     else
                     {
-                        _material.SetShaderParam(T, 0f);
+                        _material.SetShaderParam(IS_HIGHLIGHTED, 0);
                     }
                     break;
             }

half-earth/scripts/WorldGrid.cs

@@ -1,6 +1,5 @@
 using Godot;
 using System;
-using System.Collections.Generic;
 
 public class WorldGrid : Node2D
 {
@@ -9,15 +8,11 @@ public class WorldGrid : Node2D
 
     [Export]
     public int Size { get; set; }
-
+    
     [Export]
     public int CellSize { get; set; }
-
-    [Export]
-    public float DiffusionCoefficient { get; set; } = 0.01f;
-
+    
     private Tile[,] _tiles;
-    private float[,] _nextValues = null;
 
     // Called when the node enters the scene tree for the first time.
     public override void _Ready()
@@ -28,18 +23,18 @@ public class WorldGrid : Node2D
     public override void _Process(float delta)
     {
         base._Process(delta);
-
+        
         for (int x = 0; x < Size; x++)
         {
             for (int y = 0; y < Size; y++)
             {
                 var tile = _tiles[x, y];
                 var material = tile.material;
-                material.SetShaderParam("t", tile.value);
+                material.SetShaderParam("isHighlighted", tile.isHighlighted ? 1 : 0);
             }
         }
     }
-
+    
     public bool IsInBounds(int x, int y)
     {
         return x >= 0 && x < Size && y >= 0 && y < Size;
@@ -52,7 +47,7 @@ public class WorldGrid : Node2D
 
         _tiles[x, y].isHighlighted ^= true;
     }
-
+    
     public void SetTileValue(int x, int y, float value)
     {
         _tiles[x, y].value = value;
@@ -80,9 +75,8 @@ public class WorldGrid : Node2D
     private void GenerateGrid(int size)
     {
         this.Clear();
-
+        
         _tiles = new Tile[size, size];
-        _nextValues = new float[size, size];
 
         for (int x = 0; x < size; x++)
         {
@@ -91,7 +85,7 @@ public class WorldGrid : Node2D
                 var tile = new Tile();
                 tile.isHighlighted = false;
                 tile.value = 0.0f;
-
+                
                 var node = TileScene.Instance<Node2D>();
                 this.AddChild(node);
                 var position = new Vector2
@@ -102,67 +96,9 @@ public class WorldGrid : Node2D
                 node.Position = position;
                 var canvasItem = (CanvasItem)node;
                 tile.material = (ShaderMaterial)canvasItem.Material;
-
+                
                 _tiles[x, y] = tile;
             }
         }
     }
-
-    public void _on_Clock_OnTick(int ticks)
-    {
-        Diffuse();
-    }
-
-    private float TransferHeat(float t0, float alpha, float nx, float ny, float px, float py)
-    {
-        float d2tdx2 = nx - 2 * t0 + px;
-        float d2tdy2 = ny - 2 * t0 + py;
-        return t0 + alpha * (d2tdx2 + d2tdy2);
-    }
-
-    private void GetNeighbourTemperatures(int x, int y, out float nx, out float ny, out float px, out float py)
-    {
-        // default value
-        var t = _tiles[x, y].value;
-
-        nx = x > 0 ? _tiles[x - 1, y].value : t;
-        px = x < Size - 1 ? _tiles[x + 1, y].value : t;
-
-        ny = y > 0 ? _tiles[x, y - 1].value : t;
-        py = y < Size - 1 ? _tiles[x, y + 1].value : t;
-    }
-
-    private void Diffuse()
-    {
-
-        for (int x = 0; x < Size; x++)
-        {
-            for (int y = 0; y < Size; y++)
-            {
-                float t = _tiles[x, y].value;
-                var D = DiffusionCoefficient;
-
-                GetNeighbourTemperatures(
-                    x, y,
-                    out var nx,
-                    out var ny,
-                    out var px,
-                    out var py);
-
-                // current value
-                _nextValues[x, y] = TransferHeat(t, D, nx, ny, px, py);
-            }
-        }
-
-        float sum = 0f;
-        for (int x = 0; x < Size; x++)
-        {
-            for (int y = 0; y < Size; y++)
-            {
-                _tiles[x, y].value = _nextValues[x, y];
-                sum += _tiles[x, y].value;
-            }
-        }
-        GD.Print(sum);
-    }
 }

half-earth/shaders/tile_shader.gdshader

@@ -1,9 +1,9 @@
 shader_type canvas_item;
 
-uniform vec4 lowColor : hint_color;
-uniform vec4 highColor : hint_color;
-uniform float t;
+uniform vec4 baseColor : hint_color;
+uniform vec4 highlightColor : hint_color;
+uniform int isHighlighted;
 
 void fragment() {
-	COLOR = mix(lowColor, highColor, t);
+	COLOR = mix(baseColor, highlightColor, float(isHighlighted));
 }