diff --git a/scenes/HexTile3D.cs b/scenes/HexTile3D.cs index 0c4462c..65d68bb 100644 --- a/scenes/HexTile3D.cs +++ b/scenes/HexTile3D.cs @@ -25,10 +25,6 @@ public class HexTile3D : Spatial delegate void TileHovered(HexTile3D tile3d); // other member variables - private SpatialMaterial _undefinedMaterial; - private SpatialMaterial _sandMaterial; - private SpatialMaterial _grassMaterial; - private SpatialMaterial _deepGrassMaterial; private SpatialMaterial _previousMaterial; private HexGrid _hexGrid; @@ -52,36 +48,7 @@ public class HexTile3D : Spatial } } - private TileType _type; - - public TileType Type - { - get { return _type; } - - set - { - _type = value; - -// switch (_type) -// { -// case TileType.Undefined: -// _mesh.SetSurfaceMaterial(0, _undefinedMaterial); -// break; -// case TileType.Sand: -// _mesh.SetSurfaceMaterial(0, _sandMaterial); -// break; -// case TileType.Grass: -// _mesh.SetSurfaceMaterial(0, _grassMaterial); -// break; -// case TileType.DeepGrass: -// _mesh.SetSurfaceMaterial(0, _deepGrassMaterial); -// break; -// default: -// GD.Print("Invalid tile type: " + value.ToString()); -// break; -// } - } - } + public TileType Type { get; set; } HexTile3D() { @@ -98,11 +65,6 @@ public class HexTile3D : Spatial _staticBody.Connect("mouse_entered", this, nameof(OnAreaMouseEntered)); _staticBody.Connect("mouse_exited", this, nameof(OnAreaMouseExited)); - _undefinedMaterial = GD.Load("res://materials/UndefinedTile.tres"); - _sandMaterial = GD.Load("res://materials/SandTile.tres"); - _grassMaterial = GD.Load("res://materials/GrassTile.tres"); - _deepGrassMaterial = GD.Load("res://materials/DeepGrassTile.tres"); - Mesh = GetNode("Mesh"); Debug.Assert(Mesh != null); diff --git a/scenes/HexTile3D.tscn b/scenes/HexTile3D.tscn index 1be3f2d..b05e91a 100644 --- a/scenes/HexTile3D.tscn +++ b/scenes/HexTile3D.tscn @@ -36,7 +36,3 @@ shape = SubResource( 5 ) visible = false mesh = SubResource( 6 ) material/0 = SubResource( 7 ) - -[node name="MultiMeshInstance" type="MultiMeshInstance" parent="."] -transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, -5, 0 ) -visible = false