Compare commits

...

5 Commits

Author SHA1 Message Date
Cat Flynn 3bebca8b2d add settings for vscode 2022-12-07 01:10:59 +01:00
Cat Flynn 2344594267 add basic heat transfer #4 2022-12-07 00:10:08 +00:00
Cat Flynn 500fa6ddb8 generalise shader #4 2022-12-07 00:08:38 +00:00
Cat Flynn d044beb3d5 add tick clock and tick counter UI #4 2022-12-07 00:08:38 +00:00
Cat Flynn 4090ac732e extract struct to file 2022-12-07 00:08:38 +00:00
12 changed files with 185 additions and 31 deletions

4
half-earth/.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"editor.formatOnSave": true,
"editor.formatOnType": true
}

View File

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

View File

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

View File

@ -0,0 +1,6 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://scripts/Clock.cs" type="Script" id=1]
[node name="Clock" type="Node"]
script = ExtResource( 1 )

View File

@ -0,0 +1,22 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://scripts/DebugUI.cs" type="Script" id=1]
[node name="Debug UI" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 1 )
TicksLabelPath = NodePath("Ticks")
[node name="Ticks" type="Label" parent="."]
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_right = -10.0
margin_bottom = -10.0
grow_horizontal = 0
grow_vertical = 0
text = "ticks: 0"
align = 2
valign = 2

View File

@ -1,11 +1,20 @@
[gd_scene load_steps=3 format=2]
[gd_scene load_steps=5 format=2]
[ext_resource path="res://nodes/grid.tscn" type="PackedScene" id=1]
[ext_resource path="res://nodes/grid_cursor.tscn" type="PackedScene" id=2]
[ext_resource path="res://nodes/debug_ui.tscn" type="PackedScene" id=3]
[ext_resource path="res://nodes/clock.tscn" type="PackedScene" id=4]
[node name="Root" type="Node2D"]
[node name="Root" type="Node"]
[node name="Grid" parent="." instance=ExtResource( 1 )]
[node name="Cursor" parent="." instance=ExtResource( 2 )]
Grid = NodePath("../Grid")
[node name="Debug UI" parent="." instance=ExtResource( 3 )]
[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"]

View File

@ -0,0 +1,31 @@
using Godot;
using System;
public class Clock : Node
{
[Signal]
delegate void OnTick(int ticks);
private int _ticks = 0;
public override void _Input(InputEvent @event)
{
base._Input(@event);
if (@event is InputEventKey keyEvent && keyEvent.Pressed)
{
switch ((KeyList)keyEvent.Scancode)
{
case KeyList.Space:
Tick();
break;
}
}
}
private void Tick()
{
_ticks++;
EmitSignal(nameof(OnTick), _ticks);
}
}

View File

@ -0,0 +1,22 @@
using Godot;
using System;
public class DebugUI : Control
{
[Export]
public NodePath TicksLabelPath { private get; set; }
private Label _ticksLabel;
public override void _Ready()
{
_ticksLabel = GetNode<Label>(TicksLabelPath);
SetTicksText(0);
}
public void _on_Clock_OnTick(int ticks) => SetTicksText(ticks);
private void SetTicksText(int ticks)
{
_ticksLabel.Text = $"ticks: {ticks}";
}
}

View File

@ -8,7 +8,7 @@ public class GridCursor : Sprite
private WorldGrid _grid;
private ShaderMaterial _material;
private const string IS_HIGHLIGHTED = "isHighlighted";
private const string T = "t";
public override void _Ready()
{
@ -37,12 +37,12 @@ public class GridCursor : Sprite
{
var pos = mouseButtonEvent.Position;
_grid.GetGridPos(pos, out var x, out var y);
_grid.ToggleTileHighlight(x, y);
_material.SetShaderParam(IS_HIGHLIGHTED, 1);
_grid.SetTileValue(x, y, 1.0f);
_material.SetShaderParam(T, 1f);
}
else
{
_material.SetShaderParam(IS_HIGHLIGHTED, 0);
_material.SetShaderParam(T, 0f);
}
break;
}

View File

@ -0,0 +1,8 @@
using Godot;
public struct Tile
{
public bool isHighlighted;
public float value;
public ShaderMaterial material;
}

View File

@ -12,12 +12,11 @@ public class WorldGrid : Node2D
[Export]
public int CellSize { get; set; }
private struct Tile
{
public bool isHighlighted;
public ShaderMaterial material;
}
[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()
@ -35,7 +34,7 @@ public class WorldGrid : Node2D
{
var tile = _tiles[x, y];
var material = tile.material;
material.SetShaderParam("isHighlighted", tile.isHighlighted ? 1 : 0);
material.SetShaderParam("t", tile.value);
}
}
}
@ -53,6 +52,11 @@ public class WorldGrid : Node2D
_tiles[x, y].isHighlighted ^= true;
}
public void SetTileValue(int x, int y, float value)
{
_tiles[x, y].value = value;
}
public void GetGridPos(Vector2 position, out int x, out int y)
{
x = Mathf.FloorToInt(position.x / CellSize);
@ -77,6 +81,7 @@ public class WorldGrid : Node2D
this.Clear();
_tiles = new Tile[size, size];
_nextValues = new float[size, size];
for (int x = 0; x < size; x++)
{
@ -84,6 +89,7 @@ public class WorldGrid : Node2D
{
var tile = new Tile();
tile.isHighlighted = false;
tile.value = 0.0f;
var node = TileScene.Instance<Node2D>();
this.AddChild(node);
@ -100,4 +106,50 @@ public class WorldGrid : Node2D
}
}
}
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);
}
}
}
}

View File

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