Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -680,7 +680,9 @@ private: · 679 unmodified lines | |||
| 680 | * <tr><td><code>CameraIndependent</code></td><td>number</td><td>number</td><td>The camera is in independent mode.</td></tr> | 680 | * <tr><td><code>CameraIndependent</code></td><td>number</td><td>number</td><td>The camera is in independent mode.</td></tr> |
| 681 | * <tr><td><code>CameraEntity</code></td><td>number</td><td>number</td><td>The camera is in entity mode.</td></tr> | 681 | * <tr><td><code>CameraEntity</code></td><td>number</td><td>number</td><td>The camera is in entity mode.</td></tr> |
| 682 | * <tr><td><code>InHMD</code></td><td>number</td><td>number</td><td>The user is in HMD mode.</td></tr> | 682 | * <tr><td><code>InHMD</code></td><td>number</td><td>number</td><td>The user is in HMD mode.</td></tr> |
| 683 | * <tr><td><code>CaptureMouse</code></td><td>number</td><td>number</td><td>The mouse is captured.</td></tr> | 683 | * <tr><td><code>CaptureMouse</code></td><td>number</td><td>number</td><td>The mouse is captured. In this mode, |
| 684 | * the mouse is invisible and cannot leave the bounds of Interface, as long as Interface is the active window and | ||
| 685 | * no menu item is selected.</td></tr> | ||
| 684 | * <tr><td><code>AdvancedMovement</code></td><td>number</td><td>number</td><td>Advanced movement (walking) controls are | 686 | * <tr><td><code>AdvancedMovement</code></td><td>number</td><td>number</td><td>Advanced movement (walking) controls are |
| 685 | * enabled.</td></tr> | 687 | * enabled.</td></tr> |
| 686 | * <tr><td><code>StrafeEnabled</code></td><td>number</td><td>number</td><td>Strafing is enabled</td></tr> | 688 | * <tr><td><code>StrafeEnabled</code></td><td>number</td><td>number</td><td>Strafing is enabled</td></tr> |
| @@ -716,7 +718,7 @@ static const QString STATE_PLATFORM_ANDROID = "PlatformAndroid"; · 29 unmodified lines | |||
| 716 | static const QString STATE_LEFT_HAND_DOMINANT = "LeftHandDominant"; | 718 | static const QString STATE_LEFT_HAND_DOMINANT = "LeftHandDominant"; |
| 717 | static const QString STATE_RIGHT_HAND_DOMINANT = "RightHandDominant"; | 719 | static const QString STATE_RIGHT_HAND_DOMINANT = "RightHandDominant"; |
| 718 | static const QString STATE_STRAFE_ENABLED = "StrafeEnabled"; | 720 | static const QString STATE_STRAFE_ENABLED = "StrafeEnabled"; |
| 719 | static const QString STATE_CAMERA_CAPTURE_MOUSE = "CaptureMouse"; | 721 | static const QString STATE_CAPTURE_MOUSE = "CaptureMouse"; |
| 720 | 722 | ||
| 721 | // Statically provided display and input plugins | 723 | // Statically provided display and input plugins |
| 722 | extern DisplayPluginList getDisplayPlugins(); | 724 | extern DisplayPluginList getDisplayPlugins(); |
| @@ -920,7 +922,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 197 unmodified lines | |||
| 920 | DependencyManager::set<MessagesClient>(); | 922 | DependencyManager::set<MessagesClient>(); |
| 921 | controller::StateController::setStateVariables({ { STATE_IN_HMD, STATE_CAMERA_FULL_SCREEN_MIRROR, | 923 | controller::StateController::setStateVariables({ { STATE_IN_HMD, STATE_CAMERA_FULL_SCREEN_MIRROR, |
| 922 | STATE_CAMERA_FIRST_PERSON, STATE_CAMERA_FIRST_PERSON_LOOK_AT, STATE_CAMERA_THIRD_PERSON, | 924 | STATE_CAMERA_FIRST_PERSON, STATE_CAMERA_FIRST_PERSON_LOOK_AT, STATE_CAMERA_THIRD_PERSON, |
| 923 | STATE_CAMERA_ENTITY, STATE_CAMERA_INDEPENDENT, STATE_CAMERA_LOOK_AT, STATE_CAMERA_SELFIE, STATE_CAMERA_CAPTURE_MOUSE, | 925 | STATE_CAMERA_ENTITY, STATE_CAMERA_INDEPENDENT, STATE_CAMERA_LOOK_AT, STATE_CAMERA_SELFIE, STATE_CAPTURE_MOUSE, |
| 924 | STATE_SNAP_TURN, STATE_ADVANCED_MOVEMENT_CONTROLS, STATE_GROUNDED, STATE_NAV_FOCUSED, | 926 | STATE_SNAP_TURN, STATE_ADVANCED_MOVEMENT_CONTROLS, STATE_GROUNDED, STATE_NAV_FOCUSED, |
| 925 | STATE_PLATFORM_WINDOWS, STATE_PLATFORM_MAC, STATE_PLATFORM_ANDROID, STATE_LEFT_HAND_DOMINANT, STATE_RIGHT_HAND_DOMINANT, STATE_STRAFE_ENABLED } }); | 927 | STATE_PLATFORM_WINDOWS, STATE_PLATFORM_MAC, STATE_PLATFORM_ANDROID, STATE_LEFT_HAND_DOMINANT, STATE_RIGHT_HAND_DOMINANT, STATE_STRAFE_ENABLED } }); |
| 926 | DependencyManager::set<UserInputMapper>(); | 928 | DependencyManager::set<UserInputMapper>(); |
| @@ -1893,7 +1895,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 966 unmodified lines | |||
| 1893 | _applicationStateDevice->setInputVariant(STATE_CAMERA_INDEPENDENT, []() -> float { | 1895 | _applicationStateDevice->setInputVariant(STATE_CAMERA_INDEPENDENT, []() -> float { |
| 1894 | return qApp->getCamera().getMode() == CAMERA_MODE_INDEPENDENT ? 1 : 0; | 1896 | return qApp->getCamera().getMode() == CAMERA_MODE_INDEPENDENT ? 1 : 0; |
| 1895 | }); | 1897 | }); |
| 1896 | _applicationStateDevice->setInputVariant(STATE_CAMERA_CAPTURE_MOUSE, []() -> float { | 1898 | _applicationStateDevice->setInputVariant(STATE_CAPTURE_MOUSE, []() -> float { |
| 1897 | return qApp->getCamera().getCaptureMouse() ? 1 : 0; | 1899 | return qApp->getCamera().getCaptureMouse() ? 1 : 0; |
| 1898 | }); | 1900 | }); |
| 1899 | _applicationStateDevice->setInputVariant(STATE_SNAP_TURN, []() -> float { | 1901 | _applicationStateDevice->setInputVariant(STATE_SNAP_TURN, []() -> float { |