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

use alt+h for mirror-mode

Browse source
This commit is contained in:
Seth Alves 2017-07-24 16:04:11 -07:00
parent e53badf88b
commit 82a787a753
2 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
interface/src/Application.cpp
View file

@ -3025,21 +3025,6 @@ void Application::keyPressEvent(QKeyEvent* event) {
} }
} }
case Qt::Key_H: {
if (isMeta && !isHMDMode()) {
auto menu = Menu::getInstance();
if (menu->isOptionChecked(MenuOption::FullscreenMirror)) {
menu->setIsOptionChecked(MenuOption::FullscreenMirror, false);
menu->setIsOptionChecked(MenuOption::FirstPerson, true);
} else {
menu->setIsOptionChecked(MenuOption::FullscreenMirror, true);
menu->setIsOptionChecked(MenuOption::FirstPerson, false);
}
}
cameraMenuChanged();
break;
}
case Qt::Key_Asterisk: case Qt::Key_Asterisk:
Menu::getInstance()->triggerOption(MenuOption::DefaultSkybox); Menu::getInstance()->triggerOption(MenuOption::DefaultSkybox);
break; break;
@ -4476,27 +4461,31 @@ void Application::cameraModeChanged() {
void Application::cameraMenuChanged() { void Application::cameraMenuChanged() {
if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) { auto menu = Menu::getInstance();
if (_myCamera.getMode() != CAMERA_MODE_MIRROR) { if (menu->isOptionChecked(MenuOption::FullscreenMirror)) {
if (isHMDMode()) {
menu->setIsOptionChecked(MenuOption::FullscreenMirror, false);
menu->setIsOptionChecked(MenuOption::FirstPerson, true);
} else if (_myCamera.getMode() != CAMERA_MODE_MIRROR) {
_myCamera.setMode(CAMERA_MODE_MIRROR); _myCamera.setMode(CAMERA_MODE_MIRROR);
} }
} else if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson)) { } else if (menu->isOptionChecked(MenuOption::FirstPerson)) {
if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON) { if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON) {
_myCamera.setMode(CAMERA_MODE_FIRST_PERSON); _myCamera.setMode(CAMERA_MODE_FIRST_PERSON);
getMyAvatar()->setBoomLength(MyAvatar::ZOOM_MIN); getMyAvatar()->setBoomLength(MyAvatar::ZOOM_MIN);
} }
} else if (Menu::getInstance()->isOptionChecked(MenuOption::ThirdPerson)) { } else if (menu->isOptionChecked(MenuOption::ThirdPerson)) {
if (_myCamera.getMode() != CAMERA_MODE_THIRD_PERSON) { if (_myCamera.getMode() != CAMERA_MODE_THIRD_PERSON) {
_myCamera.setMode(CAMERA_MODE_THIRD_PERSON); _myCamera.setMode(CAMERA_MODE_THIRD_PERSON);
if (getMyAvatar()->getBoomLength() == MyAvatar::ZOOM_MIN) { if (getMyAvatar()->getBoomLength() == MyAvatar::ZOOM_MIN) {
getMyAvatar()->setBoomLength(MyAvatar::ZOOM_DEFAULT); getMyAvatar()->setBoomLength(MyAvatar::ZOOM_DEFAULT);
} }
} }
} else if (Menu::getInstance()->isOptionChecked(MenuOption::IndependentMode)) { } else if (menu->isOptionChecked(MenuOption::IndependentMode)) {
if (_myCamera.getMode() != CAMERA_MODE_INDEPENDENT) { if (_myCamera.getMode() != CAMERA_MODE_INDEPENDENT) {
_myCamera.setMode(CAMERA_MODE_INDEPENDENT); _myCamera.setMode(CAMERA_MODE_INDEPENDENT);
} }
} else if (Menu::getInstance()->isOptionChecked(MenuOption::CameraEntityMode)) { } else if (menu->isOptionChecked(MenuOption::CameraEntityMode)) {
if (_myCamera.getMode() != CAMERA_MODE_ENTITY) { if (_myCamera.getMode() != CAMERA_MODE_ENTITY) {
_myCamera.setMode(CAMERA_MODE_ENTITY); _myCamera.setMode(CAMERA_MODE_ENTITY);
} }

4
interface/src/Menu.cpp
View file

@ -232,8 +232,8 @@ Menu::Menu() {
false, qApp, SLOT(cameraMenuChanged()))); false, qApp, SLOT(cameraMenuChanged())));
// View > Mirror // View > Mirror
cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu, cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(
MenuOption::FullscreenMirror, 0, viewMenu, MenuOption::FullscreenMirror, Qt::ALT | Qt::Key_H,
false, qApp, SLOT(cameraMenuChanged()))); false, qApp, SLOT(cameraMenuChanged())));
// View > Independent [advanced] // View > Independent [advanced]