Sara/terrain-editor
1
0
Fork 0
Code Issues 13 Pull requests Actions Packages Projects 1 Releases Wiki Activity

feat: implemented adding primitive with UI

Browse source
This commit is contained in:
Sara Gerretsen 2025-12-08 15:33:02 +01:00
parent 670cfa1779
commit b6e8ca9225
8 changed files with 120 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
modules/terrain_editor/add_primitive_button.cpp Normal file
View file

@ -0,0 +1,31 @@
#include "add_primitive_button.h"
#include "terrain_editor/edit_history.h"
#include "terrain_editor/terrain_mesh_generator.h"
void AddPrimitiveButton::_bind_methods() {
BIND_HPROPERTY(Variant::OBJECT, primitive_blueprint, PROPERTY_HINT_RESOURCE_TYPE, "TerrainPrimitive");
BIND_HPROPERTY(Variant::OBJECT, terrain, PROPERTY_HINT_NODE_TYPE, "TerrainMeshGenerator");
}
void AddPrimitiveButton::pressed() {
if (this->terrain) {
Ref<TerrainPrimitive> copy{ this->primitive_blueprint->duplicate(true) };
EditHistory::get_singleton()->push_action(callable_mp(this->terrain, &TerrainMeshGenerator::add_primitive).bind(copy), callable_mp(this->terrain, &TerrainMeshGenerator::remove_primitive).bind(copy));
}
}
void AddPrimitiveButton::set_primitive_blueprint(Ref<TerrainPrimitive> blueprint) {
this->primitive_blueprint = blueprint;
}
Ref<TerrainPrimitive> AddPrimitiveButton::get_primitive_blueprint() const {
return this->primitive_blueprint;
}
void AddPrimitiveButton::set_terrain(TerrainMeshGenerator *terrain) {
this->terrain = terrain;
}
TerrainMeshGenerator *AddPrimitiveButton::get_terrain() const {
return this->terrain;
}

21
modules/terrain_editor/add_primitive_button.h Normal file
View file

@ -0,0 +1,21 @@
#pragma once
#include "scene/gui/button.h"
#include "terrain_editor/terrain_mesh_generator.h"
#include "terrain_editor/terrain_primitive.h"
class AddPrimitiveButton : public Button {
GDCLASS(AddPrimitiveButton, Button);
static void _bind_methods();
void pressed() override;
public:
void set_primitive_blueprint(Ref<TerrainPrimitive> primitive);
Ref<TerrainPrimitive> get_primitive_blueprint() const;
void set_terrain(TerrainMeshGenerator *terrain);
TerrainMeshGenerator *get_terrain() const;
private:
Ref<TerrainPrimitive> primitive_blueprint{};
TerrainMeshGenerator *terrain{ nullptr };
};

3
modules/terrain_editor/register_types.cpp
View file

@ -2,7 +2,7 @@
#include "core/config/engine.h"
#include "core/object/class_db.h"
#include "scene/main/scene_tree.h"
#include "terrain_editor/add_primitive_button.h"
#include "terrain_editor/edit_history.h"
#include "terrain_editor/point_primitive_node.h"
#include "terrain_editor/primitive_layer_list.h"
@ -28,6 +28,7 @@ void initialize_terrain_editor_module(ModuleInitializationLevel p_level) {
ClassDB::register_class<EditHistory>();
Engine::get_singleton()->add_singleton(Engine::Singleton("EditHistory", (EditHistory::singleton_instance = memnew(EditHistory)), "EditHistory"));
ClassDB::register_class<PrimitiveLayerList>();
ClassDB::register_class<AddPrimitiveButton>();
}
void uninitialize_terrain_editor_module(ModuleInitializationLevel p_level) {

15
modules/terrain_editor/terrain_mesh_generator.cpp
View file

@ -258,6 +258,21 @@ void TerrainMeshGenerator::push_task(Rect2 area, Ref<ArrayMesh> mesh, size_t poi
this->input_lock.unlock();
}
void TerrainMeshGenerator::add_primitive(Ref<TerrainPrimitive> primitive) {
Array list = get_primitives();
list.push_front(primitive);
set_primitives(list);
}
void TerrainMeshGenerator::remove_primitive(Ref<TerrainPrimitive> primitive) {
Array list = get_primitives();
int idx{ list.find(primitive) };
if (idx >= 0 && idx < list.size()) {
list.remove_at(idx);
}
set_primitives(list);
}
void TerrainMeshGenerator::set_primitives(Array primitives) {
// synchronise primitives
for (Variant var : this->primitives_buffer) {

2
modules/terrain_editor/terrain_mesh_generator.h
View file

@ -37,6 +37,8 @@ protected:
public:
void push_task(Rect2 area, Ref<ArrayMesh> mesh, size_t side_points, Callable callback = Callable());
void add_primitive(Ref<TerrainPrimitive> primitive);
void remove_primitive(Ref<TerrainPrimitive> primitive);
void set_primitives(Array array);
Array get_primitives() const;
void set_vertex_color_gradient(Ref<Gradient> gradient);

1
project/objects/primitive_nodes/point_primitive_node.tscn
View file

@ -99,6 +99,7 @@ bottom_radius = 0.4
height = 10000.0
[node name="PointPrimitiveNode" type="PointPrimitiveNode" unique_id=1472259146]
transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0)
[node name="point_handle" parent="." unique_id=1807952123 instance=ExtResource("1_njtj3")]
transform = Transform3D(10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0)

2
project/objects/terrain_chunk.tscn
View file

@ -4,5 +4,5 @@
[node name="TerrainChunk" type="TerrainChunk" unique_id=1453572398]
material_override = ExtResource("1_6vjd7")
size = 25.0
size = 50.0
lod0_detail = 50

76
project/scenes/editor.tscn
View file

@ -8,14 +8,7 @@
[ext_resource type="Texture2D" uid="uid://bl3gn6qruuy8w" path="res://assets/icons/plane.svg" id="4_xg7d5"]
[ext_resource type="Texture2D" uid="uid://d1te42w7wpkrx" path="res://assets/icons/noise.svg" id="5_eqbpn"]
[sub_resource type="PointPrimitive" id="PointPrimitive_pxqd5"]
slope = -0.7
height = 0.0
[sub_resource type="PointPrimitive" id="PointPrimitive_ba0ut"]
blend_range = 10.0
center = Vector2(50, 0)
slope = -0.7
[sub_resource type="PointPrimitive" id="PointPrimitive_5tm2q"]
[sub_resource type="FastNoiseLite" id="FastNoiseLite_pxqd5"]
frequency = 0.015
@ -87,7 +80,7 @@ var rotate_speed := .0015
var zoom_speed := 5.0
var rotating := false
var panning := false
var distance := 50
var distance := 200
var pivot := Vector3.ZERO
func _ready():
@ -106,14 +99,6 @@ func _unhandled_input(event: InputEvent) -> void:
global_position += (global_basis.y * motion.screen_relative.y - global_basis.x * motion.screen_relative.x) * rotate_speed * distance
look_at(pivot)
global_position = (global_position - pivot).normalized() * distance + pivot
elif event is InputEventMouseMotion and panning:
get_viewport().set_input_as_handled()
var backward := Vector3(global_basis.z.x, 0.0, global_basis.z.z).normalized()
var right := Vector3(global_basis.x.x, 0.0, global_basis.x.z).normalized()
var motion := event as InputEventMouseMotion
var translation = -(backward * motion.screen_relative.y + right * motion.screen_relative.x) * pan_speed * distance
pivot += translation
global_position += translation
elif event is InputEventMouseButton and (event as InputEventMouseButton).button_index == MOUSE_BUTTON_WHEEL_UP:
get_viewport().set_input_as_handled()
distance = max(1., distance - zoom_speed)
@ -122,17 +107,32 @@ func _unhandled_input(event: InputEvent) -> void:
get_viewport().set_input_as_handled()
distance = min(1000., distance + zoom_speed)
global_position = (global_position - pivot).normalized() * distance + pivot
elif event is InputEventMouseMotion and panning:
get_viewport().set_input_as_handled()
var backward := Vector3(global_basis.z.x, 0.0, global_basis.z.z).normalized()
var right := Vector3(global_basis.x.x, 0.0, global_basis.x.z).normalized()
var motion := event as InputEventMouseMotion
var translation = -(backward * motion.screen_relative.y + right * motion.screen_relative.x) * pan_speed * distance
pivot += translation
global_position += translation
"
[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_xg7d5"]
load_path = "res://.godot/imported/point.svg-e68fd7c1e788d2c48d769cc58eba6e98.ctex"
[sub_resource type="PointPrimitive" id="PointPrimitive_5lcyj"]
[sub_resource type="PlanePrimitive" id="PlanePrimitive_5lcyj"]
[sub_resource type="NoisePrimitive" id="NoisePrimitive_5lcyj"]
[node name="Editor" type="Node3D" unique_id=1027707839]
[node name="TerrainMeshEditor" type="TerrainMeshEditor" parent="." unique_id=1382595562]
primitives = [SubResource("PointPrimitive_pxqd5"), SubResource("PointPrimitive_ba0ut"), SubResource("NoisePrimitive_ba0ut"), SubResource("NoisePrimitive_pxqd5"), SubResource("NoisePrimitive_q68jb"), SubResource("PlanePrimitive_ba0ut")]
primitives = [SubResource("PointPrimitive_5tm2q"), SubResource("NoisePrimitive_ba0ut"), SubResource("NoisePrimitive_pxqd5"), SubResource("NoisePrimitive_q68jb"), SubResource("PlanePrimitive_ba0ut")]
vertex_color_gradient = SubResource("Gradient_b1cmn")
color_gradient_end_height = 100.0
chunk_count = 4
chunk_scene = ExtResource("1_pxqd5")
point_primitive_object = ExtResource("1_b1cmn")
@ -159,58 +159,76 @@ offset_right = 258.0
grow_vertical = 2
theme = ExtResource("3_ba0ut")
[node name="TabContainer" type="TabContainer" parent="LeftPanel" unique_id=2095156888]
[node name="VBoxContainer" type="VBoxContainer" parent="LeftPanel" unique_id=1723457232]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="Layers" type="TabContainer" parent="LeftPanel/VBoxContainer" unique_id=2095156888]
layout_mode = 2
size_flags_vertical = 3
current_tab = 0
[node name="Layers" type="VBoxContainer" parent="LeftPanel/TabContainer" unique_id=138865385]
[node name="Layers" type="VBoxContainer" parent="LeftPanel/VBoxContainer/Layers" unique_id=138865385]
layout_mode = 2
metadata/_tab_index = 0
[node name="Tree" type="PrimitiveLayerList" parent="LeftPanel/TabContainer/Layers" unique_id=797700186 node_paths=PackedStringArray("terrain")]
[node name="Tree" type="PrimitiveLayerList" parent="LeftPanel/VBoxContainer/Layers/Layers" unique_id=797700186 node_paths=PackedStringArray("terrain")]
layout_mode = 2
size_flags_vertical = 3
columns = 4
terrain = NodePath("../../../../TerrainMeshEditor")
scroll_horizontal_enabled = false
terrain = NodePath("../../../../../TerrainMeshEditor")
icons = {
&"NoisePrimitive": ExtResource("5_eqbpn"),
&"PlanePrimitive": ExtResource("4_xg7d5"),
&"PointPrimitive": ExtResource("4_5lcyj")
}
[node name="HBoxContainer" type="HBoxContainer" parent="LeftPanel/TabContainer/Layers" unique_id=702489990]
[node name="HBoxContainer" type="HBoxContainer" parent="LeftPanel/VBoxContainer/Layers/Layers" unique_id=702489990]
layout_mode = 2
size_flags_vertical = 8
alignment = 1
[node name="TextureRect" type="TextureRect" parent="LeftPanel/TabContainer/Layers/HBoxContainer" unique_id=1669840346]
[node name="TextureRect" type="TextureRect" parent="LeftPanel/VBoxContainer/Layers/Layers/HBoxContainer" unique_id=1669840346]
custom_minimum_size = Vector2(32, 32)
layout_mode = 2
texture = ExtResource("4_q68jb")
expand_mode = 2
stretch_mode = 4
[node name="AddPointPrimitive" type="Button" parent="LeftPanel/TabContainer/Layers/HBoxContainer" unique_id=535482641]
[node name="AddPointPrimitive" type="AddPrimitiveButton" parent="LeftPanel/VBoxContainer/Layers/Layers/HBoxContainer" unique_id=255935272 node_paths=PackedStringArray("terrain")]
custom_minimum_size = Vector2(32, 32)
layout_mode = 2
icon = SubResource("CompressedTexture2D_xg7d5")
expand_icon = true
primitive_blueprint = SubResource("PointPrimitive_5lcyj")
terrain = NodePath("../../../../../../TerrainMeshEditor")
[node name="AddPlanePrimitive" type="Button" parent="LeftPanel/TabContainer/Layers/HBoxContainer" unique_id=287076599]
[node name="AddPlanePrimitive" type="AddPrimitiveButton" parent="LeftPanel/VBoxContainer/Layers/Layers/HBoxContainer" unique_id=850669113 node_paths=PackedStringArray("terrain")]
custom_minimum_size = Vector2(32, 32)
layout_mode = 2
icon = ExtResource("4_xg7d5")
expand_icon = true
primitive_blueprint = SubResource("PlanePrimitive_5lcyj")
terrain = NodePath("../../../../../../TerrainMeshEditor")
[node name="AddNoisePrimitive" type="Button" parent="LeftPanel/TabContainer/Layers/HBoxContainer" unique_id=769590598]
[node name="AddNoisePrimitive" type="AddPrimitiveButton" parent="LeftPanel/VBoxContainer/Layers/Layers/HBoxContainer" unique_id=761062556 node_paths=PackedStringArray("terrain")]
custom_minimum_size = Vector2(32, 32)
layout_mode = 2
icon = ExtResource("5_eqbpn")
expand_icon = true
primitive_blueprint = SubResource("NoisePrimitive_5lcyj")
terrain = NodePath("../../../../../../TerrainMeshEditor")
[node name="Inspector" type="TabContainer" parent="LeftPanel/VBoxContainer" unique_id=240272030]
layout_mode = 2
size_flags_vertical = 3
current_tab = 0
[node name="Inspector" type="VBoxContainer" parent="LeftPanel/VBoxContainer/Inspector" unique_id=1225013744]
layout_mode = 2
metadata/_tab_index = 0
[connection signal="primitives_changed" from="TerrainMeshEditor" to="TerrainMeshEditor" method="_on_primitives_changed"]