Compare commits

..

No commits in common. "17db704a81dc831cef329ecda2d8940f14ed8f35" and "65cbb9356a83f59662d2218bbacf33c625773e31" have entirely different histories.

14 changed files with 5 additions and 211 deletions

View File

@ -1,6 +0,0 @@
<Project Sdk="Godot.NET.Sdk/3.3.0">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Halfearth</RootNamespace>
</PropertyGroup>
</Project>

View File

@ -1,19 +0,0 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Half-earth", "Half-earth.csproj", "{C894A75C-991B-4000-9BD9-9B0B186304C4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
ExportDebug|Any CPU = ExportDebug|Any CPU
ExportRelease|Any CPU = ExportRelease|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C894A75C-991B-4000-9BD9-9B0B186304C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C894A75C-991B-4000-9BD9-9B0B186304C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C894A75C-991B-4000-9BD9-9B0B186304C4}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU
{C894A75C-991B-4000-9BD9-9B0B186304C4}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU
{C894A75C-991B-4000-9BD9-9B0B186304C4}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU
{C894A75C-991B-4000-9BD9-9B0B186304C4}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU
EndGlobalSection
EndGlobal

View File

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/icon.png-f931f6b997c470ed41f337ac62349254.stex" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://textures/icon.png" source_file="res://icon.png"
dest_files=[ "res://.import/icon.png-f931f6b997c470ed41f337ac62349254.stex" ] dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
[params] [params]

View File

@ -1,8 +0,0 @@
[gd_resource type="ShaderMaterial" load_steps=2 format=2]
[ext_resource path="res://shaders/tile_shader.gdshader" type="Shader" id=1]
[resource]
resource_local_to_scene = true
shader = ExtResource( 1 )
shader_param/c = null

View File

@ -1,11 +0,0 @@
[gd_scene load_steps=3 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]
[node name="Root" type="Node2D"]
[node name="Grid" parent="." instance=ExtResource( 1 )]
[node name="Cursor" parent="." instance=ExtResource( 2 )]
Grid = NodePath("../Grid")

View File

@ -1,10 +0,0 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://scripts/WorldGrid.cs" type="Script" id=1]
[ext_resource path="res://nodes/tile.tscn" type="PackedScene" id=2]
[node name="Grid" type="Node2D"]
script = ExtResource( 1 )
TileScene = ExtResource( 2 )
Size = 10
CellSize = 64

View File

@ -1,9 +0,0 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://textures/icon.png" type="Texture" id=1]
[ext_resource path="res://scripts/GridCursor.cs" type="Script" id=2]
[node name="Grid Cursor" type="Sprite"]
modulate = Color( 0, 1, 1, 0.533333 )
texture = ExtResource( 1 )
script = ExtResource( 2 )

View File

@ -1,8 +0,0 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://materials/tile.tres" type="Material" id=1]
[ext_resource path="res://textures/icon.png" type="Texture" id=2]
[node name="Tile" type="Sprite"]
material = ExtResource( 1 )
texture = ExtResource( 2 )

View File

@ -11,8 +11,7 @@ config_version=4
[application] [application]
config/name="Half-earth" config/name="Half-earth"
run/main_scene="res://nodes/game.tscn" config/icon="res://icon.png"
config/icon="res://textures/icon.png"
[gui] [gui]
@ -28,5 +27,4 @@ common/enable_pause_aware_picking=true
[rendering] [rendering]
gles3/shaders/shader_compilation_mode=1 environment/default_environment="res://default_env.tres"
environment/default_environment="res://resources/default_env.tres"

View File

@ -1,33 +0,0 @@
using Godot;
using System;
public class GridCursor : Sprite
{
[Export]
public NodePath Grid { get; set; }
private WorldGrid _grid;
public override void _Ready()
{
_grid = GetNode<WorldGrid>(Grid);
}
public override void _Input(InputEvent @event)
{
base._Input(@event);
if (@event is InputEventMouseMotion mouseMoveEvent)
{
var pos = mouseMoveEvent.Position;
_grid.GetGridPos(pos, out var x, out var y);
var position = new Vector2(x + .5f, y + .5f) * _grid.CellSize;
this.Position = position;
}
else if (@event is InputEventMouseButton mouseButtonEvent)
{
var pos = mouseButtonEvent.Position;
_grid.GetGridPos(pos, out var x, out var y);
GD.Print($"({x}, {y})");
}
}
}

View File

@ -1,93 +0,0 @@
using Godot;
using System;
public class WorldGrid : Node2D
{
[Export]
private PackedScene TileScene { get; set; }
[Export]
public int Size { get; set; }
[Export]
public int CellSize { get; set; }
private struct Tile
{
public float data;
public ShaderMaterial material;
}
private Tile[,] _tiles;
// Called when the node enters the scene tree for the first time.
public override void _Ready()
{
GenerateGrid(Size);
}
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("c", tile.data);
}
}
}
public void GetGridPos(Vector2 position, out int x, out int y)
{
int GetCoord(float f) =>
Mathf.Clamp(Mathf.FloorToInt(f / CellSize), 0, CellSize -1);
x = GetCoord(position.x);
y = GetCoord(position.y);
}
private void Clear()
{
_tiles = null;
int children = this.GetChildCount();
GD.Print(children);
for (int i = 0; i < children; i++)
{
var child = this.GetChild(i);
child.QueueFree();
}
}
private void GenerateGrid(int size)
{
this.Clear();
_tiles = new Tile[size, size];
for (int x = 0; x < size; x++)
{
for (int y = 0; y < size; y++)
{
var tile = new Tile();
tile.data = (float)(y * size + x) / 100f;
var node = TileScene.Instance<Node2D>();
this.AddChild(node);
var position = new Vector2
{
x = (x + .5f) * CellSize,
y = (y + .5f) * CellSize
};
node.Position = position;
var canvasItem = (CanvasItem)node;
tile.material = (ShaderMaterial)canvasItem.Material;
_tiles[x, y] = tile;
}
}
}
}

View File

@ -1,7 +0,0 @@
shader_type canvas_item;
uniform float c;
void fragment() {
COLOR = vec4(c, 0.0, 0.0, 1.0);
}