From 63bd35e7cf782cc23d736e765817cfafe5ceae4e Mon Sep 17 00:00:00 2001 From: smix8 <52464204+smix8@users.noreply.github.com> Date: Sun, 20 Apr 2025 17:36:01 +0200 Subject: [PATCH] Move NavigationRegion3DGizmoPlugin to navigation_3d module Moves NavigationRegion3DGizmoPlugin to navigation_3d module. --- editor/plugins/node_3d_editor_plugin.cpp | 2 -- .../editor/navigation_region_3d_editor_plugin.cpp | 4 ++++ .../navigation_3d/editor/navigation_region_3d_editor_plugin.h | 4 ++++ .../editor}/navigation_region_3d_gizmo_plugin.cpp | 0 .../navigation_3d/editor}/navigation_region_3d_gizmo_plugin.h | 0 5 files changed, 8 insertions(+), 2 deletions(-) rename {editor/plugins/gizmos => modules/navigation_3d/editor}/navigation_region_3d_gizmo_plugin.cpp (100%) rename {editor/plugins/gizmos => modules/navigation_3d/editor}/navigation_region_3d_gizmo_plugin.h (100%) diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 8d1e5ef8220..daad0cd6b85 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -65,7 +65,6 @@ #include "editor/plugins/gizmos/marker_3d_gizmo_plugin.h" #include "editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.h" #include "editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.h" -#include "editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.h" #include "editor/plugins/gizmos/occluder_instance_3d_gizmo_plugin.h" #include "editor/plugins/gizmos/particles_3d_emission_shape_gizmo_plugin.h" #include "editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.h" @@ -8733,7 +8732,6 @@ void Node3DEditor::_register_all_gizmos() { add_gizmo_plugin(Ref(memnew(CollisionShape3DGizmoPlugin))); add_gizmo_plugin(Ref(memnew(CollisionPolygon3DGizmoPlugin))); add_gizmo_plugin(Ref(memnew(NavigationLink3DGizmoPlugin))); - add_gizmo_plugin(Ref(memnew(NavigationRegion3DGizmoPlugin))); add_gizmo_plugin(Ref(memnew(Joint3DGizmoPlugin))); add_gizmo_plugin(Ref(memnew(PhysicalBone3DGizmoPlugin))); add_gizmo_plugin(Ref(memnew(FogVolumeGizmoPlugin))); diff --git a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp index 8c4d340aed3..bc989be1b09 100644 --- a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp +++ b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp @@ -32,6 +32,7 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" +#include "editor/plugins/node_3d_editor_plugin.h" #include "scene/3d/navigation/navigation_region_3d.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" @@ -173,4 +174,7 @@ NavigationRegion3DEditorPlugin::NavigationRegion3DEditorPlugin() { add_control_to_container(CONTAINER_SPATIAL_EDITOR_MENU, navigation_region_editor->bake_hbox); navigation_region_editor->hide(); navigation_region_editor->bake_hbox->hide(); + + gizmo_plugin.instantiate(); + Node3DEditor::get_singleton()->add_gizmo_plugin(gizmo_plugin); } diff --git a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h index 1cea3150483..19c339d1ef4 100644 --- a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h +++ b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h @@ -32,6 +32,8 @@ #include "editor/plugins/editor_plugin.h" +#include "navigation_region_3d_gizmo_plugin.h" + class AcceptDialog; class Button; class HBoxContainer; @@ -69,6 +71,8 @@ class NavigationRegion3DEditorPlugin : public EditorPlugin { NavigationRegion3DEditor *navigation_region_editor = nullptr; + Ref gizmo_plugin; + public: virtual String get_plugin_name() const override { return "NavigationRegion3D"; } bool has_main_screen() const override { return false; } diff --git a/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.cpp b/modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.cpp similarity index 100% rename from editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.cpp rename to modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.cpp diff --git a/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.h b/modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.h similarity index 100% rename from editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.h rename to modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.h