[4.4] Use R/F keys for local up/down and Space/Ctrl for global up/down

Author: aaronfranke

editor/plugins/node_3d_editor_plugin.cpp

@@ -240,7 +240,7 @@ void ViewportNavigationControl::_update_navigation() {
 
 			Vector3 forward;
 			if (navigation_scheme == Node3DEditorViewport::FreelookNavigationScheme::FREELOOK_FULLY_AXIS_LOCKED) {
-				// Forward/backward keys will always go straight forward/backward, never moving on the Y axis.
+				// Forward/backward keys will always go horizontally forward/backward, never moving on the Y axis.
 				forward = Vector3(0, 0, delta_normalized.y).rotated(Vector3(0, 1, 0), viewport->camera->get_rotation().y);
 			} else {
 				// Forward/backward keys will be relative to the camera pitch.
@@ -2776,18 +2776,19 @@ void Node3DEditorViewport::_update_freelook(real_t delta) {
 		forward = Vector3(0, 0, -1).rotated(Vector3(0, 1, 0), camera->get_rotation().y);
 	} else {
 		// Forward/backward keys will be relative to the camera pitch.
-		forward = camera->get_transform().basis.xform(Vector3(0, 0, -1));
+		forward = -camera->get_transform().basis.get_column(2);
 	}
 
-	const Vector3 right = camera->get_transform().basis.xform(Vector3(1, 0, 0));
+	const Vector3 right = camera->get_transform().basis.get_column(0);
 
+	Vector3 local_up = camera->get_transform().basis.get_column(1);
 	Vector3 up;
 	if (navigation_scheme == FREELOOK_PARTIALLY_AXIS_LOCKED || navigation_scheme == FREELOOK_FULLY_AXIS_LOCKED) {
 		// Up/down keys will always go up/down regardless of camera pitch.
 		up = Vector3(0, 1, 0);
 	} else {
 		// Up/down keys will be relative to the camera pitch.
-		up = camera->get_transform().basis.xform(Vector3(0, 1, 0));
+		up = local_up;
 	}
 
 	Vector3 direction;
@@ -2813,6 +2814,18 @@ void Node3DEditorViewport::_update_freelook(real_t delta) {
 	if (inp->is_action_pressed("spatial_editor/freelook_down")) {
 		direction -= up;
 	}
+	if (inp->is_action_pressed("spatial_editor/freelook_global_up")) {
+		direction += Vector3(0, 1, 0);
+	}
+	if (inp->is_action_pressed("spatial_editor/freelook_global_down")) {
+		direction -= Vector3(0, 1, 0);
+	}
+	if (inp->is_action_pressed("spatial_editor/freelook_local_up")) {
+		direction += local_up;
+	}
+	if (inp->is_action_pressed("spatial_editor/freelook_local_down")) {
+		direction -= local_up;
+	}
 
 	real_t speed = freelook_speed;
 
@@ -5462,6 +5475,12 @@ void Node3DEditorViewport::register_shortcut_action(const String &p_path, const
 	sc->connect_changed(callable_mp(this, &Node3DEditorViewport::shortcut_changed_callback).bind(sc, p_path));
 }
 
+void Node3DEditorViewport::register_shortcuts_action(const String &p_path, const String &p_name, const PackedInt32Array &p_keycodes, bool p_physical) {
+	Ref<Shortcut> sc = ED_SHORTCUT_ARRAY(p_path, p_name, p_keycodes, p_physical);
+	shortcut_changed_callback(sc, p_path);
+	sc->connect_changed(callable_mp(this, &Node3DEditorViewport::shortcut_changed_callback).bind(sc, p_path));
+}
+
 // Update the action in the InputMap to the provided shortcut events.
 void Node3DEditorViewport::shortcut_changed_callback(const Ref<Shortcut> p_shortcut, const String &p_shortcut_path) {
 	InputMap *im = InputMap::get_singleton();
@@ -5666,6 +5685,10 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 	register_shortcut_action("spatial_editor/freelook_backwards", TTRC("Freelook Backwards"), Key::S, true);
 	register_shortcut_action("spatial_editor/freelook_up", TTRC("Freelook Up"), Key::E, true);
 	register_shortcut_action("spatial_editor/freelook_down", TTRC("Freelook Down"), Key::Q, true);
+	register_shortcut_action("spatial_editor/freelook_global_up", TTRC("Freelook Global Up"), Key::SPACE, true);
+	register_shortcuts_action("spatial_editor/freelook_global_down", TTRC("Freelook Global Down"), { int32_t(Key::CTRL), int32_t(Key::META) }, true);
+	register_shortcut_action("spatial_editor/freelook_local_up", TTRC("Freelook Local Up"), Key::R, true);
+	register_shortcut_action("spatial_editor/freelook_local_down", TTRC("Freelook Local Down"), Key::F, true);
 	register_shortcut_action("spatial_editor/freelook_speed_modifier", TTRC("Freelook Speed Modifier"), Key::SHIFT);
 	register_shortcut_action("spatial_editor/freelook_slow_modifier", TTRC("Freelook Slow Modifier"), Key::ALT);
 

editor/plugins/node_3d_editor_plugin.h

@@ -522,6 +522,7 @@ class Node3DEditorViewport : public Control {
 	void finish_transform();
 
 	void register_shortcut_action(const String &p_path, const String &p_name, Key p_keycode, bool p_physical = false);
+	void register_shortcuts_action(const String &p_path, const String &p_name, const PackedInt32Array &p_keycodes, bool p_physical = false);
 	void shortcut_changed_callback(const Ref<Shortcut> p_shortcut, const String &p_shortcut_path);
 
 	void _set_lock_view_rotation(bool p_lock_rotation);