diff --git a/editor/plugins/path_editor_plugin.cpp b/editor/plugins/path_editor_plugin.cpp index 17ce82f09..142e7c4e4 100644 --- a/editor/plugins/path_editor_plugin.cpp +++ b/editor/plugins/path_editor_plugin.cpp @@ -646,7 +646,7 @@ Ref PathSpatialGizmoPlugin::create_gizmo(Spatial *p_spatial) return ref; } -String PathSpatialGizmoPlugin::get_name() const { +String PathSpatialGizmoPlugin::get_gizmo_name() const { return "Path"; } diff --git a/editor/plugins/path_editor_plugin.h b/editor/plugins/path_editor_plugin.h index 474bec841..ed31f21ba 100644 --- a/editor/plugins/path_editor_plugin.h +++ b/editor/plugins/path_editor_plugin.h @@ -75,7 +75,7 @@ protected: Ref create_gizmo(Spatial *p_spatial); public: - String get_name() const; + String get_gizmo_name() const; int get_priority() const; PathSpatialGizmoPlugin(); }; diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index 860647e67..b93e1866f 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -2252,7 +2252,7 @@ bool ShapeCastGizmoPlugin::has_gizmo(Spatial *p_spatial) { return Object::cast_to(p_spatial) != nullptr; } -String ShapeCastGizmoPlugin::get_name() const { +String ShapeCastGizmoPlugin::get_gizmo_name() const { return "ShapeCast"; } diff --git a/editor/spatial_editor_gizmos.h b/editor/spatial_editor_gizmos.h index d1d657d9c..36fc2d514 100644 --- a/editor/spatial_editor_gizmos.h +++ b/editor/spatial_editor_gizmos.h @@ -355,7 +355,7 @@ class ShapeCastGizmoPlugin : public EditorSpatialGizmoPlugin { public: bool has_gizmo(Spatial *p_spatial); - String get_name() const; + String get_gizmo_name() const; int get_priority() const; void redraw(EditorSpatialGizmo *p_gizmo); @@ -595,13 +595,12 @@ public: class RoomGizmoPlugin : public EditorSpatialGizmoPlugin { GDCLASS(RoomGizmoPlugin, EditorSpatialGizmoPlugin); -protected: +public: virtual bool has_gizmo(Spatial *p_spatial); String get_gizmo_name() const; int get_priority() const; Ref create_gizmo(Spatial *p_spatial); -public: RoomGizmoPlugin(); }; @@ -627,13 +626,12 @@ public: class PortalGizmoPlugin : public EditorSpatialGizmoPlugin { GDCLASS(PortalGizmoPlugin, EditorSpatialGizmoPlugin); -protected: +public: virtual bool has_gizmo(Spatial *p_spatial); String get_gizmo_name() const; int get_priority() const; Ref create_gizmo(Spatial *p_spatial); -public: PortalGizmoPlugin(); }; @@ -661,6 +659,7 @@ class OccluderSpatialGizmo : public EditorSpatialGizmo { void _redraw_poly(bool p_hole, const Vector &p_pts, const PoolVector &p_pts_raw); public: + String get_gizmo_name() const; virtual String get_handle_name(int p_id, bool p_secondary) const; virtual Variant get_handle_value(int p_id, bool p_secondary); virtual void set_handle(int p_id, bool p_secondary, Camera *p_camera, const Point2 &p_point);