diff --git a/assets/textures/terrain/editing/height_down.png b/assets/textures/terrain/editing/height_lower.png similarity index 100% rename from assets/textures/terrain/editing/height_down.png rename to assets/textures/terrain/editing/height_lower.png diff --git a/assets/textures/terrain/editing/height_down.png.import b/assets/textures/terrain/editing/height_lower.png.import similarity index 69% rename from assets/textures/terrain/editing/height_down.png.import rename to assets/textures/terrain/editing/height_lower.png.import index caf8a8b..a5dde0a 100644 --- a/assets/textures/terrain/editing/height_down.png.import +++ b/assets/textures/terrain/editing/height_lower.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://covyafauwthij" -path="res://.godot/imported/height_down.png-47ae6eeb5feb0ddf7bd952befb4351fe.ctex" +path="res://.godot/imported/height_lower.png-d00d3c7062c0a355f5c8381ee7e664da.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/textures/terrain/editing/height_down.png" -dest_files=["res://.godot/imported/height_down.png-47ae6eeb5feb0ddf7bd952befb4351fe.ctex"] +source_file="res://assets/textures/terrain/editing/height_lower.png" +dest_files=["res://.godot/imported/height_lower.png-d00d3c7062c0a355f5c8381ee7e664da.ctex"] [params] diff --git a/assets/textures/terrain/editing/height_up.png b/assets/textures/terrain/editing/height_raise.png similarity index 100% rename from assets/textures/terrain/editing/height_up.png rename to assets/textures/terrain/editing/height_raise.png diff --git a/assets/textures/terrain/editing/height_up.png.import b/assets/textures/terrain/editing/height_raise.png.import similarity index 69% rename from assets/textures/terrain/editing/height_up.png.import rename to assets/textures/terrain/editing/height_raise.png.import index a026188..0c86a68 100644 --- a/assets/textures/terrain/editing/height_up.png.import +++ b/assets/textures/terrain/editing/height_raise.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dxbfohim13ti1" -path="res://.godot/imported/height_up.png-d84180c0cff17a8285e5e5cb8f54e819.ctex" +path="res://.godot/imported/height_raise.png-a5718ceb2e90ce17597f6300a0a9a715.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/textures/terrain/editing/height_up.png" -dest_files=["res://.godot/imported/height_up.png-d84180c0cff17a8285e5e5cb8f54e819.ctex"] +source_file="res://assets/textures/terrain/editing/height_raise.png" +dest_files=["res://.godot/imported/height_raise.png-a5718ceb2e90ce17597f6300a0a9a715.ctex"] [params] diff --git a/terrain/editing/TerrainEditingControls+Editing.cs b/terrain/editing/TerrainEditingControls+Editing.cs index 1da3c38..204c34e 100644 --- a/terrain/editing/TerrainEditingControls+Editing.cs +++ b/terrain/editing/TerrainEditingControls+Editing.cs @@ -111,11 +111,12 @@ public partial class TerrainEditingControls } } + var isFlatten = ToolMode == ToolMode.Flatten; + var isRaise = RaiseLowerToggle.ButtonPressed; + const float AdjustHeight = 0.5f; - var flatten = ToolMode == ToolMode.Flatten; - var amount = flatten ? terrain.GetTile(tile).Height[corner] - : UpDownToggle.ButtonPressed ? +AdjustHeight - : -AdjustHeight; + var amount = isFlatten ? terrain.GetTile(tile).Height[corner] + : isRaise ? AdjustHeight : -AdjustHeight; var tilesPrevious = new List<(TilePos, Corners)>(); var tilesChanged = new List<(TilePos, Corners)>(); @@ -126,8 +127,8 @@ public partial class TerrainEditingControls var newHeight = tile2.Height; foreach (var corner2 in group) { - if (flatten) newHeight[corner2] = amount; - else newHeight[corner2] += amount; + if (isFlatten) newHeight[corner2] = amount; + else newHeight[corner2] += amount; } tilesChanged.Add((pos, newHeight)); } diff --git a/terrain/editing/TerrainEditingControls.cs b/terrain/editing/TerrainEditingControls.cs index cd4bf7e..d0f7b86 100644 --- a/terrain/editing/TerrainEditingControls.cs +++ b/terrain/editing/TerrainEditingControls.cs @@ -7,8 +7,8 @@ public partial class TerrainEditingControls public Slider DrawSizeSlider { get; private set; } public Button[] PaintTextureButtons { get; private set; } - public Button UpDownToggle { get; private set; } - public Button ConnectedToggle { get; private set; } + public Button RaiseLowerToggle { get; private set; } + public Button ConnectedToggle { get; private set; } public ToolMode ToolMode { get => GetToolMode (); set => SetToolMode (value); } public ToolShape ToolShape { get => GetToolShape(); set => SetToolShape(value); } @@ -44,12 +44,12 @@ public partial class TerrainEditingControls foreach (var (i, button) in PaintTextureButtons.Select((b, i) => (i, b))) button.Pressed += () => SetTexture(i + 1); - var drawSizeLabel = GetNode