From ad5389bc87e2d05690e06e2ebdd50e9665eea259 Mon Sep 17 00:00:00 2001 From: Malin E Date: Fri, 25 Nov 2022 10:53:14 +0100 Subject: [PATCH] Prevent joystick interaction during camera path or recording playback --- src/interaction/joystickcamerastates.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/interaction/joystickcamerastates.cpp b/src/interaction/joystickcamerastates.cpp index cd1be5bca7..f978a1fcd1 100644 --- a/src/interaction/joystickcamerastates.cpp +++ b/src/interaction/joystickcamerastates.cpp @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -46,6 +47,13 @@ void JoystickCameraStates::updateStateFromInput( const JoystickInputStates& joystickInputStates, double deltaTime) { + OpenSpaceEngine::Mode mode = global::openSpaceEngine->currentMode(); + if (mode == OpenSpaceEngine::Mode::CameraPath || + mode == OpenSpaceEngine::Mode::SessionRecordingPlayback) + { + return; + } + std::pair globalRotation = { false, glm::dvec2(0.0) }; std::pair zoom = { false, 0.0 }; std::pair localRoll = { false, glm::dvec2(0.0) };