From a5dff2cc77aa96f02bdcfeacad6abb6eefbb031c Mon Sep 17 00:00:00 2001
From: Robert Yevdokimov <105675984+ryevdokimov@users.noreply.github.com>
Date: Wed, 8 Jan 2025 12:55:26 -0500
Subject: [PATCH] Make references of editor viewport freelook active consistent
 and remove unused accessor

---
 editor/plugins/node_3d_editor_plugin.cpp | 18 +++++++++---------
 editor/plugins/node_3d_editor_plugin.h   |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
index 062fa01758a..b0a0f3afc44 100644
--- a/editor/plugins/node_3d_editor_plugin.cpp
+++ b/editor/plugins/node_3d_editor_plugin.cpp
@@ -530,7 +530,7 @@ void Node3DEditorViewport::_update_camera(real_t p_interp_delta) {
 		//-------
 		// Perform smoothing
 
-		if (is_freelook_active()) {
+		if (freelook_active) {
 			// Higher inertia should increase "lag" (lerp with factor between 0 and 1)
 			// Inertia of zero should produce instant movement (lerp with factor of 1) in this case it returns a really high value and gets clamped to 1.
 			const real_t inertia = EDITOR_GET("editors/3d/freelook/freelook_inertia");
@@ -1704,14 +1704,14 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 		const real_t zoom_factor = 1 + (ZOOM_FREELOOK_MULTIPLIER - 1) * b->get_factor();
 		switch (b->get_button_index()) {
 			case MouseButton::WHEEL_UP: {
-				if (is_freelook_active()) {
+				if (freelook_active) {
 					scale_freelook_speed(zoom_factor);
 				} else {
 					scale_cursor_distance(1.0 / zoom_factor);
 				}
 			} break;
 			case MouseButton::WHEEL_DOWN: {
-				if (is_freelook_active()) {
+				if (freelook_active) {
 					scale_freelook_speed(1.0 / zoom_factor);
 				} else {
 					scale_cursor_distance(zoom_factor);
@@ -2189,7 +2189,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 
 	Ref<InputEventMagnifyGesture> magnify_gesture = p_event;
 	if (magnify_gesture.is_valid()) {
-		if (is_freelook_active()) {
+		if (freelook_active) {
 			scale_freelook_speed(magnify_gesture->get_factor());
 		} else {
 			scale_cursor_distance(1.0 / magnify_gesture->get_factor());
@@ -2285,7 +2285,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 		}
 
 		if (_edit.mode == TRANSFORM_NONE) {
-			if (_edit.gizmo.is_null() && is_freelook_active() && k->get_keycode() == Key::ESCAPE) {
+			if (_edit.gizmo.is_null() && freelook_active && k->get_keycode() == Key::ESCAPE) {
 				set_freelook_active(false);
 				return;
 			}
@@ -2428,7 +2428,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 		if (ED_IS_SHORTCUT("spatial_editor/cancel_transform", p_event) && _edit.mode != TRANSFORM_NONE) {
 			cancel_transform();
 		}
-		if (!is_freelook_active() && !k->is_echo()) {
+		if (!freelook_active && !k->is_echo()) {
 			if (ED_IS_SHORTCUT("spatial_editor/instant_translate", p_event) && (_edit.mode != TRANSFORM_TRANSLATE || collision_reposition)) {
 				if (_edit.mode == TRANSFORM_NONE) {
 					begin_transform(TRANSFORM_TRANSLATE, true);
@@ -2469,7 +2469,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 
 		// Freelook doesn't work in orthogonal mode.
 		if (!orthogonal && ED_IS_SHORTCUT("spatial_editor/freelook_toggle", p_event)) {
-			set_freelook_active(!is_freelook_active());
+			set_freelook_active(!freelook_active);
 
 		} else if (k->get_keycode() == Key::ESCAPE) {
 			set_freelook_active(false);
@@ -2750,7 +2750,7 @@ Point2 Node3DEditorViewport::_get_warped_mouse_motion(const Ref<InputEventMouseM
 }
 
 void Node3DEditorViewport::_update_freelook(real_t delta) {
-	if (!is_freelook_active()) {
+	if (!freelook_active) {
 		return;
 	}
 
@@ -3411,7 +3411,7 @@ void Node3DEditorViewport::_draw() {
 
 	} else {
 		if (zoom_indicator_delay > 0.0) {
-			if (is_freelook_active()) {
+			if (freelook_active) {
 				// Show speed
 
 				real_t min_speed = MAX(camera->get_near() * 4, ZOOM_FREELOOK_MIN);
diff --git a/editor/plugins/node_3d_editor_plugin.h b/editor/plugins/node_3d_editor_plugin.h
index 6b603864c2c..9c29cade4a7 100644
--- a/editor/plugins/node_3d_editor_plugin.h
+++ b/editor/plugins/node_3d_editor_plugin.h
@@ -537,7 +537,6 @@ public:
 	void set_state(const Dictionary &p_state);
 	Dictionary get_state() const;
 	void reset();
-	bool is_freelook_active() const { return freelook_active; }
 
 	Vector3 get_ray_pos(const Vector2 &p_pos) const;
 	Vector3 get_ray(const Vector2 &p_pos) const;