some ends of spaghetti get pushed into AvatarManger class split Camera class into Camera base and FancyCamera derivation Application::getCamera() returns Camera by refence instead of pointer
Showing the changes to interface/src/Application.cpp (1 of 13 files). Show all
Unified · Split
| @@ -1124,19 +1124,19 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1123 unmodified lines | |||
| 1124 | return qApp->isHMDMode() ? 1 : 0; | 1124 | return qApp->isHMDMode() ? 1 : 0; |
| 1125 | }); | 1125 | }); |
| 1126 | _applicationStateDevice->setInputVariant(STATE_CAMERA_FULL_SCREEN_MIRROR, []() -> float { | 1126 | _applicationStateDevice->setInputVariant(STATE_CAMERA_FULL_SCREEN_MIRROR, []() -> float { |
| 1127 | return qApp->getCamera()->getMode() == CAMERA_MODE_MIRROR ? 1 : 0; | 1127 | return qApp->getCamera().getMode() == CAMERA_MODE_MIRROR ? 1 : 0; |
| 1128 | }); | 1128 | }); |
| 1129 | _applicationStateDevice->setInputVariant(STATE_CAMERA_FIRST_PERSON, []() -> float { | 1129 | _applicationStateDevice->setInputVariant(STATE_CAMERA_FIRST_PERSON, []() -> float { |
| 1130 | return qApp->getCamera()->getMode() == CAMERA_MODE_FIRST_PERSON ? 1 : 0; | 1130 | return qApp->getCamera().getMode() == CAMERA_MODE_FIRST_PERSON ? 1 : 0; |
| 1131 | }); | 1131 | }); |
| 1132 | _applicationStateDevice->setInputVariant(STATE_CAMERA_THIRD_PERSON, []() -> float { | 1132 | _applicationStateDevice->setInputVariant(STATE_CAMERA_THIRD_PERSON, []() -> float { |
| 1133 | return qApp->getCamera()->getMode() == CAMERA_MODE_THIRD_PERSON ? 1 : 0; | 1133 | return qApp->getCamera().getMode() == CAMERA_MODE_THIRD_PERSON ? 1 : 0; |
| 1134 | }); | 1134 | }); |
| 1135 | _applicationStateDevice->setInputVariant(STATE_CAMERA_ENTITY, []() -> float { | 1135 | _applicationStateDevice->setInputVariant(STATE_CAMERA_ENTITY, []() -> float { |
| 1136 | return qApp->getCamera()->getMode() == CAMERA_MODE_ENTITY ? 1 : 0; | 1136 | return qApp->getCamera().getMode() == CAMERA_MODE_ENTITY ? 1 : 0; |
| 1137 | }); | 1137 | }); |
| 1138 | _applicationStateDevice->setInputVariant(STATE_CAMERA_INDEPENDENT, []() -> float { | 1138 | _applicationStateDevice->setInputVariant(STATE_CAMERA_INDEPENDENT, []() -> float { |
| 1139 | return qApp->getCamera()->getMode() == CAMERA_MODE_INDEPENDENT ? 1 : 0; | 1139 | return qApp->getCamera().getMode() == CAMERA_MODE_INDEPENDENT ? 1 : 0; |
| 1140 | }); | 1140 | }); |
| 1141 | _applicationStateDevice->setInputVariant(STATE_SNAP_TURN, []() -> float { | 1141 | _applicationStateDevice->setInputVariant(STATE_SNAP_TURN, []() -> float { |
| 1142 | return qApp->getMyAvatar()->getSnapTurn() ? 1 : 0; | 1142 | return qApp->getMyAvatar()->getSnapTurn() ? 1 : 0; |