History

Merge pull request #16562 from ctrlaltdavid/DEV-2442

Brad Hefta-Gaub committed 6 years ago

Commit bb68f922 parents e7bb576 6060dad5 files · +38 −20Browse files

Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Application.cpp+7−8
@@ -5844,12 +5844,7 @@ void Application::centerUI() { · 5843 unmodified lines
5844 5844
5845void Application::cycleCamera() {5845void Application::cycleCamera() {
5846 auto menu = Menu::getInstance();5846 auto menu = Menu::getInstance();
5847 if (menu->isOptionChecked(MenuOption::FullscreenMirror)) {5847 if (menu->isOptionChecked(MenuOption::FirstPersonLookAt)) {
5848
5849 menu->setIsOptionChecked(MenuOption::FullscreenMirror, false);
5850 menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, true);
5851
5852 } else if (menu->isOptionChecked(MenuOption::FirstPersonLookAt)) {
5853 5848
5854 menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, false);5849 menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, false);
5855 menu->setIsOptionChecked(MenuOption::LookAtCamera, true);5850 menu->setIsOptionChecked(MenuOption::LookAtCamera, true);
@@ -5857,12 +5852,16 @@ void Application::cycleCamera() { · 1 unmodified line
5857 } else if (menu->isOptionChecked(MenuOption::LookAtCamera)) {5852 } else if (menu->isOptionChecked(MenuOption::LookAtCamera)) {
5858 5853
5859 menu->setIsOptionChecked(MenuOption::LookAtCamera, false);5854 menu->setIsOptionChecked(MenuOption::LookAtCamera, false);
5860 menu->setIsOptionChecked(MenuOption::SelfieCamera, true);5855 if (menu->getActionForOption(MenuOption::SelfieCamera)->isVisible()) {
5856 menu->setIsOptionChecked(MenuOption::SelfieCamera, true);
5857 } else {
5858 menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, true);
5859 }
5861 5860
5862 } else if (menu->isOptionChecked(MenuOption::SelfieCamera)) {5861 } else if (menu->isOptionChecked(MenuOption::SelfieCamera)) {
5863 5862
5864 menu->setIsOptionChecked(MenuOption::SelfieCamera, false);5863 menu->setIsOptionChecked(MenuOption::SelfieCamera, false);
5865 menu->setIsOptionChecked(MenuOption::FullscreenMirror, true);5864 menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, true);
5866 5865
5867 }5866 }
5868 cameraMenuChanged(); // handle the menu change5867 cameraMenuChanged(); // handle the menu change