Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all
Unified · Split
| @@ -1387,7 +1387,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1386 unmodified lines | |||
| 1387 | }); | 1387 | }); |
| 1388 | connect(this, &Application::activeDisplayPluginChanged, | 1388 | connect(this, &Application::activeDisplayPluginChanged, |
| 1389 | reinterpret_cast<scripting::Audio*>(audioScriptingInterface.data()), &scripting::Audio::onContextChanged); | 1389 | reinterpret_cast<scripting::Audio*>(audioScriptingInterface.data()), &scripting::Audio::onContextChanged); |
| 1390 | connect(this, &Application::interstitialModeChanged, audioIO, &AudioClient::setInterstitialStatus); | ||
| 1391 | } | 1390 | } |
| 1392 | 1391 | ||
| 1393 | // Create the rendering engine. This can be slow on some machines due to lots of | 1392 | // Create the rendering engine. This can be slow on some machines due to lots of |
| @@ -3500,6 +3499,9 @@ bool Application::isInterstitialMode() const { · 2106 unmodified lines | |||
| 3500 | void Application::setIsInterstitialMode(bool interstitialMode) { | 3499 | void Application::setIsInterstitialMode(bool interstitialMode) { |
| 3501 | if (_interstitialMode != interstitialMode) { | 3500 | if (_interstitialMode != interstitialMode) { |
| 3502 | _interstitialMode = interstitialMode; | 3501 | _interstitialMode = interstitialMode; |
| 3502 | |||
| 3503 | auto audioClient = DependencyManager::get<AudioClient>(); | ||
| 3504 | audioClient->setAudioPaused(_interstitialMode); | ||
| 3503 | emit interstitialModeChanged(_interstitialMode); | 3505 | emit interstitialModeChanged(_interstitialMode); |
| 3504 | } | 3506 | } |
| 3505 | } | 3507 | } |
| @@ -5581,8 +5583,7 @@ void Application::update(float deltaTime) { · 2075 unmodified lines | |||
| 5581 | // we haven't yet enabled physics. we wait until we think we have all the collision information | 5583 | // we haven't yet enabled physics. we wait until we think we have all the collision information |
| 5582 | // for nearby entities before starting bullet up. | 5584 | // for nearby entities before starting bullet up. |
| 5583 | quint64 now = usecTimestampNow(); | 5585 | quint64 now = usecTimestampNow(); |
| 5584 | bool renderReady = _octreeProcessor.isEntitiesRenderReady(); | 5586 | if (isServerlessMode() || _octreeProcessor.isLoadSequenceComplete()) { |
| 5585 | if (isServerlessMode() || (_octreeProcessor.isLoadSequenceComplete() && renderReady)) { | ||
| 5586 | // we've received a new full-scene octree stats packet, or it's been long enough to try again anyway | 5587 | // we've received a new full-scene octree stats packet, or it's been long enough to try again anyway |
| 5587 | _lastPhysicsCheckTime = now; | 5588 | _lastPhysicsCheckTime = now; |
| 5588 | _fullSceneCounterAtLastPhysicsCheck = _fullSceneReceivedCounter; | 5589 | _fullSceneCounterAtLastPhysicsCheck = _fullSceneReceivedCounter; |