Rename align with view

TokisanGames · Nov 16, 2023 · 16d4feb · 16d4feb
1 parent 92908d8
commit 16d4feb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/project/addons/terrain_3d/editor/components/tool_settings.gd b/project/addons/terrain_3d/editor/components/tool_settings.gd
@@ -56,7 +56,7 @@ func _ready() -> void:
 	## Advanced Settings Menu
 	advanced_list = create_submenu(list, "Advanced", Layout.VERTICAL)
 	add_setting(SettingType.CHECKBOX, "automatic_regions", true, advanced_list)
-	add_setting(SettingType.CHECKBOX, "align_with_view", true, advanced_list)
+	add_setting(SettingType.CHECKBOX, "align_to_view", true, advanced_list)
 	add_setting(SettingType.CHECKBOX, "show_cursor_while_painting", true, advanced_list)
 	advanced_list.add_child(HSeparator.new(), true)
 	add_setting(SettingType.SLIDER, "gamma", 1.0, advanced_list, "γ", 0.1, 2.0, 0.01)

diff --git a/project/addons/terrain_3d/editor/components/ui.gd b/project/addons/terrain_3d/editor/components/ui.gd
@@ -150,7 +150,7 @@ func _on_setting_changed() -> void:
 		"roughness": toolbar_settings.get_setting("roughness"),
 		"texture_index": plugin.texture_dock.get_selected_index(),
 		"automatic_regions": toolbar_settings.get_setting("automatic_regions"),
-		"align_with_view": toolbar_settings.get_setting("align_with_view"),
+		"align_to_view": toolbar_settings.get_setting("align_to_view"),
 		"show_cursor_while_painting": toolbar_settings.get_setting("show_cursor_while_painting"),
 		"gamma": toolbar_settings.get_setting("gamma"),
 		"jitter": toolbar_settings.get_setting("jitter"),
@@ -178,7 +178,7 @@ func update_decal() -> void:
 		decal.visible = true
 
 	decal.size = Vector3.ONE * brush_data["size"]
-	if brush_data["align_with_view"]:
+	if brush_data["align_to_view"]:
 		var cam: Camera3D = plugin.terrain.get_camera();
 		if (cam):
 			decal.rotation.y =cam.rotation.y

diff --git a/src/terrain_3d_editor.cpp b/src/terrain_3d_editor.cpp
@@ -32,7 +32,7 @@ void Terrain3DEditor::Brush::set_data(Dictionary p_data) {
 	_texture_index = p_data["texture_index"];
 
 	_auto_regions = p_data["automatic_regions"];
-	_align_to_view = p_data["align_with_view"];
+	_align_to_view = p_data["align_to_view"];
 	_gamma = p_data["gamma"];
 	_jitter = p_data["jitter"];
 }

diff --git a/src/terrain_3d_storage.cpp b/src/terrain_3d_storage.cpp
@@ -519,7 +519,7 @@ Vector3 Terrain3DStorage::get_mesh_vertex(int32_t p_lod, HeightFilter p_filter,
 Vector3 Terrain3DStorage::get_texture_id(Vector3 p_global_position) {
 	// Get bit field from pixel
 	uint32_t bits;
-	*(real_t *)&bits = get_pixel(TYPE_CONTROL, p_global_position).r;
+	*(float *)&bits = get_pixel(TYPE_CONTROL, p_global_position).r; // Must be 32-bit float, not double/real
 	uint32_t base_index = bits >> 27u & 0x1Fu;
 	uint32_t overlay_index = bits >> 22u & 0x1Fu;
 	real_t blend = real_t(bits >> 14u & 0xFFu) / 255.0f;