Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -5844,12 +5844,7 @@ void Application::centerUI() { · 5843 unmodified lines | ||
| 5844 | 5844 | |
| 5845 | 5845 | void Application::cycleCamera() { |
| 5846 | 5846 | auto menu = Menu::getInstance(); |
| 5847 | − if (menu->isOptionChecked(MenuOption::FullscreenMirror)) { | |
| 5848 | − | |
| 5849 | − menu->setIsOptionChecked(MenuOption::FullscreenMirror, false); | |
| 5850 | − menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, true); | |
| 5851 | − | |
| 5852 | − } else if (menu->isOptionChecked(MenuOption::FirstPersonLookAt)) { | |
| 5847 | + if (menu->isOptionChecked(MenuOption::FirstPersonLookAt)) { | |
| 5853 | 5848 | |
| 5854 | 5849 | menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, false); |
| 5855 | 5850 | menu->setIsOptionChecked(MenuOption::LookAtCamera, true); |
| @@ -5857,12 +5852,16 @@ void Application::cycleCamera() { · 1 unmodified line | ||
| 5857 | 5852 | } else if (menu->isOptionChecked(MenuOption::LookAtCamera)) { |
| 5858 | 5853 | |
| 5859 | 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 | 5861 | } else if (menu->isOptionChecked(MenuOption::SelfieCamera)) { |
| 5863 | 5862 | |
| 5864 | 5863 | menu->setIsOptionChecked(MenuOption::SelfieCamera, false); |
| 5865 | − menu->setIsOptionChecked(MenuOption::FullscreenMirror, true); | |
| 5864 | + menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, true); | |
| 5866 | 5865 | |
| 5867 | 5866 | } |
| 5868 | 5867 | cameraMenuChanged(); // handle the menu change |