Pick ray now ignores invisible blocks.

blackears · Jan 9, 2024 · 5100af7 · 5100af7
1 parent 981f5ea
commit 5100af7
Show file tree

Hide file tree

Showing 6 changed files with 969 additions and 176 deletions.
diff --git a/godot/addons/cyclops_level_builder/cyclops_level_builder.gd b/godot/addons/cyclops_level_builder/cyclops_level_builder.gd
@@ -407,6 +407,9 @@ func intersect_ray_closest(origin:Vector3, dir:Vector3)->IntersectResults:
 	var blocks:Array[CyclopsBlock] = get_blocks()
 
 	for block in blocks:
+		if !block.is_visible_in_tree():
+			continue
+
 		var result:IntersectResults = block.intersect_ray_closest(origin, dir)
 #			print("isect %s %s" % [node.name, result])
 		if result:

diff --git a/godot/addons/cyclops_level_builder/exporter/exporter_gltf_wizard.tscn b/godot/addons/cyclops_level_builder/exporter/exporter_gltf_wizard.tscn
@@ -28,12 +28,14 @@ layout_mode = 2
 [node name="check_flatten" type="CheckBox" parent="MarginContainer/VBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
+tooltip_text = "If unchecked, the scene heierarchy will be refelected in the exported nodes.  Otherwise all nodes will be children of the root."
 button_pressed = true
 text = "Flatten"
 
 [node name="check_markers" type="CheckBox" parent="MarginContainer/VBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
+tooltip_text = "Include Marker3Ds in export."
 button_pressed = true
 text = "Markers"
 

diff --git a/godot/addons/cyclops_level_builder/tools/tool_edit_edge.gd b/godot/addons/cyclops_level_builder/tools/tool_edit_edge.gd
@@ -221,7 +221,8 @@ func start_drag(viewport_camera:Camera3D, event:InputEvent):
 				GizmoTranslate.Part.PLANE_YZ:
 					move_constraint = MoveConstraint.Type.PLANE_YZ
 
-			drag_handle_start_pos = gizmo_translate.global_position
+			drag_handle_start_pos = part_res.pos_world
+#			drag_handle_start_pos = gizmo_translate.global_position
 			#var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
 
 			#drag_handle_start_pos = MathUtil.snap_to_grid(start_pos, grid_step_size)

diff --git a/godot/addons/cyclops_level_builder/tools/tool_edit_face.gd b/godot/addons/cyclops_level_builder/tools/tool_edit_face.gd
@@ -251,13 +251,14 @@ func start_drag(viewport_camera:Camera3D, event:InputEvent):
 				GizmoTranslate.Part.PLANE_YZ:
 					move_constraint = MoveConstraint.Type.PLANE_YZ
 
-			#var start_pos:Vector3 = part_res.pos_world
+			var start_pos:Vector3 = part_res.pos_world
 			#var grid_step_size:float = pow(2, builder.get_global_scene().grid_size)
 
 #			drag_handle_start_pos = MathUtil.snap_to_grid(start_pos, grid_step_size)
 			#drag_handle_start_pos = builder.get_snapping_manager().snap_point(start_pos, SnappingQuery.new(viewport_camera))
 
-			drag_handle_start_pos = gizmo_translate.global_position
+			drag_handle_start_pos = start_pos
+#			drag_handle_start_pos = gizmo_translate.global_position
 
 	#		print("res obj %s" % result.object.get_path())
 			var sel_blocks:Array[CyclopsBlock] = builder.get_selected_blocks()

diff --git a/godot/addons/cyclops_level_builder/tools/tool_material_brush.gd b/godot/addons/cyclops_level_builder/tools/tool_material_brush.gd
@@ -111,6 +111,7 @@ func _gui_input(viewport_camera:Camera3D, event:InputEvent)->bool:
 			var result:IntersectResults = builder.intersect_ray_closest(origin, dir)
 
 			if result:
+				print ("hit ", result.object.name)
 				cmd.undo_it()
 				var block:CyclopsBlock = result.object
 				if settings.individual_faces: