Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 15:28:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix build error

Browse source
This commit is contained in:
Triplelexx 2017-03-18 03:51:55 +00:00
parent a9b1a38665
commit 8e086a8fc8
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
interface/src/Application.cpp
View file

@ -2863,30 +2863,30 @@ void Application::keyPressEvent(QKeyEvent* event) {
break; break;
#endif #endif
case Qt::Key_H: case Qt::Key_H: {
// whenever switching to/from full screen mirror from the keyboard, remember // whenever switching to/from full screen mirror from the keyboard, remember
// the state you were in before full screen mirror, and return to that. // the state you were in before full screen mirror, and return to that.
auto previousMode = _myCamera.getMode(); auto previousMode = _myCamera.getMode();
if (previousMode != CAMERA_MODE_MIRROR) { if (previousMode != CAMERA_MODE_MIRROR) {
switch (previousMode) { switch (previousMode) {
case CAMERA_MODE_FIRST_PERSON: case CAMERA_MODE_FIRST_PERSON:
_returnFromFullScreenMirrorTo = MenuOption::FirstPerson; _returnFromFullScreenMirrorTo = MenuOption::FirstPerson;
break; break;
case CAMERA_MODE_THIRD_PERSON: case CAMERA_MODE_THIRD_PERSON:
_returnFromFullScreenMirrorTo = MenuOption::ThirdPerson; _returnFromFullScreenMirrorTo = MenuOption::ThirdPerson;
break; break;
// FIXME - it's not clear that these modes make sense to return to... // FIXME - it's not clear that these modes make sense to return to...
case CAMERA_MODE_INDEPENDENT: case CAMERA_MODE_INDEPENDENT:
_returnFromFullScreenMirrorTo = MenuOption::IndependentMode; _returnFromFullScreenMirrorTo = MenuOption::IndependentMode;
break; break;
case CAMERA_MODE_ENTITY: case CAMERA_MODE_ENTITY:
_returnFromFullScreenMirrorTo = MenuOption::CameraEntityMode; _returnFromFullScreenMirrorTo = MenuOption::CameraEntityMode;
break; break;
default: default:
_returnFromFullScreenMirrorTo = MenuOption::ThirdPerson; _returnFromFullScreenMirrorTo = MenuOption::ThirdPerson;
break; break;
} }
} }
@ -2904,6 +2904,8 @@ void Application::keyPressEvent(QKeyEvent* event) {
} }
cameraMenuChanged(); cameraMenuChanged();
break; break;
}
case Qt::Key_P: { case Qt::Key_P: {
if (!(isShifted || isMeta || isOption)) { if (!(isShifted || isMeta || isOption)) {
bool isFirstPersonChecked = Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson); bool isFirstPersonChecked = Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson);