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

Compare commits

base: Sara:cb43179770013025b03afa9376f5c1ceeca68889
Branches Tags
Sara:development
..
compare: Sara:835fbec8159c7c9ee4d96583b6853d896077535b
Branches Tags
Sara:development

No commits in common. "cb43179770013025b03afa9376f5c1ceeca68889" and "835fbec8159c7c9ee4d96583b6853d896077535b" have entirely different histories.
cb43179770 ... 835fbec815

15 changed files with 23 additions and 220 deletions
Show stats Expand all files Collapse all files

51
modules/terrain_editor/layer_editor.cpp
View file

@ -1,51 +0,0 @@
#include "layer_editor.h"
#include "scene/resources/packed_scene.h"
void LayerEditor::_bind_methods() {
String hint_string{ vformat("StringName;%s/%s:PackedScene", Variant::OBJECT, PROPERTY_HINT_RESOURCE_TYPE) };
BIND_HPROPERTY(Variant::DICTIONARY, inspectors, PROPERTY_HINT_DICTIONARY_TYPE, hint_string);
BIND_HPROPERTY(Variant::OBJECT, terrain, PROPERTY_HINT_NODE_TYPE, "TerrainMeshEditor");
}
void LayerEditor::deselect_current() {
if (this->current_inspector) {
this->current_inspector->queue_free();
}
this->current_inspector = nullptr;
}
void LayerEditor::select(Ref<TerrainPrimitive> primitive) {
deselect_current();
if (primitive.is_valid() && this->inspectors.has(primitive->get_class())) {
this->current_inspector = this->inspectors.get(primitive->get_class())->instantiate();
add_child(this->current_inspector);
}
}
void LayerEditor::set_inspectors(Dictionary dict) {
this->inspectors.clear();
for (KeyValue<Variant, Variant> kvp : dict) {
StringName name{ kvp.key };
Ref<PackedScene> value{ kvp.value };
this->inspectors.insert(name, value);
}
}
Dictionary LayerEditor::get_inspectors() const {
Dictionary r;
for (KeyValue<StringName, Ref<PackedScene>> const &kvp : this->inspectors) {
r[kvp.key] = kvp.value;
}
return r;
}
void LayerEditor::set_terrain(TerrainMeshEditor *editor) {
this->terrain = editor;
if (editor && !Engine::get_singleton()->is_editor_hint()) {
editor->connect(TerrainMeshEditor::sig_selection_changed, callable_mp(this, &self_type::select));
}
}
TerrainMeshEditor *LayerEditor::get_terrain() const {
return this->terrain;
}

24
modules/terrain_editor/layer_editor.h
View file

@ -1,24 +0,0 @@
#pragma once
#include "scene/gui/tab_container.h"
#include "terrain_editor/terrain_mesh_editor.h"
#include "terrain_primitive.h"
class LayerEditor : public TabContainer {
GDCLASS(LayerEditor, TabContainer);
static void _bind_methods();
protected:
public:
void deselect_current();
void select(Ref<TerrainPrimitive> primitive);
void set_inspectors(Dictionary dict);
Dictionary get_inspectors() const;
void set_terrain(TerrainMeshEditor *terrain);
TerrainMeshEditor *get_terrain() const;
private:
HashMap<StringName, Ref<PackedScene>> inspectors{};
Node *current_inspector{ nullptr };
TerrainMeshEditor *terrain{ nullptr };
};

21
modules/terrain_editor/primitive_layer_list.cpp
View file

@ -9,7 +9,7 @@
#include <cstdint> #include <cstdint>
void PrimitiveLayerList::_bind_methods() { void PrimitiveLayerList::_bind_methods() {
BIND_HPROPERTY(Variant::OBJECT, terrain, PROPERTY_HINT_NODE_TYPE, "TerrainMeshEditor"); BIND_HPROPERTY(Variant::OBJECT, terrain, PROPERTY_HINT_NODE_TYPE, "TerrainMeshGenerator");
BIND_HPROPERTY(Variant::DICTIONARY, icons, PROPERTY_HINT_DICTIONARY_TYPE, "StringName;Texture2D"); BIND_HPROPERTY(Variant::DICTIONARY, icons, PROPERTY_HINT_DICTIONARY_TYPE, "StringName;Texture2D");
} }
@ -27,15 +27,15 @@ void PrimitiveLayerList::generate_subtree(size_t idx, Ref<TerrainPrimitive> prim
base->set_text(NAME_COLUMN, prim->get_name().is_empty() ? prim->get_class() : prim->get_name()); base->set_text(NAME_COLUMN, prim->get_name().is_empty() ? prim->get_class() : prim->get_name());
base->set_editable(NAME_COLUMN, true); base->set_editable(NAME_COLUMN, true);
base->set_expand_right(NAME_COLUMN, true); base->set_expand_right(NAME_COLUMN, true);
this->subtrees.insert(prim, base);
} }
void PrimitiveLayerList::regenerate_tree(Array array) { void PrimitiveLayerList::regenerate_tree(Array array) {
get_root()->clear_children(); get_root()->clear_children();
this->primitives.clear(); this->subtrees.clear();
size_t i{ 0 }; size_t i{ 0 };
for (Variant var : array) { for (Variant var : array) {
Ref<TerrainPrimitive> prim{ var }; Ref<TerrainPrimitive> prim{ var };
this->primitives.push_back(prim);
if (prim.is_valid()) { if (prim.is_valid()) {
generate_subtree(i, prim, get_root()); generate_subtree(i, prim, get_root());
++i; ++i;
@ -88,16 +88,6 @@ void PrimitiveLayerList::item_edited() {
} }
} }
void PrimitiveLayerList::item_selected() {
TreeItem *item{ get_selected() };
int64_t const idx{ item->get_text(IDX_COLUMN).to_int() };
if (idx < this->primitives.size() && idx >= 0) {
this->terrain->set_current_selected(this->primitives[idx]);
} else {
this->terrain->set_current_selected(nullptr);
}
}
void PrimitiveLayerList::_notification(int what) { void PrimitiveLayerList::_notification(int what) {
if (Engine::get_singleton()->is_editor_hint()) { if (Engine::get_singleton()->is_editor_hint()) {
return; return;
@ -107,7 +97,6 @@ void PrimitiveLayerList::_notification(int what) {
return; return;
case NOTIFICATION_READY: case NOTIFICATION_READY:
connect("item_edited", callable_mp(this, &self_type::item_edited)); connect("item_edited", callable_mp(this, &self_type::item_edited));
connect("item_selected", callable_mp(this, &self_type::item_selected));
create_item(); create_item();
set_columns(COLUMN_MAX); set_columns(COLUMN_MAX);
set_hide_root(true); set_hide_root(true);
@ -137,10 +126,10 @@ Dictionary PrimitiveLayerList::get_icons() const {
return dict; return dict;
} }
void PrimitiveLayerList::set_terrain(TerrainMeshEditor *terrain) { void PrimitiveLayerList::set_terrain(TerrainMeshGenerator *terrain) {
this->terrain = terrain; this->terrain = terrain;
} }
TerrainMeshEditor *PrimitiveLayerList::get_terrain() const { TerrainMeshGenerator *PrimitiveLayerList::get_terrain() const {
return this->terrain; return this->terrain;
} }

11
modules/terrain_editor/primitive_layer_list.h
View file

@ -2,7 +2,7 @@
#include "core/templates/hash_map.h" #include "core/templates/hash_map.h"
#include "scene/gui/tree.h" #include "scene/gui/tree.h"
#include "terrain_editor/terrain_mesh_editor.h" #include "terrain_editor/terrain_mesh_generator.h"
#include "terrain_editor/terrain_primitive.h" #include "terrain_editor/terrain_primitive.h"
class PrimitiveLayerList : public Tree { class PrimitiveLayerList : public Tree {
@ -19,7 +19,6 @@ class PrimitiveLayerList : public Tree {
void switch_index(size_t from, size_t to); void switch_index(size_t from, size_t to);
void layer_renamed(TreeItem *item); void layer_renamed(TreeItem *item);
void item_edited(); void item_edited();
void item_selected();
protected: protected:
void _notification(int what); void _notification(int what);
@ -27,12 +26,12 @@ protected:
public: public:
void set_icons(Dictionary dict); void set_icons(Dictionary dict);
Dictionary get_icons() const; Dictionary get_icons() const;
void set_terrain(TerrainMeshEditor *generator); void set_terrain(TerrainMeshGenerator *generator);
TerrainMeshEditor *get_terrain() const; TerrainMeshGenerator *get_terrain() const;
private: private:
HashMap<StringName, Ref<Texture2D>> icons{}; HashMap<StringName, Ref<Texture2D>> icons{};
TerrainMeshEditor *terrain{}; TerrainMeshGenerator *terrain{};
Vector<Ref<TerrainPrimitive>> primitives{}; HashMap<Ref<TerrainPrimitive>, TreeItem *> subtrees{};
}; };

2
modules/terrain_editor/register_types.cpp
View file

@ -4,7 +4,6 @@
#include "core/object/class_db.h" #include "core/object/class_db.h"
#include "terrain_editor/add_primitive_button.h" #include "terrain_editor/add_primitive_button.h"
#include "terrain_editor/edit_history.h" #include "terrain_editor/edit_history.h"
#include "terrain_editor/layer_editor.h"
#include "terrain_editor/point_primitive_node.h" #include "terrain_editor/point_primitive_node.h"
#include "terrain_editor/primitive_layer_list.h" #include "terrain_editor/primitive_layer_list.h"
#include "terrain_editor/terrain_chunk.h" #include "terrain_editor/terrain_chunk.h"
@ -30,7 +29,6 @@ void initialize_terrain_editor_module(ModuleInitializationLevel p_level) {
Engine::get_singleton()->add_singleton(Engine::Singleton("EditHistory", (EditHistory::singleton_instance = memnew(EditHistory)), "EditHistory")); Engine::get_singleton()->add_singleton(Engine::Singleton("EditHistory", (EditHistory::singleton_instance = memnew(EditHistory)), "EditHistory"));
ClassDB::register_class<PrimitiveLayerList>(); ClassDB::register_class<PrimitiveLayerList>();
ClassDB::register_class<AddPrimitiveButton>(); ClassDB::register_class<AddPrimitiveButton>();
ClassDB::register_class<LayerEditor>();
} }
void uninitialize_terrain_editor_module(ModuleInitializationLevel p_level) { void uninitialize_terrain_editor_module(ModuleInitializationLevel p_level) {

15
modules/terrain_editor/terrain_mesh_editor.cpp
View file

@ -1,5 +1,6 @@
#include "terrain_mesh_editor.h" #include "terrain_mesh_editor.h"
#include "core/input/input_event.h" #include "core/input/input_event.h"
#include "core/io/file_access.h"
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "core/io/resource_saver.h" #include "core/io/resource_saver.h"
#include "core/os/keyboard.h" #include "core/os/keyboard.h"
@ -35,13 +36,9 @@ Array SaveData::get_primitives() const {
return this->primitives; return this->primitives;
} }
String const TerrainMeshEditor::sig_selection_changed{ "selection_changed" };
void TerrainMeshEditor::_bind_methods() { void TerrainMeshEditor::_bind_methods() {
BIND_HPROPERTY(Variant::OBJECT, point_primitive_object, PROPERTY_HINT_RESOURCE_TYPE, "PackedScene"); BIND_HPROPERTY(Variant::OBJECT, point_primitive_object, PROPERTY_HINT_RESOURCE_TYPE, "PackedScene");
ClassDB::bind_method(D_METHOD("save_data"), &self_type::save_data); ClassDB::bind_method(D_METHOD("save_data"), &self_type::save_data);
BIND_HPROPERTY(Variant::OBJECT, current_selected, PROPERTY_HINT_RESOURCE_TYPE, "TerrainPrimitive");
ADD_SIGNAL(MethodInfo(sig_selection_changed, PropertyInfo(Variant::OBJECT, "new_selection", PROPERTY_HINT_RESOURCE_TYPE, "TerrainPrimitive")));
} }
void TerrainMeshEditor::ready() { void TerrainMeshEditor::ready() {
@ -57,6 +54,7 @@ void TerrainMeshEditor::ready() {
} }
void TerrainMeshEditor::on_primitive_list_changed(Array primitives) { void TerrainMeshEditor::on_primitive_list_changed(Array primitives) {
this->out_of_date = true;
for (Node3D *existing : this->primitive_nodes) { for (Node3D *existing : this->primitive_nodes) {
existing->queue_free(); existing->queue_free();
} }
@ -164,15 +162,6 @@ void TerrainMeshEditor::save_data() {
} }
} }
void TerrainMeshEditor::set_current_selected(Ref<TerrainPrimitive> primitive) {
this->current_selected = primitive;
emit_signal(sig_selection_changed, primitive);
}
Ref<TerrainPrimitive> TerrainMeshEditor::get_current_selected() const {
return this->current_selected;
}
void TerrainMeshEditor::set_point_primitive_object(Ref<PackedScene> scene) { void TerrainMeshEditor::set_point_primitive_object(Ref<PackedScene> scene) {
this->point_primitive_object = scene; this->point_primitive_object = scene;
} }

8
modules/terrain_editor/terrain_mesh_editor.h
View file

@ -3,7 +3,6 @@
#include "core/io/resource.h" #include "core/io/resource.h"
#include "scene/gui/file_dialog.h" #include "scene/gui/file_dialog.h"
#include "terrain_editor/terrain_mesh_generator.h" #include "terrain_editor/terrain_mesh_generator.h"
#include "terrain_editor/terrain_primitive.h"
class SaveData : public Resource { class SaveData : public Resource {
GDCLASS(SaveData, Resource); GDCLASS(SaveData, Resource);
@ -35,18 +34,13 @@ protected:
public: public:
void save_data(); void save_data();
void set_current_selected(Ref<TerrainPrimitive>);
Ref<TerrainPrimitive> get_current_selected() const;
void set_point_primitive_object(Ref<PackedScene> scene); void set_point_primitive_object(Ref<PackedScene> scene);
Ref<PackedScene> get_point_primitive_object() const; Ref<PackedScene> get_point_primitive_object() const;
private: private:
Ref<SaveData> data{ memnew(SaveData) }; Ref<SaveData> data{ memnew(SaveData) };
Ref<TerrainPrimitive> current_selected{};
FileDialog *file_dialog{}; FileDialog *file_dialog{};
bool out_of_date{ false };
Vector<Node3D *> primitive_nodes{}; Vector<Node3D *> primitive_nodes{};
Ref<PackedScene> point_primitive_object{}; Ref<PackedScene> point_primitive_object{};
public:
static String const sig_selection_changed;
}; };

20
project/scenes/editor.tscn
View file

@ -7,7 +7,6 @@
[ext_resource type="Texture2D" uid="uid://bb0mnjwx58nt3" path="res://assets/icons/plus.svg" id="4_q68jb"] [ext_resource type="Texture2D" uid="uid://bb0mnjwx58nt3" path="res://assets/icons/plus.svg" id="4_q68jb"]
[ext_resource type="Texture2D" uid="uid://bl3gn6qruuy8w" path="res://assets/icons/plane.svg" id="4_xg7d5"] [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"] [ext_resource type="Texture2D" uid="uid://d1te42w7wpkrx" path="res://assets/icons/noise.svg" id="5_eqbpn"]
[ext_resource type="PackedScene" uid="uid://bsvvhue5x4rb" path="res://ui/primitive_inspectors/point_primitive_inspector.tscn" id="8_5tm2q"]
[sub_resource type="PointPrimitive" id="PointPrimitive_5tm2q"] [sub_resource type="PointPrimitive" id="PointPrimitive_5tm2q"]
@ -32,10 +31,10 @@ noise = SubResource("FastNoiseLite_b1cmn")
noise_amplitude = 5.0 noise_amplitude = 5.0
[sub_resource type="FastNoiseLite" id="FastNoiseLite_ba0ut"] [sub_resource type="FastNoiseLite" id="FastNoiseLite_ba0ut"]
noise_type = 4 frequency = 0.0163
frequency = 0.588 fractal_type = 2
fractal_gain = 1.0 fractal_gain = 1.0
fractal_weighted_strength = 1.0 fractal_weighted_strength = 0.58
[sub_resource type="NoisePrimitive" id="NoisePrimitive_q68jb"] [sub_resource type="NoisePrimitive" id="NoisePrimitive_q68jb"]
blend_mode = 1 blend_mode = 1
@ -79,7 +78,7 @@ script/source = "extends Camera3D
var pan_speed = .001 var pan_speed = .001
var rotate_speed := .0015 var rotate_speed := .0015
var zoom_speed := 2. var zoom_speed := 5.0
var rotating := false var rotating := false
var panning := false var panning := false
var distance := 200 var distance := 200
@ -224,12 +223,13 @@ icons = {
&"PointPrimitive": ExtResource("4_5lcyj") &"PointPrimitive": ExtResource("4_5lcyj")
} }
[node name="Inspector" type="LayerEditor" parent="LeftPanel/VBoxContainer" unique_id=833878161 node_paths=PackedStringArray("terrain")] [node name="Inspector" type="TabContainer" parent="LeftPanel/VBoxContainer" unique_id=240272030]
layout_mode = 2 layout_mode = 2
size_flags_vertical = 3 size_flags_vertical = 3
inspectors = { current_tab = 0
&"PointPrimitive": ExtResource("8_5tm2q")
} [node name="Inspector" type="VBoxContainer" parent="LeftPanel/VBoxContainer/Inspector" unique_id=1225013744]
terrain = NodePath("../../../TerrainMeshEditor") layout_mode = 2
metadata/_tab_index = 0
[connection signal="primitives_changed" from="TerrainMeshEditor" to="TerrainMeshEditor" method="_on_primitives_changed"] [connection signal="primitives_changed" from="TerrainMeshEditor" to="TerrainMeshEditor" method="_on_primitives_changed"]

21
project/ui/editor_elements/float_editor.tscn
View file

@ -1,21 +0,0 @@
[gd_scene format=3 uid="uid://cwby0in0f2wi2"]
[node name="FloatEditor" type="HBoxContainer" unique_id=1730998858]
offset_right = 318.0
offset_bottom = 31.0
[node name="HSlider" type="HSlider" parent="." unique_id=163542019]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 1
max_value = 300.0
step = 0.01
value = 200.0
[node name="SpinBox" type="SpinBox" parent="." unique_id=580598896]
layout_mode = 2
min_value = -10000.0
max_value = 100000.0
step = 0.01
value = 10.0
allow_greater = true

23
project/ui/primitive_inspectors/point_primitive_inspector.tscn
View file

@ -1,23 +0,0 @@
[gd_scene format=3 uid="uid://bsvvhue5x4rb"]
[ext_resource type="PackedScene" uid="uid://cwby0in0f2wi2" path="res://ui/editor_elements/float_editor.tscn" id="1_qb00w"]
[node name="PointPrimitive" type="MarginContainer" unique_id=905749607]
offset_right = 302.0
offset_bottom = 230.0
theme_override_constants/margin_left = 5
theme_override_constants/margin_top = 5
theme_override_constants/margin_right = 5
theme_override_constants/margin_bottom = 5
metadata/_tab_index = 0
[node name="VBoxContainer" type="VBoxContainer" parent="." unique_id=236606520]
layout_mode = 2
[node name="HeightLabel" type="Label" parent="VBoxContainer" unique_id=1478707845]
layout_mode = 2
size_flags_horizontal = 3
text = "Height"
[node name="FloatEditor" parent="VBoxContainer" unique_id=1730998858 instance=ExtResource("1_qb00w")]
layout_mode = 2

BIN
test-terrains/highland.terrain.res
View file

Binary file not shown.

BIN
test-terrains/my_terrain.terrain.res
View file

Binary file not shown.

47
test-terrains/my_terrain.terrain.tres
View file

@ -1,47 +0,0 @@
[gd_resource type="SaveData" load_steps=10 format=3]
[sub_resource type="PointPrimitive" id="PointPrimitive_pxqd5"]
center = Vector2(5.4302, 139.65)
slope = -0.7
height = 67.0
[sub_resource type="PointPrimitive" id="PointPrimitive_ba0ut"]
center = Vector2(-81.1489, 92.763)
slope = -0.7
height = 35.0
[sub_resource type="FastNoiseLite" id="FastNoiseLite_pxqd5"]
frequency = 0.02
fractal_octaves = 3
[sub_resource type="NoisePrimitive" id="NoisePrimitive_ba0ut"]
blend_range = 5.0
noise = SubResource("FastNoiseLite_pxqd5")
noise_amplitude = 20.0
[sub_resource type="FastNoiseLite" id="FastNoiseLite_b1cmn"]
noise_type = 0
frequency = 0.03
fractal_type = 2
metadata/_preview_in_3d_space_ = true
[sub_resource type="NoisePrimitive" id="NoisePrimitive_pxqd5"]
blend_range = 10.0
noise = SubResource("FastNoiseLite_b1cmn")
noise_amplitude = 5.0
[sub_resource type="FastNoiseLite" id="FastNoiseLite_ba0ut"]
fractal_type = 2
fractal_gain = 1.0
fractal_weighted_strength = 0.58
[sub_resource type="NoisePrimitive" id="NoisePrimitive_q68jb"]
blend_mode = 1
noise = SubResource("FastNoiseLite_ba0ut")
[sub_resource type="PlanePrimitive" id="PlanePrimitive_pxqd5"]
blend_range = 10.0
baseline = -1.0
[resource]
primitives = [SubResource("PointPrimitive_pxqd5"), SubResource("PointPrimitive_ba0ut"), SubResource("NoisePrimitive_ba0ut"), SubResource("NoisePrimitive_pxqd5"), SubResource("NoisePrimitive_q68jb"), SubResource("PlanePrimitive_pxqd5")]

BIN
test-terrains/test.terrain.res
View file

Binary file not shown.

BIN
test-terrains/valley.terrain.res
View file

Binary file not shown.