feat: added slope handle

modules/terrain_editor/terrain_chunk.cpp

@@ -2,9 +2,7 @@
 #include "core/config/engine.h"
 #include "macros.h"
 #include "scene/3d/camera_3d.h"
-#include "scene/3d/physics/static_body_3d.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/mesh.h"
 #include "terrain_editor/terrain_mesh_generator.h"
 
 void TerrainChunk::_bind_methods() {
@@ -36,7 +34,7 @@ void TerrainChunk::on_terrain_changed() {
 			if (!status.mesh.is_valid()) {
 				status.mesh.instantiate();
 			}
-			size_t base_detail{ lod == 0 ? this->lod0_detail : this->lod0_detail / (2 * lod * lod) };
+			size_t base_detail{ lod == 0 ? this->lod0_detail : this->lod0_detail / (2 * lod) };
 			status.dirty = true;
 			this->generator->push_task({ { position.x, position.z }, { this->size, this->size } }, status.mesh, base_detail > 1 ? base_detail : 1, callable_mp(this, &self_type::lod_generated).bind(lod));
 			lod++;
@@ -45,23 +43,7 @@ void TerrainChunk::on_terrain_changed() {
 }
 
 void TerrainChunk::lod_generated(size_t lod) {
-	//if (this->collisions && lod <= this->collisions_lod && (lod == 0 || lod == (this->meshes.size() - 1))) {
-#if 0
-	if (this->collisions && lod == this->meshes.size() - 1) {
-		this->collisions->queue_free();
-		this->collisions = nullptr;
-	}
-	if (!this->collisions) {
-		this->set_mesh(this->meshes[lod].mesh);
-		//static Ref<MeshConvexDecompositionSettings> settings{};
-		if ((this->collisions = create_multiple_convex_collisions_node())) {
-			add_child(this->collisions);
-		}
-		this->collisions_lod = lod;
-	}
-#endif
 	this->meshes.set(lod, { this->meshes[lod].mesh, false });
-	process_lod();
 }
 
 void TerrainChunk::process_lod() {
@@ -70,7 +52,7 @@ void TerrainChunk::process_lod() {
 		Vector3 position{ get_global_position() };
 		Vector3 camera{ get_viewport()->get_camera_3d()->get_global_position() };
 		Vector3 diff{ (position - camera).abs() };
-		float distance{ (diff.x > diff.z ? diff.z : diff.x) - this->size };
+		float distance{ (diff.x < diff.z ? diff.z : diff.x) - this->size / 2.f };
 		distance = distance > 0.f ? distance : 0.f;
 		size_t lod{ size_t(Math::floor(distance / (this->lod_end_distance / this->meshes.size()))) };
 		result = lod < this->meshes.size() ? lod : (this->meshes.size() - 1);

modules/terrain_editor/terrain_chunk.h

@@ -30,7 +30,7 @@ private:
 	size_t collisions_lod{ 0 };
 	Vector<MeshStatus> meshes{};
 	int lod0_detail{ 200 };
-	float lod_end_distance{ 1000 };
+	float lod_end_distance{ 600 };
 	float size{ 200 };
 	TerrainMeshGenerator *generator{ nullptr };
 };

modules/terrain_editor/terrain_mesh_generator.cpp

@@ -31,19 +31,25 @@ void TerrainMeshGenerator::enter_tree() {
 }
 
 void TerrainMeshGenerator::process() {
+	if (this->input_lock.try_lock()) {
+		set_process(!this->input_queue.is_empty());
+		this->input_lock.unlock();
+	}
 	if (this->output_lock.try_lock()) {
 		for (TerrainMeshTask &task : this->output_queue) {
 			task.mesh->clear_surfaces();
 			task.out_surface->commit(task.mesh);
+			for (TerrainMeshTask &queued : this->input_queue) {
+				if (queued.mesh == task.mesh) {
+					goto exit_outer;
+				}
+			}
 			task.callback.call();
 		}
+	exit_outer:
 		this->output_queue.clear();
 		this->output_lock.unlock();
 	}
-	if (this->input_lock.try_lock()) {
-		set_process(!this->input_queue.is_empty());
-		this->input_lock.unlock();
-	}
 }
 
 void TerrainMeshGenerator::on_configuration_changed() {

project/assets/materials/terrain_material.tres

@@ -3,7 +3,8 @@
 [ext_resource type="Shader" uid="uid://dsbxpdveoilep" path="res://assets/shaders/terrain.gdshader" id="1_ho7uc"]
 
 [sub_resource type="Gradient" id="Gradient_ho7uc"]
-colors = PackedColorArray(0.141108, 0.450995, 0.106614, 1, 0.259524, 0.499032, 0.232917, 1)
+offsets = PackedFloat32Array(0, 0.989274)
+colors = PackedColorArray(0.31725, 0.45, 0.1845, 1, 0.236594, 0.332715, 0.176904, 1)
 
 [sub_resource type="FastNoiseLite" id="FastNoiseLite_mqhx5"]
 
@@ -12,8 +13,11 @@ color_ramp = SubResource("Gradient_ho7uc")
 noise = SubResource("FastNoiseLite_mqhx5")
 
 [sub_resource type="Gradient" id="Gradient_mqhx5"]
+offsets = PackedFloat32Array(0, 0.988749)
+colors = PackedColorArray(0.206053, 0.206053, 0.206053, 1, 0.293371, 0.293371, 0.293371, 1)
 
 [sub_resource type="FastNoiseLite" id="FastNoiseLite_waqik"]
+noise_type = 3
 
 [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_oj3sr"]
 color_ramp = SubResource("Gradient_mqhx5")
@@ -24,8 +28,8 @@ render_priority = 0
 shader = ExtResource("1_ho7uc")
 shader_parameter/floor_1_albedo = SubResource("NoiseTexture2D_waqik")
 shader_parameter/floor_1_roughness = 1.0
-shader_parameter/floor_1_tiling = 500.0
+shader_parameter/floor_1_tiling = 0.1
-shader_parameter/floor_1_specular = 0.0
+shader_parameter/floor_1_specular = 1.0
 shader_parameter/floor_1_metallic = 0.5
 shader_parameter/floor_2_roughness = 0.7
 shader_parameter/floor_2_tiling = 500.0
@@ -36,10 +40,10 @@ shader_parameter/floor_3_tiling = 500.0
 shader_parameter/floor_3_specular = 0.5
 shader_parameter/floor_3_metallic = 0.5
 shader_parameter/region_blending = 1.0
-shader_parameter/slope_threshold = 0.25
+shader_parameter/slope_threshold = 0.348
-shader_parameter/slope_blend_distance = 0.0
+shader_parameter/slope_blend_distance = 0.05
 shader_parameter/slope_albedo = SubResource("NoiseTexture2D_oj3sr")
-shader_parameter/slope_tiling = 100.0
+shader_parameter/slope_tiling = 0.1
 shader_parameter/slope_roughness = 1.0
 shader_parameter/slope_specular = 1.0
 shader_parameter/slope_metallic = 0.5

project/assets/models/point_handle.blend.import

@@ -39,6 +39,17 @@ _subresources={
 "use_external/fallback_path": "res://assets/materials/peak_handle.tres",
 "use_external/path": "uid://dgym4g3uxbvl3"
 }
+},
+"nodes": {
+"PATH:Cone": {
+"mesh_instance/cast_shadow": 0
+},
+"PATH:Cone_001": {
+"mesh_instance/cast_shadow": 0
+},
+"PATH:Cube": {
+"mesh_instance/cast_shadow": 0
+}
 }
 }
 blender/nodes/visible=0

project/objects/primitive_nodes/point_primitive_node.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=8 format=3 uid="uid://cnux2fqne284i"]
+[gd_scene load_steps=9 format=3 uid="uid://cnux2fqne284i"]
 
 [ext_resource type="PackedScene" uid="uid://bwrqsnetcn8yr" path="res://assets/models/point_handle.blend" id="1_njtj3"]
 [ext_resource type="Material" uid="uid://b4ip0oq8o76mc" path="res://assets/materials/peak_handle_depth_tested.tres" id="2_mx0s0"]
@@ -14,7 +14,7 @@ func _input(event: InputEvent) -> void:
 	if event is InputEventMouseButton and not (event as InputEventMouseButton).is_pressed():
 		dragged = false
 		Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
-		$\"..\".push_transform_changes()
+		$\"..\".push_transform_changes.call_deferred()
 		get_viewport().set_input_as_handled()
 	elif event is InputEventMouseMotion:
 		var motion := event as InputEventMouseMotion
@@ -32,6 +32,36 @@ func _input_event(_camera: Camera3D, event: InputEvent, _event_position: Vector3
 height = 9.59302
 radius = 5.78125
 
+[sub_resource type="GDScript" id="GDScript_s814u"]
+script/source = "extends Area3D
+
+var dragged : bool = false
+var slope_adjusted : float = 0.0
+
+func _input(event: InputEvent) -> void:
+	if not dragged:
+		return
+	if event is InputEventMouseButton and not (event as InputEventMouseButton).is_pressed():
+		dragged = false
+		Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
+		EditHistory.push_action(
+			$\"..\".get_primitive().set.bind(\"slope\", slope_adjusted),
+			$\"..\".get_primitive().set.bind(\"slope\", $\"..\".get_primitive().slope)
+		)
+		get_viewport().set_input_as_handled()
+	elif event is InputEventMouseMotion:
+		var motion := event as InputEventMouseMotion
+		slope_adjusted -= motion.screen_relative.y * 0.001
+		get_viewport().set_input_as_handled()
+
+func _input_event(_camera: Camera3D, event: InputEvent, _event_position: Vector3, _normal: Vector3, _shape_idx: int) -> void:
+	if not dragged and event is InputEventMouseButton and (event as InputEventMouseButton).is_pressed():
+		get_viewport().set_input_as_handled()
+		dragged = true
+		slope_adjusted = $\"..\".get_primitive().slope
+		Input.mouse_mode = Input.MOUSE_MODE_CAPTURED
+"
+
 [sub_resource type="GDScript" id="GDScript_mx0s0"]
 script/source = "extends Area3D
 
@@ -43,7 +73,7 @@ func _input(event: InputEvent) -> void:
 	if event is InputEventMouseButton and not (event as InputEventMouseButton).is_pressed():
 		dragged = false
 		Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
-		$\"..\".push_transform_changes()
+		$\"..\".push_transform_changes.call_deferred()
 		get_viewport().set_input_as_handled()
 	elif event is InputEventMouseMotion:
 		var motion := event as InputEventMouseMotion
@@ -73,16 +103,20 @@ height = 10000.0
 [node name="point_handle" parent="." instance=ExtResource("1_njtj3")]
 transform = Transform3D(10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0)
 
-[node name="HeightHandles" type="Area3D" parent="."]
+[node name="HeightHandle" type="Area3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 27.8381, 0)
 script = SubResource("GDScript_njtj3")
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="HeightHandles"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="HeightHandle"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.80421, 0)
 shape = SubResource("CylinderShape3D_mx0s0")
 
-[node name="CollisionShape3D2" type="CollisionShape3D" parent="HeightHandles"]
+[node name="SlopeAngle" type="Area3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -57.945, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -34.0245, 0)
+script = SubResource("GDScript_s814u")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="SlopeAngle"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.80421, 0)
 shape = SubResource("CylinderShape3D_mx0s0")
 
 [node name="PositionHandle" type="Area3D" parent="."]
@@ -93,4 +127,5 @@ shape = SubResource("SphereShape3D_njtj3")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 material_override = ExtResource("2_mx0s0")
+cast_shadow = 0
 mesh = SubResource("CylinderMesh_njtj3")

project/objects/terrain_chunk.tscn

@@ -4,5 +4,5 @@
 
 [node name="TerrainChunk" type="TerrainChunk"]
 material_override = ExtResource("1_6vjd7")
-size = 30.0
+size = 25.0
-lod0_detail = 30
+lod0_detail = 25

project/scenes/editor.tscn

@@ -8,6 +8,7 @@ slope = -0.7
 height = 0.0
 
 [sub_resource type="PointPrimitive" id="PointPrimitive_ba0ut"]
+blend_range = 20.0
 center = Vector2(50, 0)
 slope = -0.7
 
@@ -126,6 +127,7 @@ func _unhandled_input(event: InputEvent) -> void:
 primitives = [SubResource("PointPrimitive_pxqd5"), SubResource("PointPrimitive_ba0ut"), SubResource("NoisePrimitive_ba0ut"), SubResource("NoisePrimitive_pxqd5"), SubResource("NoisePrimitive_q68jb"), SubResource("PlanePrimitive_pxqd5")]
 vertex_color_gradient = SubResource("Gradient_b1cmn")
 color_gradient_end_height = 100.0
+chunk_count = 15
 chunk_scene = ExtResource("1_pxqd5")
 point_primitive_object = ExtResource("1_b1cmn")