- Not functional yet - Remove "input in editor" plugin (since it's no longer necessary) - Move terrain editing code to plugin
parent
4da1da73ef
commit
4e13f4e9dd
21 changed files with 548 additions and 145 deletions
@ -1,49 +0,0 @@ |
|||||||
#if TOOLS |
|
||||||
[Tool] |
|
||||||
public partial class ReceiveInputInEditorPlugin |
|
||||||
: EditorPlugin |
|
||||||
{ |
|
||||||
public override bool _Handles(GodotObject obj) |
|
||||||
=> obj is Node; |
|
||||||
|
|
||||||
public override int _Forward3DGuiInput(Camera3D camera, InputEvent ev) |
|
||||||
{ |
|
||||||
var root = (Node3D)EditorInterface.Singleton.GetEditedSceneRoot(); |
|
||||||
|
|
||||||
var viewport = root.GetViewport(); |
|
||||||
// Don't know about any negative effect of changing these and leaving them like that. |
|
||||||
viewport.GuiDisableInput = false; // Re-enable input, required for `PushInput` to work at all. |
|
||||||
viewport.HandleInputLocally = true; // Let sub-viewport handle its own input, makes `SetInputAsHandled` work as expected? |
|
||||||
|
|
||||||
// This will propagate input events into the edited scene, |
|
||||||
// including regular, GUI, shortcut, unhandled key and unhandled. |
|
||||||
viewport.PushInput(ev); |
|
||||||
|
|
||||||
// Enabling `PhysicsObjectPicking` causes `IsInputHandled()` to always |
|
||||||
// return true, and object picking isn't immediate anyway, so let's just |
|
||||||
// do it ourselves. This doesn't support touch input, though. |
|
||||||
if (!viewport.IsInputHandled() && (ev is InputEventMouse { Position: var mouse })) { |
|
||||||
// Ray is cast from the editor camera's view. |
|
||||||
var from = camera.ProjectRayOrigin(mouse); |
|
||||||
var to = from + camera.ProjectRayNormal(mouse) * camera.Far; |
|
||||||
|
|
||||||
// Actual collision is done in the edited scene though. |
|
||||||
var space = root.GetWorld3D().DirectSpaceState; |
|
||||||
var query = PhysicsRayQueryParameters3D.Create(from, to); |
|
||||||
|
|
||||||
var result = space.IntersectRay(query); |
|
||||||
// The collider object isn't necessarily a `CollisionObject3D`. |
|
||||||
var collider = (GodotObject)result.GetValueOrDefault("collider"); |
|
||||||
if (collider is CollisionObject3D { Visible: true } obj) { |
|
||||||
var pos = (Vector3)result["position"]; |
|
||||||
var normal = (Vector3)result["normal"]; |
|
||||||
var shape = (int)result["shape"]; |
|
||||||
obj._InputEvent(camera, ev, pos, normal, shape); |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
// If any node calls `SetInputAsHandled()`, the event is not passed on to other editor gizmos / plugins. |
|
||||||
return viewport.IsInputHandled() ? (int)AfterGuiInput.Stop : (int)AfterGuiInput.Pass; |
|
||||||
} |
|
||||||
} |
|
||||||
#endif |
|
@ -1,38 +0,0 @@ |
|||||||
@tool |
|
||||||
extends EditorPlugin |
|
||||||
|
|
||||||
func _handles(obj: Object) -> bool: |
|
||||||
return obj is Node |
|
||||||
|
|
||||||
func _forward_3d_gui_input(camera: Camera3D, event: InputEvent) -> int: |
|
||||||
var root := EditorInterface.get_edited_scene_root() as Node3D |
|
||||||
|
|
||||||
var viewport := root.get_viewport() |
|
||||||
# Don't know about any negative effect of changing these and leaving them like that. |
|
||||||
viewport.gui_disable_input = false # Re-enable input, required for `push_input` to work at all. |
|
||||||
viewport.handle_input_locally = true # Let sub-viewport handle its own input, makes `set_input_as_handled` work as expected? |
|
||||||
|
|
||||||
# This will propagate input events into the edited scene, |
|
||||||
# including regular, GUI, shortcut, unhandled key and unhandled. |
|
||||||
viewport.push_input(event) |
|
||||||
|
|
||||||
# Enabling `physics_object_picking` causes `is_input_handled()` to always |
|
||||||
# return true, and object picking isn't immediate anyway, so let's just |
|
||||||
# do it ourselves. This doesn't support touch input, though. |
|
||||||
if !viewport.is_input_handled() and event is InputEventMouse: |
|
||||||
# Ray is cast from the editor camera's view. |
|
||||||
var from := camera.project_ray_origin(event.position) |
|
||||||
var to := from + camera.project_ray_normal(event.position) * camera.far |
|
||||||
|
|
||||||
# Actual collision is done in the edited scene though. |
|
||||||
var space := root.get_world_3d().direct_space_state |
|
||||||
var query := PhysicsRayQueryParameters3D.create(from, to) |
|
||||||
|
|
||||||
var result := space.intersect_ray(query) |
|
||||||
# The collider object isn't necessarily a `CollisionObject3D`. |
|
||||||
var obj := result.get("collider") as CollisionObject3D |
|
||||||
if obj and obj.visible: |
|
||||||
obj._input_event(camera, event, result["position"], result["normal"], result["shape"]) |
|
||||||
|
|
||||||
# If any node calls `set_input_as_handled()`, the event is not passed on to other editor gizmos / plugins. |
|
||||||
return AfterGUIInput.AFTER_GUI_INPUT_STOP if viewport.is_input_handled() else AfterGUIInput.AFTER_GUI_INPUT_PASS |
|
@ -1,7 +0,0 @@ |
|||||||
[plugin] |
|
||||||
|
|
||||||
name="Receive Input in Editor" |
|
||||||
description="" |
|
||||||
author="copygirl" |
|
||||||
version="" |
|
||||||
script="ReceiveInputInEditorPlugin.cs" |
|
@ -0,0 +1,101 @@ |
|||||||
|
[Tool] |
||||||
|
public partial class TerrainEditingControls |
||||||
|
: VBoxContainer |
||||||
|
{ |
||||||
|
public (ToolMode , Button)[] ToolModeButtons { get; private set; } |
||||||
|
public (ToolShape, Button)[] ToolShapeButtons { get; private set; } |
||||||
|
public Button[] PaintTextureButtons { get; private set; } |
||||||
|
|
||||||
|
public Slider DrawSizeSlider { get; private set; } |
||||||
|
|
||||||
|
ToolMode _toolMode; |
||||||
|
ToolShape _toolShape; |
||||||
|
int _texture; |
||||||
|
|
||||||
|
public ToolMode ToolMode { get => _toolMode ; set => SetToolMode (value); } |
||||||
|
public ToolShape ToolShape { get => _toolShape; set => SetToolShape(value); } |
||||||
|
public int Texture { get => _texture ; set => SetTexture (value); } |
||||||
|
|
||||||
|
public int DrawSize { |
||||||
|
get => RoundToInt(-DrawSizeSlider?.Value ?? 1); |
||||||
|
set => DrawSizeSlider.Value = -value; |
||||||
|
} |
||||||
|
|
||||||
|
public override void _Ready() |
||||||
|
{ |
||||||
|
ToolModeButtons = [ |
||||||
|
(ToolMode.Height, GetNode<Button>("Height")), |
||||||
|
(ToolMode.Paint , GetNode<Button>("Paint" )), |
||||||
|
]; |
||||||
|
|
||||||
|
ToolShapeButtons = [ |
||||||
|
(ToolShape.Corner, GetNode<Button>("Corner")), |
||||||
|
(ToolShape.Circle, GetNode<Button>("Circle")), |
||||||
|
(ToolShape.Square, GetNode<Button>("Square")), |
||||||
|
]; |
||||||
|
|
||||||
|
PaintTextureButtons = [ |
||||||
|
GetNode<Button>("Grass"), |
||||||
|
GetNode<Button>("Dirt"), |
||||||
|
GetNode<Button>("Rock"), |
||||||
|
GetNode<Button>("Sand"), |
||||||
|
]; |
||||||
|
|
||||||
|
foreach (var (mode, button) in ToolModeButtons) |
||||||
|
button.Pressed += () => SetToolMode(mode); |
||||||
|
foreach (var (shape, button) in ToolShapeButtons) |
||||||
|
button.Pressed += () => SetToolShape(shape); |
||||||
|
foreach (var (i, button) in PaintTextureButtons.Select((b, i) => (i, b))) |
||||||
|
button.Pressed += () => SetTexture(i + 1); |
||||||
|
|
||||||
|
var drawSizeLabel = GetNode<Label>("SizeLabel"); |
||||||
|
DrawSizeSlider = GetNode<Slider>("SizeSlider"); |
||||||
|
DrawSizeSlider.ValueChanged += (_) => drawSizeLabel.Text = $"{DrawSize}"; |
||||||
|
|
||||||
|
SetToolMode(ToolMode.Height); |
||||||
|
SetToolShape(ToolShape.Circle); |
||||||
|
SetTexture(1); |
||||||
|
|
||||||
|
OnEditingReady(); |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
void SetToolMode(ToolMode value) |
||||||
|
{ |
||||||
|
foreach (var (mode, button) in ToolModeButtons) |
||||||
|
button.Flat = button.ButtonPressed = value != mode; |
||||||
|
foreach (var button in PaintTextureButtons) |
||||||
|
button.Disabled = value != ToolMode.Paint; |
||||||
|
_toolMode = value; |
||||||
|
} |
||||||
|
|
||||||
|
void SetToolShape(ToolShape value) |
||||||
|
{ |
||||||
|
foreach (var (shape, button) in ToolShapeButtons) |
||||||
|
button.Flat = button.ButtonPressed = value != shape; |
||||||
|
DrawSizeSlider.Editable = value != ToolShape.Corner; |
||||||
|
_toolShape = value; |
||||||
|
} |
||||||
|
|
||||||
|
void SetTexture(int value) |
||||||
|
{ |
||||||
|
if ((value < 1) || (value > PaintTextureButtons.Length)) |
||||||
|
throw new ArgumentOutOfRangeException(nameof(value)); |
||||||
|
foreach (var (i, button) in PaintTextureButtons.Select((b, i) => (i, b))) |
||||||
|
button.Flat = button.ButtonPressed = value != i + 1; |
||||||
|
_texture = value; |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
public enum ToolMode |
||||||
|
{ |
||||||
|
Height, |
||||||
|
Paint, |
||||||
|
} |
||||||
|
|
||||||
|
public enum ToolShape |
||||||
|
{ |
||||||
|
Corner, |
||||||
|
Circle, |
||||||
|
Square, |
||||||
|
} |
File diff suppressed because one or more lines are too long
@ -0,0 +1,34 @@ |
|||||||
|
#if TOOLS |
||||||
|
|
||||||
|
[Tool] |
||||||
|
public partial class TerrainEditingPlugin |
||||||
|
: EditorPlugin |
||||||
|
{ |
||||||
|
TerrainEditingControls _controls; |
||||||
|
|
||||||
|
public override bool _Handles(GodotObject obj) |
||||||
|
=> obj is Terrain; |
||||||
|
|
||||||
|
public override void _EnterTree() |
||||||
|
{ |
||||||
|
var scene = GD.Load<PackedScene>("res://addons/terrain-editing/TerrainEditingControls.tscn"); |
||||||
|
_controls = scene.Instantiate<TerrainEditingControls>(); |
||||||
|
} |
||||||
|
|
||||||
|
public override void _ExitTree() |
||||||
|
{ |
||||||
|
if (_controls == null) return; |
||||||
|
_controls.QueueFree(); |
||||||
|
_controls = null; |
||||||
|
} |
||||||
|
|
||||||
|
public override void _MakeVisible(bool visible) |
||||||
|
{ |
||||||
|
var container = CustomControlContainer.SpatialEditorSideRight; |
||||||
|
if (visible) |
||||||
|
AddControlToContainer(container, _controls); |
||||||
|
else if (_controls != null) |
||||||
|
RemoveControlFromContainer(container, _controls); |
||||||
|
} |
||||||
|
} |
||||||
|
#endif |
After Width: | Height: | Size: 193 B |
@ -0,0 +1,34 @@ |
|||||||
|
[remap] |
||||||
|
|
||||||
|
importer="texture" |
||||||
|
type="CompressedTexture2D" |
||||||
|
uid="uid://2u1ldmh0osbx" |
||||||
|
path="res://.godot/imported/circle.png-7ef635c7ab3f0bfc0f9202fc8a8f1dd4.ctex" |
||||||
|
metadata={ |
||||||
|
"vram_texture": false |
||||||
|
} |
||||||
|
|
||||||
|
[deps] |
||||||
|
|
||||||
|
source_file="res://addons/terrain-editing/icons/circle.png" |
||||||
|
dest_files=["res://.godot/imported/circle.png-7ef635c7ab3f0bfc0f9202fc8a8f1dd4.ctex"] |
||||||
|
|
||||||
|
[params] |
||||||
|
|
||||||
|
compress/mode=0 |
||||||
|
compress/high_quality=false |
||||||
|
compress/lossy_quality=0.7 |
||||||
|
compress/hdr_compression=1 |
||||||
|
compress/normal_map=0 |
||||||
|
compress/channel_pack=0 |
||||||
|
mipmaps/generate=false |
||||||
|
mipmaps/limit=-1 |
||||||
|
roughness/mode=0 |
||||||
|
roughness/src_normal="" |
||||||
|
process/fix_alpha_border=true |
||||||
|
process/premult_alpha=false |
||||||
|
process/normal_map_invert_y=false |
||||||
|
process/hdr_as_srgb=false |
||||||
|
process/hdr_clamp_exposure=false |
||||||
|
process/size_limit=0 |
||||||
|
detect_3d/compress_to=1 |
After Width: | Height: | Size: 129 B |
@ -0,0 +1,34 @@ |
|||||||
|
[remap] |
||||||
|
|
||||||
|
importer="texture" |
||||||
|
type="CompressedTexture2D" |
||||||
|
uid="uid://btl3jsqeldix2" |
||||||
|
path="res://.godot/imported/corner.png-c9f5b33637b5a9c1ee2a2ae62a163672.ctex" |
||||||
|
metadata={ |
||||||
|
"vram_texture": false |
||||||
|
} |
||||||
|
|
||||||
|
[deps] |
||||||
|
|
||||||
|
source_file="res://addons/terrain-editing/icons/corner.png" |
||||||
|
dest_files=["res://.godot/imported/corner.png-c9f5b33637b5a9c1ee2a2ae62a163672.ctex"] |
||||||
|
|
||||||
|
[params] |
||||||
|
|
||||||
|
compress/mode=0 |
||||||
|
compress/high_quality=false |
||||||
|
compress/lossy_quality=0.7 |
||||||
|
compress/hdr_compression=1 |
||||||
|
compress/normal_map=0 |
||||||
|
compress/channel_pack=0 |
||||||
|
mipmaps/generate=false |
||||||
|
mipmaps/limit=-1 |
||||||
|
roughness/mode=0 |
||||||
|
roughness/src_normal="" |
||||||
|
process/fix_alpha_border=true |
||||||
|
process/premult_alpha=false |
||||||
|
process/normal_map_invert_y=false |
||||||
|
process/hdr_as_srgb=false |
||||||
|
process/hdr_clamp_exposure=false |
||||||
|
process/size_limit=0 |
||||||
|
detect_3d/compress_to=1 |
After Width: | Height: | Size: 168 B |
@ -0,0 +1,34 @@ |
|||||||
|
[remap] |
||||||
|
|
||||||
|
importer="texture" |
||||||
|
type="CompressedTexture2D" |
||||||
|
uid="uid://dqbtbf8pe05qv" |
||||||
|
path="res://.godot/imported/height.png-a11588cb8bcd4e93c189a14ad0809338.ctex" |
||||||
|
metadata={ |
||||||
|
"vram_texture": false |
||||||
|
} |
||||||
|
|
||||||
|
[deps] |
||||||
|
|
||||||
|
source_file="res://addons/terrain-editing/icons/height.png" |
||||||
|
dest_files=["res://.godot/imported/height.png-a11588cb8bcd4e93c189a14ad0809338.ctex"] |
||||||
|
|
||||||
|
[params] |
||||||
|
|
||||||
|
compress/mode=0 |
||||||
|
compress/high_quality=false |
||||||
|
compress/lossy_quality=0.7 |
||||||
|
compress/hdr_compression=1 |
||||||
|
compress/normal_map=0 |
||||||
|
compress/channel_pack=0 |
||||||
|
mipmaps/generate=false |
||||||
|
mipmaps/limit=-1 |
||||||
|
roughness/mode=0 |
||||||
|
roughness/src_normal="" |
||||||
|
process/fix_alpha_border=true |
||||||
|
process/premult_alpha=false |
||||||
|
process/normal_map_invert_y=false |
||||||
|
process/hdr_as_srgb=false |
||||||
|
process/hdr_clamp_exposure=false |
||||||
|
process/size_limit=0 |
||||||
|
detect_3d/compress_to=1 |
After Width: | Height: | Size: 169 B |
@ -0,0 +1,34 @@ |
|||||||
|
[remap] |
||||||
|
|
||||||
|
importer="texture" |
||||||
|
type="CompressedTexture2D" |
||||||
|
uid="uid://btdpyu4n3pgkx" |
||||||
|
path="res://.godot/imported/paint.png-7f2ce8187160ce862842aed3c583971f.ctex" |
||||||
|
metadata={ |
||||||
|
"vram_texture": false |
||||||
|
} |
||||||
|
|
||||||
|
[deps] |
||||||
|
|
||||||
|
source_file="res://addons/terrain-editing/icons/paint.png" |
||||||
|
dest_files=["res://.godot/imported/paint.png-7f2ce8187160ce862842aed3c583971f.ctex"] |
||||||
|
|
||||||
|
[params] |
||||||
|
|
||||||
|
compress/mode=0 |
||||||
|
compress/high_quality=false |
||||||
|
compress/lossy_quality=0.7 |
||||||
|
compress/hdr_compression=1 |
||||||
|
compress/normal_map=0 |
||||||
|
compress/channel_pack=0 |
||||||
|
mipmaps/generate=false |
||||||
|
mipmaps/limit=-1 |
||||||
|
roughness/mode=0 |
||||||
|
roughness/src_normal="" |
||||||
|
process/fix_alpha_border=true |
||||||
|
process/premult_alpha=false |
||||||
|
process/normal_map_invert_y=false |
||||||
|
process/hdr_as_srgb=false |
||||||
|
process/hdr_clamp_exposure=false |
||||||
|
process/size_limit=0 |
||||||
|
detect_3d/compress_to=1 |
After Width: | Height: | Size: 147 B |
@ -0,0 +1,34 @@ |
|||||||
|
[remap] |
||||||
|
|
||||||
|
importer="texture" |
||||||
|
type="CompressedTexture2D" |
||||||
|
uid="uid://btjd1704xtdjv" |
||||||
|
path="res://.godot/imported/square.png-ee9f4ef6bc1f78130e7829ecfc4538ca.ctex" |
||||||
|
metadata={ |
||||||
|
"vram_texture": false |
||||||
|
} |
||||||
|
|
||||||
|
[deps] |
||||||
|
|
||||||
|
source_file="res://addons/terrain-editing/icons/square.png" |
||||||
|
dest_files=["res://.godot/imported/square.png-ee9f4ef6bc1f78130e7829ecfc4538ca.ctex"] |
||||||
|
|
||||||
|
[params] |
||||||
|
|
||||||
|
compress/mode=0 |
||||||
|
compress/high_quality=false |
||||||
|
compress/lossy_quality=0.7 |
||||||
|
compress/hdr_compression=1 |
||||||
|
compress/normal_map=0 |
||||||
|
compress/channel_pack=0 |
||||||
|
mipmaps/generate=false |
||||||
|
mipmaps/limit=-1 |
||||||
|
roughness/mode=0 |
||||||
|
roughness/src_normal="" |
||||||
|
process/fix_alpha_border=true |
||||||
|
process/premult_alpha=false |
||||||
|
process/normal_map_invert_y=false |
||||||
|
process/hdr_as_srgb=false |
||||||
|
process/hdr_clamp_exposure=false |
||||||
|
process/size_limit=0 |
||||||
|
detect_3d/compress_to=1 |
@ -0,0 +1,7 @@ |
|||||||
|
[plugin] |
||||||
|
|
||||||
|
name="Terrain Editing" |
||||||
|
description="" |
||||||
|
author="copygirl" |
||||||
|
version="1.0.0" |
||||||
|
script="TerrainEditingPlugin.cs" |
Loading…
Reference in new issue