Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:12:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Updating the camera mode every frame screws with the scripts, so revert to

Browse source 
updating it when the menu changes.
This commit is contained in:
Andrzej Kapolka 2014-02-24 11:42:47 -08:00
parent 8efc4d52ba
commit e40fe85c36
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -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; float modeShiftPeriod = (_myCamera.getMode() == CAMERA_MODE_MIRROR) ? 0.0f : 1.0f;
if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) { if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
if (_myCamera.getMode() != CAMERA_MODE_MIRROR) { if (_myCamera.getMode() != CAMERA_MODE_MIRROR) {
@ -2317,9 +2317,6 @@ void Application::update(float deltaTime) {
bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
PerformanceWarning warn(showWarnings, "Application::update()"); 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 // check what's under the mouse and update the mouse voxel
updateMouseRay(); updateMouseRay();

2
interface/src/Application.h
View file

@ -269,6 +269,7 @@ private slots:
void setFullscreen(bool fullscreen); void setFullscreen(bool fullscreen);
void setEnable3DTVMode(bool enable3DTVMode); void setEnable3DTVMode(bool enable3DTVMode);
void cameraMenuChanged();
void renderThrustAtVoxel(const glm::vec3& thrust); void renderThrustAtVoxel(const glm::vec3& thrust);
@ -315,7 +316,6 @@ private:
void updateSerialDevices(float deltaTime); void updateSerialDevices(float deltaTime);
void updateThreads(float deltaTime); void updateThreads(float deltaTime);
void updateMetavoxels(float deltaTime); void updateMetavoxels(float deltaTime);
void updateCameraMode();
void updateCamera(float deltaTime); void updateCamera(float deltaTime);
void updateDialogs(float deltaTime); void updateDialogs(float deltaTime);
void updateAudio(float deltaTime); void updateAudio(float deltaTime);

6
interface/src/Menu.cpp
View file

@ -232,9 +232,11 @@ Menu::Menu() :
false, false,
appInstance, appInstance,
SLOT(setFullscreen(bool))); 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::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, addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Enable3DTVMode, 0,
false, false,