Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Add the ability to cancel pan/zoom/orbit navigation

Browse source
This commit is contained in:
Robert Yevdokimov 2025-04-26 18:55:57 +04:00 • committed by ryevdokimov
parent 220b0b2f74
commit 05c915566c
5 changed files with 52 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

33
scene/debugger/view_3d_controller.cpp
View file

@ -120,6 +120,11 @@ View3DController::NavigationMode View3DController::_get_nav_mode_from_shortcuts(
bool View3DController::gui_input(const Ref<InputEvent> &p_event, const Rect2 &p_surface_rect) {
Ref<InputEventMouseButton> b = p_event;
if (b.is_valid()) {
if (b->get_button_index() == MouseButton::RIGHT && b->is_pressed() && navigating) {
cancel_navigation();
return true;
}
const real_t zoom_factor = 1 + (ZOOM_FREELOOK_MULTIPLIER - 1) * b->get_factor();
switch (b->get_button_index()) {
case MouseButton::WHEEL_UP: {
@ -168,6 +173,18 @@ bool View3DController::gui_input(const Ref<InputEvent> &p_event, const Rect2 &p_
Ref<InputEventMouseMotion> m = p_event;
if (m.is_valid()) {
if (m->get_button_mask() == MouseButtonMask::NONE) {
navigation_cancelled = false;
}
if (navigation_cancelled) {
return false;
}
if (!navigating) {
previous_cursor = cursor;
}
NavigationMode nav_mode = NAV_MODE_NONE;
if (m->get_button_mask().has_flag(MouseButtonMask::LEFT)) {
@ -229,10 +246,14 @@ bool View3DController::gui_input(const Ref<InputEvent> &p_event, const Rect2 &p_
} break;
default: {
navigating = false;
return false;
}
}
if (!freelook) {
navigating = true;
}
return true;
}
@ -283,6 +304,12 @@ bool View3DController::gui_input(const Ref<InputEvent> &p_event, const Rect2 &p_
return true;
}
Ref<InputEventKey> k = p_event;
if (k.is_valid() && k->is_pressed() && !k->is_echo() && k->get_keycode() == Key::ESCAPE && navigating) {
cancel_navigation();
return true;
}
bool pressed = false;
float old_fov_scale = cursor.fov_scale;
@ -306,6 +333,12 @@ bool View3DController::gui_input(const Ref<InputEvent> &p_event, const Rect2 &p_
return pressed;
}
void View3DController::cancel_navigation() {
navigating = false;
navigation_cancelled = true;
cursor = previous_cursor;
}
void View3DController::cursor_pan(const Ref<InputEventWithModifiers> &p_event, const Vector2 &p_relative) {
float pan_speed = translation_sensitivity / 150.0;
if (p_event.is_valid() && navigation_scheme == NAV_SCHEME_MAYA && p_event->is_shift_pressed()) {