From 94a9792d0206a8c093bb7374499d8a9d5d8597c1 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 12 Dec 2022 15:55:25 +0100 Subject: [PATCH] Rearranged ViewportNavigationControl. --- editor/plugins/spatial_editor_plugin.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index 17ca0b33a..c5d9ba16e 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -872,14 +872,9 @@ public: class ViewportNavigationControl : public Control { GDCLASS(ViewportNavigationControl, Control); - SpatialEditorViewport *viewport = nullptr; - Vector2i focused_mouse_start; - Vector2 focused_pos; - bool hovered = false; - int focused_index = -1; - SpatialEditorViewport::NavigationMode nav_mode = SpatialEditorViewport::NavigationMode::NAVIGATION_NONE; - - const float AXIS_CIRCLE_RADIUS = 30.0f * EDSCALE; +public: + void set_navigation_mode(SpatialEditorViewport::NavigationMode p_nav_mode); + void set_viewport(SpatialEditorViewport *p_viewport); protected: static void _bind_methods(); @@ -892,9 +887,15 @@ protected: void _process_drag(int p_index, Vector2 p_position, Vector2 p_relative_position); void _update_navigation(); -public: - void set_navigation_mode(SpatialEditorViewport::NavigationMode p_nav_mode); - void set_viewport(SpatialEditorViewport *p_viewport); +private: + SpatialEditorViewport *viewport = nullptr; + Vector2i focused_mouse_start; + Vector2 focused_pos; + bool hovered = false; + int focused_index = -1; + SpatialEditorViewport::NavigationMode nav_mode = SpatialEditorViewport::NavigationMode::NAVIGATION_NONE; + + const float AXIS_CIRCLE_RADIUS = 30.0f * EDSCALE; }; #endif