Instancer storage rework

project/addons/terrain_3d/editor.gd

@@ -105,11 +105,11 @@ func _edit(p_object: Object) -> void:
 			return
 		terrain = p_object
 		_last_terrain = terrain
+		terrain.set_plugin(self)
+		terrain.set_editor(editor)
 		editor.set_terrain(terrain)
 		region_gizmo.set_node_3d(terrain)
 		terrain.add_gizmo(region_gizmo)
-		terrain.set_plugin(self)
-		terrain.set_editor(editor)
 		ui.set_visible(true)
 		terrain.set_meta("_edit_lock_", true)
 
@@ -243,7 +243,12 @@ func _forward_3d_gui_input(p_viewport_camera: Camera3D, p_event: InputEvent) ->
 
 func _read_input(p_event: InputEvent = null) -> void:
 	## Determine if user is moving camera or applying
-	_input_mode = 1 if Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT) else 0
+	if Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT) or \
+		p_event is InputEventMouseButton and p_event.is_released() and \
+		p_event.get_button_index() == MOUSE_BUTTON_LEFT:
+			_input_mode = 1 
+	else:
+			_input_mode = 0
 
 	match get_setting("editors/3d/navigation/navigation_scheme", 0):
 		2, 1: # Modo, Maya

project/addons/terrain_3d/src/ui.gd

@@ -316,7 +316,7 @@ func update_decal() -> void:
 
 	decal.position = plugin.mouse_global_position
 	decal.visible = true
-	decal.size = Vector3.ONE * brush_data["size"]
+	decal.size = Vector3.ONE * maxf(brush_data["size"], .5)
 	if brush_data["align_to_view"]:
 		var cam: Camera3D = plugin.terrain.get_camera();
 		if (cam):

project/demo/components/UI.tscn

@@ -14,8 +14,53 @@ script = ExtResource("1_why5e")
 [node name="Label" type="Label" parent="."]
 unique_name_in_owner = true
 layout_mode = 1
-offset_right = 40.0
-offset_bottom = 23.0
+offset_left = 5.0
+offset_top = 5.0
+offset_right = 275.0
+offset_bottom = 340.0
 theme_override_colors/font_shadow_color = Color(0, 0, 0, 0.662745)
 theme_override_constants/shadow_offset_x = 1
 theme_override_constants/shadow_offset_y = 1
+text = "FPS: 100
+Position: (100, 100, 100)
+Move Speed: 10
+
+Player
+Move: WASDEQ,Space,Mouse
+Move speed: Wheel,+/-,Shift
+Camera view: V
+Gravity toggle: G
+Collision toggle: C
+
+Window
+Quit: F8
+UI toggle: F9
+Render mode: F10
+Full screen: F11
+Mouse toggle: Escape
+"
+
+[node name="Panel" type="Panel" parent="Label"]
+modulate = Color(1, 1, 1, 0.392157)
+show_behind_parent = true
+layout_mode = 0
+offset_left = -5.0
+offset_top = -5.0
+offset_right = 248.0
+offset_bottom = 444.0
+
+[node name="HSeparator" type="HSeparator" parent="Label/Panel"]
+top_level = true
+layout_mode = 0
+offset_left = 6.0
+offset_top = 129.0
+offset_right = 246.0
+offset_bottom = 138.0
+
+[node name="HSeparator2" type="HSeparator" parent="Label/Panel"]
+top_level = true
+layout_mode = 0
+offset_left = 6.0
+offset_top = 310.0
+offset_right = 246.0
+offset_bottom = 319.0

project/demo/data/assets.tres

@@ -5,16 +5,20 @@
 [ext_resource type="Texture2D" uid="uid://ddprscrpsofah" path="res://demo/assets/textures/ground037_alb_ht.png" id="3_g8f2m"]
 [ext_resource type="Texture2D" uid="uid://c1ots7w6i0i1q" path="res://demo/assets/textures/ground037_nrm_rgh.png" id="4_aw5y1"]
 
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6fvgb"]
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_aubfq"]
+transparency = 4
 cull_mode = 2
 vertex_color_use_as_albedo = true
 backlight_enabled = true
 backlight = Color(0.5, 0.5, 0.5, 1)
+distance_fade_mode = 1
+distance_fade_min_distance = 960.0
+distance_fade_max_distance = 480.0
 
-[sub_resource type="Terrain3DMeshAsset" id="Terrain3DMeshAsset_xqljq"]
+[sub_resource type="Terrain3DMeshAsset" id="Terrain3DMeshAsset_dw1mh"]
 height_offset = 0.5
 density = 10.0
-material_override = SubResource("StandardMaterial3D_6fvgb")
+material_override = SubResource("StandardMaterial3D_aubfq")
 generated_type = 1
 
 [sub_resource type="Terrain3DTextureAsset" id="Terrain3DTextureAsset_mup2f"]
@@ -31,5 +35,5 @@ albedo_texture = ExtResource("3_g8f2m")
 normal_texture = ExtResource("4_aw5y1")
 
 [resource]
-mesh_list = Array[Terrain3DMeshAsset]([SubResource("Terrain3DMeshAsset_xqljq")])
+mesh_list = Array[Terrain3DMeshAsset]([SubResource("Terrain3DMeshAsset_dw1mh")])
 texture_list = Array[Terrain3DTextureAsset]([SubResource("Terrain3DTextureAsset_mup2f"), SubResource("Terrain3DTextureAsset_od0q7")])

project/demo/src/UI.gd

@@ -2,6 +2,7 @@ extends Control
 
 
 var player: Node
+var visible_mode: int = 1
 
 
 func _init() -> void:
@@ -10,26 +11,35 @@ func _init() -> void:
 
 func _process(p_delta) -> void:
 	$Label.text = "FPS: %s\n" % str(Engine.get_frames_per_second())
-	$Label.text += "Move Speed: %.1f\n" % player.MOVE_SPEED if player else ""
-	$Label.text += "Position: %.1v\n" % player.global_position if player else ""
-	$Label.text += "Move: WASDEQ/Space/Shift/Mouse\n"
-	$Label.text += "Move speed: Wheel,+/-\n"
-	$Label.text += "Camera View: V\n"
-	$Label.text += "Gravity toggle: G\n"
-	$Label.text += "Collision toggle: C\n"
-	$Label.text += "Hide UI: H\n"
-	$Label.text += "Full screen: F11\n"
-	$Label.text += "Mouse toggle: Escape\n"
-	$Label.text += "Quit: F8\n"
+	if(visible_mode == 1):
+		$Label.text += "Move Speed: %.1f\n" % player.MOVE_SPEED if player else ""
+		$Label.text += "Position: %.1v\n" % player.global_position if player else ""
+		$Label.text += """
+			Player
+			Move: WASDEQ,Space,Mouse
+			Move speed: Wheel,+/-,Shift
+			Camera View: V
+			Gravity toggle: G
+			Collision toggle: C
+
+			Window
+			Quit: F8
+			UI toggle: F9
+			Render mode: F10
+			Full screen: F11
+			Mouse toggle: Escape
+			"""
 
 
 func _unhandled_key_input(p_event: InputEvent) -> void:
 	if p_event is InputEventKey and p_event.pressed:
 		match p_event.keycode:
-			KEY_H:
-				visible = ! visible
 			KEY_F8:
 				get_tree().quit()
+			KEY_F9:
+				visible_mode = (visible_mode + 1 ) % 3
+				$Label/Panel.visible = (visible_mode == 1)
+				visible = visible_mode > 0
 			KEY_F10:
 				var vp = get_viewport()
 				vp.debug_draw = (vp.debug_draw + 1 ) % 6

src/constants.h

@@ -87,4 +87,23 @@ using namespace godot;
 		return ret;                                               \
 	}
 
+// Global Types
+
+struct Vector2iHash {
+	std::size_t operator()(const Vector2i &v) const {
+		std::size_t h1 = std::hash<int>()(v.x);
+		std::size_t h2 = std::hash<int>()(v.y);
+		return h1 ^ (h2 << 1);
+	}
+};
+
+struct Vector3Hash {
+	std::size_t operator()(const Vector3 &v) const {
+		std::size_t h1 = std::hash<float>()(v.x);
+		std::size_t h2 = std::hash<float>()(v.y);
+		std::size_t h3 = std::hash<float>()(v.z);
+		return h1 ^ (h2 << 1) ^ (h3 << 2);
+	}
+};
+
 #endif // CONSTANTS_CLASS_H

src/geoclipmap.cpp

@@ -11,17 +11,6 @@
 
 // Half each triangle, have to check for longest side.
 void GeoClipMap::_subdivide_half(PackedVector3Array &vertices, PackedInt32Array &indices) {
-
-	// Hash for map for quick vertex search, for loop was very very slow!
-	struct Vector3Hash {
-		std::size_t operator()(const Vector3 &v) const {
-			std::size_t h1 = std::hash<float>()(v.x);
-			std::size_t h2 = std::hash<float>()(v.y);
-			std::size_t h3 = std::hash<float>()(v.z);
-			return h1 ^ (h2 << 1) ^ (h3 << 2);
-		}
-	};
-
 	PackedVector3Array new_vertices;
 	PackedInt32Array new_indices;
 

src/register_types.cpp

@@ -21,12 +21,12 @@ void initialize_terrain_3d(ModuleInitializationLevel p_level) {
 	ClassDB::register_class<Terrain3DInstancer>();
 	ClassDB::register_class<Terrain3DMaterial>();
 	ClassDB::register_class<Terrain3DMeshAsset>();
-	ClassDB::register_class<Terrain3DStorage>(); // Deprecated 0.9.3 - Remove 0.9.4+
+	ClassDB::register_class<Terrain3DStorage>(); // Deprecated 0.9.3 - Remove 1.0
 	ClassDB::register_class<Terrain3DRegion>();
 	ClassDB::register_class<Terrain3DTextureAsset>();
 	ClassDB::register_class<Terrain3DUtil>();
-	ClassDB::register_class<Terrain3DTexture>(); // Deprecated 0.9.2 - Remove 0.9.3+
-	ClassDB::register_class<Terrain3DTextureList>(); // Deprecated 0.9.2 - Remove 0.9.3+
+	ClassDB::register_class<Terrain3DTexture>(); // Deprecated 0.9.2 - Remove 1.0
+	ClassDB::register_class<Terrain3DTextureList>(); // Deprecated 0.9.2 - Remove 1.0
 }
 
 void uninitialize_terrain_3d(ModuleInitializationLevel p_level) {

src/shaders/debug_views.glsl

@@ -133,8 +133,8 @@ R"(
 //INSERT: DEBUG_REGION_GRID
 	// Show region grid
 	vec3 __pixel_pos1 = (INV_VIEW_MATRIX * vec4(VERTEX,1.0)).xyz;
-	float __region_line = 0.5;		// Region line thickness
-	__region_line = .1*sqrt(length(v_camera_pos - __pixel_pos1));
+	float __region_line = 1.0;		// Region line thickness
+	__region_line *= .1*sqrt(length(v_camera_pos - __pixel_pos1));
 	if (mod(__pixel_pos1.x * _vertex_density + __region_line*.5, _region_size) <= __region_line || 
 		mod(__pixel_pos1.z * _vertex_density + __region_line*.5, _region_size) <= __region_line ) {
 		ALBEDO = vec3(1.);
@@ -162,4 +162,15 @@ R"(
 	}
 	ALBEDO = fma(ALBEDO, 1.-__vertex_mul, __vertex_add);
 
+//INSERT: DEBUG_INSTANCER_GRID
+	// Show region grid
+	vec3 __pixel_pos3 = (INV_VIEW_MATRIX * vec4(VERTEX,1.0)).xyz;
+	float __cell_line = 0.5;		// Cell line thickness
+	__cell_line *= .1*sqrt(length(v_camera_pos - __pixel_pos3));
+	#define CELL_SIZE 32
+	if (mod(__pixel_pos3.x * _vertex_density + __cell_line*.5, CELL_SIZE) <= __cell_line || 
+		mod(__pixel_pos3.z * _vertex_density + __cell_line*.5, CELL_SIZE) <= __cell_line ) {
+		ALBEDO = vec3(.033);
+	}
+
 )"