diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index a08800d625..99e3f5be12 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2227,7 +2227,7 @@ void Application::updateMetavoxels(float deltaTime) { } } -void Application::updateCameraMode() { +void Application::cameraMenuChanged() { float modeShiftPeriod = (_myCamera.getMode() == CAMERA_MODE_MIRROR) ? 0.0f : 1.0f; if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) { if (_myCamera.getMode() != CAMERA_MODE_MIRROR) { @@ -2317,9 +2317,6 @@ void Application::update(float deltaTime) { bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); PerformanceWarning warn(showWarnings, "Application::update()"); - // lots of things depend on the camera mode, so get that first - updateCameraMode(); - // check what's under the mouse and update the mouse voxel updateMouseRay(); diff --git a/interface/src/Application.h b/interface/src/Application.h index c1a96283a9..f3f4f3dbb2 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -269,6 +269,7 @@ private slots: void setFullscreen(bool fullscreen); void setEnable3DTVMode(bool enable3DTVMode); + void cameraMenuChanged(); void renderThrustAtVoxel(const glm::vec3& thrust); @@ -315,7 +316,6 @@ private: void updateSerialDevices(float deltaTime); void updateThreads(float deltaTime); void updateMetavoxels(float deltaTime); - void updateCameraMode(); void updateCamera(float deltaTime); void updateDialogs(float deltaTime); void updateAudio(float deltaTime); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 1a7cbe5e6f..7e5fe63524 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -232,9 +232,11 @@ Menu::Menu() : false, appInstance, SLOT(setFullscreen(bool))); - addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, Qt::Key_P, true); + addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, Qt::Key_P, true, + appInstance,SLOT(cameraMenuChanged())); addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror, Qt::SHIFT | Qt::Key_H, true); - addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror, Qt::Key_H, false); + addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror, Qt::Key_H, false, + appInstance, SLOT(cameraMenuChanged())); addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Enable3DTVMode, 0, false,