Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -1861,12 +1861,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1860 unmodified lines | ||
| 1861 | 1861 | |
| 1862 | 1862 | if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson)) { |
| 1863 | 1863 | getMyAvatar()->setBoomLength(MyAvatar::ZOOM_MIN); // So that camera doesn't auto-switch to third person. |
| 1864 | − } else if (Menu::getInstance()->isOptionChecked(MenuOption::IndependentMode)) { | |
| 1865 | − Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, true); | |
| 1866 | − cameraMenuChanged(); | |
| 1867 | − } else if (Menu::getInstance()->isOptionChecked(MenuOption::CameraEntityMode)) { | |
| 1868 | − Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, true); | |
| 1869 | − cameraMenuChanged(); | |
| 1870 | 1864 | } |
| 1871 | 1865 | |
| 1872 | 1866 | { |
| @@ -5757,9 +5751,6 @@ void Application::cycleCamera() { · 3884 unmodified lines | ||
| 5757 | 5751 | menu->setIsOptionChecked(MenuOption::ThirdPerson, false); |
| 5758 | 5752 | menu->setIsOptionChecked(MenuOption::FullscreenMirror, true); |
| 5759 | 5753 | |
| 5760 | − } else if (menu->isOptionChecked(MenuOption::IndependentMode) || menu->isOptionChecked(MenuOption::CameraEntityMode)) { | |
| 5761 | − // do nothing if in independent or camera entity modes | |
| 5762 | − return; | |
| 5763 | 5754 | } |
| 5764 | 5755 | cameraMenuChanged(); // handle the menu change |
| 5765 | 5756 | } |
| @@ -5775,12 +5766,6 @@ void Application::cameraModeChanged() { · 9 unmodified lines | ||
| 5775 | 5766 | case CAMERA_MODE_MIRROR: |
| 5776 | 5767 | Menu::getInstance()->setIsOptionChecked(MenuOption::FullscreenMirror, true); |
| 5777 | 5768 | break; |
| 5778 | − case CAMERA_MODE_INDEPENDENT: | |
| 5779 | − Menu::getInstance()->setIsOptionChecked(MenuOption::IndependentMode, true); | |
| 5780 | − break; | |
| 5781 | − case CAMERA_MODE_ENTITY: | |
| 5782 | − Menu::getInstance()->setIsOptionChecked(MenuOption::CameraEntityMode, true); | |
| 5783 | − break; | |
| 5784 | 5769 | default: |
| 5785 | 5770 | break; |
| 5786 | 5771 | } |
| @@ -5824,14 +5809,6 @@ void Application::cameraMenuChanged() { · 37 unmodified lines | ||
| 5824 | 5809 | getMyAvatar()->setBoomLength(MyAvatar::ZOOM_DEFAULT); |
| 5825 | 5810 | } |
| 5826 | 5811 | } |
| 5827 | − } else if (menu->isOptionChecked(MenuOption::IndependentMode)) { | |
| 5828 | − if (_myCamera.getMode() != CAMERA_MODE_INDEPENDENT) { | |
| 5829 | − _myCamera.setMode(CAMERA_MODE_INDEPENDENT); | |
| 5830 | − } | |
| 5831 | − } else if (menu->isOptionChecked(MenuOption::CameraEntityMode)) { | |
| 5832 | − if (_myCamera.getMode() != CAMERA_MODE_ENTITY) { | |
| 5833 | − _myCamera.setMode(CAMERA_MODE_ENTITY); | |
| 5834 | − } | |
| 5835 | 5812 | } |
| 5836 | 5813 | } |
| 5837 | 5814 | |