Showing the changes to interface/src/Application.cpp (1 of 77 files). Show all
Unified · Split
| @@ -431,7 +431,7 @@ static const QString STATE_ADVANCED_MOVEMENT_CONTROLS = "AdvancedMovement"; · 430 unmodified lines | |||
| 431 | static const QString STATE_GROUNDED = "Grounded"; | 431 | static const QString STATE_GROUNDED = "Grounded"; |
| 432 | static const QString STATE_NAV_FOCUSED = "NavigationFocused"; | 432 | static const QString STATE_NAV_FOCUSED = "NavigationFocused"; |
| 433 | 433 | ||
| 434 | bool setupEssentials(int& argc, char** argv) { | 434 | bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { |
| 435 | const char** constArgv = const_cast<const char**>(argv); | 435 | const char** constArgv = const_cast<const char**>(argv); |
| 436 | const char* portStr = getCmdOption(argc, constArgv, "--listenPort"); | 436 | const char* portStr = getCmdOption(argc, constArgv, "--listenPort"); |
| 437 | const int listenPort = portStr ? atoi(portStr) : INVALID_PORT; | 437 | const int listenPort = portStr ? atoi(portStr) : INVALID_PORT; |
| @@ -458,7 +458,7 @@ bool setupEssentials(int& argc, char** argv) { · 20 unmodified lines | |||
| 458 | 458 | ||
| 459 | static const auto SUPPRESS_SETTINGS_RESET = "--suppress-settings-reset"; | 459 | static const auto SUPPRESS_SETTINGS_RESET = "--suppress-settings-reset"; |
| 460 | bool suppressPrompt = cmdOptionExists(argc, const_cast<const char**>(argv), SUPPRESS_SETTINGS_RESET); | 460 | bool suppressPrompt = cmdOptionExists(argc, const_cast<const char**>(argv), SUPPRESS_SETTINGS_RESET); |
| 461 | bool previousSessionCrashed = CrashHandler::checkForResetSettings(suppressPrompt); | 461 | bool previousSessionCrashed = CrashHandler::checkForResetSettings(runningMarkerExisted, suppressPrompt); |
| 462 | 462 | ||
| 463 | DependencyManager::registerInheritance<LimitedNodeList, NodeList>(); | 463 | DependencyManager::registerInheritance<LimitedNodeList, NodeList>(); |
| 464 | DependencyManager::registerInheritance<AvatarHashMap, AvatarManager>(); | 464 | DependencyManager::registerInheritance<AvatarHashMap, AvatarManager>(); |
| @@ -563,11 +563,11 @@ const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true; · 98 unmodified lines | |||
| 563 | const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false; | 563 | const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false; |
| 564 | const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false; | 564 | const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false; |
| 565 | 565 | ||
| 566 | Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : | 566 | Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runningMarkerExisted) : |
| 567 | QApplication(argc, argv), | 567 | QApplication(argc, argv), |
| 568 | _window(new MainWindow(desktop())), | 568 | _window(new MainWindow(desktop())), |
| 569 | _sessionRunTimer(startupTimer), | 569 | _sessionRunTimer(startupTimer), |
| 570 | _previousSessionCrashed(setupEssentials(argc, argv)), | 570 | _previousSessionCrashed(setupEssentials(argc, argv, runningMarkerExisted)), |
| 571 | _undoStackScriptingInterface(&_undoStack), | 571 | _undoStackScriptingInterface(&_undoStack), |
| 572 | _entitySimulation(new PhysicalEntitySimulation()), | 572 | _entitySimulation(new PhysicalEntitySimulation()), |
| 573 | _physicsEngine(new PhysicsEngine(Vectors::ZERO)), | 573 | _physicsEngine(new PhysicsEngine(Vectors::ZERO)), |
| @@ -3976,7 +3976,7 @@ void Application::updateMyAvatarLookAtPosition() { · 3402 unmodified lines | |||
| 3976 | if (faceAngle < MAXIMUM_FACE_ANGLE) { | 3976 | if (faceAngle < MAXIMUM_FACE_ANGLE) { |
| 3977 | // Randomly look back and forth between look targets | 3977 | // Randomly look back and forth between look targets |
| 3978 | eyeContactTarget target = Menu::getInstance()->isOptionChecked(MenuOption::FixGaze) ? | 3978 | eyeContactTarget target = Menu::getInstance()->isOptionChecked(MenuOption::FixGaze) ? |
| 3979 | LEFT_EYE : myAvatar->getEyeContactTarget(); | 3979 | LEFT_EYE : myAvatar->getEyeContactTarget(); |
| 3980 | switch (target) { | 3980 | switch (target) { |
| 3981 | case LEFT_EYE: | 3981 | case LEFT_EYE: |
| 3982 | lookAtSpot = lookingAtHead->getLeftEyePosition(); | 3982 | lookAtSpot = lookingAtHead->getLeftEyePosition(); |