Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all
Unified · Split
| @@ -423,6 +423,7 @@ static const QString STATE_CAMERA_THIRD_PERSON = "CameraThirdPerson"; · 422 unmodified lines | |||
| 423 | static const QString STATE_CAMERA_ENTITY = "CameraEntity"; | 423 | static const QString STATE_CAMERA_ENTITY = "CameraEntity"; |
| 424 | static const QString STATE_CAMERA_INDEPENDENT = "CameraIndependent"; | 424 | static const QString STATE_CAMERA_INDEPENDENT = "CameraIndependent"; |
| 425 | static const QString STATE_SNAP_TURN = "SnapTurn"; | 425 | static const QString STATE_SNAP_TURN = "SnapTurn"; |
| 426 | static const QString STATE_ADVANCED_MOVEMENT_CONTROLS = "AdvancedMovement"; | ||
| 426 | static const QString STATE_GROUNDED = "Grounded"; | 427 | static const QString STATE_GROUNDED = "Grounded"; |
| 427 | static const QString STATE_NAV_FOCUSED = "NavigationFocused"; | 428 | static const QString STATE_NAV_FOCUSED = "NavigationFocused"; |
| 428 | 429 | ||
| @@ -513,7 +514,7 @@ bool setupEssentials(int& argc, char** argv) { · 84 unmodified lines | |||
| 513 | DependencyManager::set<MessagesClient>(); | 514 | DependencyManager::set<MessagesClient>(); |
| 514 | controller::StateController::setStateVariables({ { STATE_IN_HMD, STATE_CAMERA_FULL_SCREEN_MIRROR, | 515 | controller::StateController::setStateVariables({ { STATE_IN_HMD, STATE_CAMERA_FULL_SCREEN_MIRROR, |
| 515 | STATE_CAMERA_FIRST_PERSON, STATE_CAMERA_THIRD_PERSON, STATE_CAMERA_ENTITY, STATE_CAMERA_INDEPENDENT, | 516 | STATE_CAMERA_FIRST_PERSON, STATE_CAMERA_THIRD_PERSON, STATE_CAMERA_ENTITY, STATE_CAMERA_INDEPENDENT, |
| 516 | STATE_SNAP_TURN, STATE_GROUNDED, STATE_NAV_FOCUSED } }); | 517 | STATE_SNAP_TURN, STATE_ADVANCED_MOVEMENT_CONTROLS, STATE_GROUNDED, STATE_NAV_FOCUSED } }); |
| 517 | DependencyManager::set<UserInputMapper>(); | 518 | DependencyManager::set<UserInputMapper>(); |
| 518 | DependencyManager::set<controller::ScriptingInterface, ControllerScriptingInterface>(); | 519 | DependencyManager::set<controller::ScriptingInterface, ControllerScriptingInterface>(); |
| 519 | DependencyManager::set<InterfaceParentFinder>(); | 520 | DependencyManager::set<InterfaceParentFinder>(); |
| @@ -1127,6 +1128,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 607 unmodified lines | |||
| 1127 | _applicationStateDevice->setInputVariant(STATE_SNAP_TURN, []() -> float { | 1128 | _applicationStateDevice->setInputVariant(STATE_SNAP_TURN, []() -> float { |
| 1128 | return qApp->getMyAvatar()->getSnapTurn() ? 1 : 0; | 1129 | return qApp->getMyAvatar()->getSnapTurn() ? 1 : 0; |
| 1129 | }); | 1130 | }); |
| 1131 | _applicationStateDevice->setInputVariant(STATE_ADVANCED_MOVEMENT_CONTROLS, []() -> float { | ||
| 1132 | return qApp->getMyAvatar()->useAdvancedMovementControls() ? 1 : 0; | ||
| 1133 | }); | ||
| 1134 | |||
| 1130 | _applicationStateDevice->setInputVariant(STATE_GROUNDED, []() -> float { | 1135 | _applicationStateDevice->setInputVariant(STATE_GROUNDED, []() -> float { |
| 1131 | return qApp->getMyAvatar()->getCharacterController()->onGround() ? 1 : 0; | 1136 | return qApp->getMyAvatar()->getCharacterController()->onGround() ? 1 : 0; |
| 1132 | }); | 1137 | }); |