Showing the changes to interface/src/Application.cpp (1 of 38 files). Show all
Unified · Split
| @@ -669,9 +669,10 @@ private: · 668 unmodified lines | ||
| 669 | 669 | |
| 670 | 670 | /**jsdoc |
| 671 | 671 | * <p>The <code>Controller.Hardware.Application</code> object has properties representing Interface's state. The property |
| 672 | − * values are integer IDs, uniquely identifying each output. <em>Read-only.</em> These can be mapped to actions or functions or | |
| 673 | − * <code>Controller.Standard</code> items in a {@link RouteObject} mapping (e.g., using the {@link RouteObject#when} method). | |
| 674 | − * Each data value is either <code>1.0</code> for "true" or <code>0.0</code> for "false".</p> | |
| 672 | + * values are integer IDs, uniquely identifying each output. <em>Read-only.</em></p> | |
| 673 | + * <p>These states can be mapped to actions or functions or <code>Controller.Standard</code> items in a {@link RouteObject} | |
| 674 | + * mapping (e.g., using the {@link RouteObject#when} method). Each data value is either <code>1.0</code> for "true" or | |
| 675 | + * <code>0.0</code> for "false".</p> | |
| 675 | 676 | * <table> |
| 676 | 677 | * <thead> |
| 677 | 678 | * <tr><th>Property</th><th>Type</th><th>Data</th><th>Description</th></tr> |
| @@ -685,13 +686,17 @@ private: · 7 unmodified lines | ||
| 685 | 686 | * <tr><td><code>CameraIndependent</code></td><td>number</td><td>number</td><td>The camera is in independent mode.</td></tr> |
| 686 | 687 | * <tr><td><code>CameraEntity</code></td><td>number</td><td>number</td><td>The camera is in entity mode.</td></tr> |
| 687 | 688 | * <tr><td><code>InHMD</code></td><td>number</td><td>number</td><td>The user is in HMD mode.</td></tr> |
| 688 | − * <tr><td><code>AdvancedMovement</code></td><td>number</td><td>number</td><td>Advanced movement controls are enabled. | |
| 689 | − * </td></tr> | |
| 689 | + * <tr><td><code>AdvancedMovement</code></td><td>number</td><td>number</td><td>Advanced movement (walking) controls are | |
| 690 | + * enabled.</td></tr> | |
| 691 | + * <tr><td><code>StrafeEnabled</code></td><td>number</td><td>number</td><td>Strafing is enabled</td></tr> | |
| 690 | 692 | * <tr><td><code>LeftHandDominant</code></td><td>number</td><td>number</td><td>Dominant hand set to left.</td></tr> |
| 691 | 693 | * <tr><td><code>RightHandDominant</code></td><td>number</td><td>number</td><td>Dominant hand set to right.</td></tr> |
| 692 | 694 | * <tr><td><code>SnapTurn</code></td><td>number</td><td>number</td><td>Snap turn is enabled.</td></tr> |
| 693 | 695 | * <tr><td><code>Grounded</code></td><td>number</td><td>number</td><td>The user's avatar is on the ground.</td></tr> |
| 694 | 696 | * <tr><td><code>NavigationFocused</code></td><td>number</td><td>number</td><td><em>Not used.</em></td></tr> |
| 697 | + * <tr><td><code>PlatformWindows</code></td><td>number</td><td>number</td><td>The operating system is Windows.</td></tr> | |
| 698 | + * <tr><td><code>PlatformMac</code></td><td>number</td><td>number</td><td>The operating system is Mac.</td></tr> | |
| 699 | + * <tr><td><code>PlatformAndroid</code></td><td>number</td><td>number</td><td>The operating system is Android.</td></tr> | |
| 695 | 700 | * </tbody> |
| 696 | 701 | * </table> |
| 697 | 702 | * @typedef {object} Controller.Hardware-Application |
| @@ -1335,7 +1340,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 637 unmodified lines | ||
| 1335 | 1340 | setCrashAnnotation("avatar", avatarURL.toString().toStdString()); |
| 1336 | 1341 | }); |
| 1337 | 1342 | |
| 1338 | − | |
| 1339 | 1343 | // Inititalize sample before registering |
| 1340 | 1344 | _sampleSound = DependencyManager::get<SoundCache>()->getSound(PathUtils::resourcesUrl("sounds/sample.wav")); |
| 1341 | 1345 | |
| @@ -1426,6 +1430,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 84 unmodified lines | ||
| 1426 | 1430 | initializeDisplayPlugins(); |
| 1427 | 1431 | qCDebug(interfaceapp, "Initialized Display"); |
| 1428 | 1432 | |
| 1433 | + if (_displayPlugin && !_displayPlugin->isHmd()) { | |
| 1434 | + _preferredCursor.set(Cursor::Manager::getIconName(Cursor::Icon::SYSTEM)); | |
| 1435 | + showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get())); | |
| 1436 | + } | |
| 1429 | 1437 | // An audio device changed signal received before the display plugins are set up will cause a crash, |
| 1430 | 1438 | // so we defer the setup of the `scripting::Audio` class until this point |
| 1431 | 1439 | { |