Showing the changes to interface/src/Application.cpp (1 of 63 files). Show all
Unified · Split
| @@ -610,8 +610,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 609 unmodified lines | ||
| 610 | 610 | } |
| 611 | 611 | }; |
| 612 | 612 | reportAndQuit("--protocolVersion", [&](FILE* fp) { |
| 613 | − DependencyManager::set<AddressManager>(); | |
| 614 | − auto version = DependencyManager::get<AddressManager>()->protocolVersion(); | |
| 613 | + auto version = protocolVersionsSignatureBase64(); | |
| 615 | 614 | fputs(version.toLatin1().data(), fp); |
| 616 | 615 | }); |
| 617 | 616 | reportAndQuit("--version", [&](FILE* fp) { |
| @@ -2148,6 +2147,11 @@ void Application::cleanupBeforeQuit() { · 1530 unmodified lines | ||
| 2148 | 2147 | DependencyManager::destroy<AudioInjectorManager>(); |
| 2149 | 2148 | DependencyManager::destroy<AudioScriptingInterface>(); |
| 2150 | 2149 | |
| 2150 | + // The PointerManager must be destroyed before the PickManager because when a Pointer is deleted, | |
| 2151 | + // it accesses the PickManager to delete its associated Pick | |
| 2152 | + DependencyManager::destroy<PointerManager>(); | |
| 2153 | + DependencyManager::destroy<PickManager>(); | |
| 2154 | + | |
| 2151 | 2155 | qCDebug(interfaceapp) << "Application::cleanupBeforeQuit() complete"; |
| 2152 | 2156 | } |
| 2153 | 2157 | |
| @@ -4420,8 +4424,9 @@ void Application::updateLOD(float deltaTime) const { · 2266 unmodified lines | ||
| 4420 | 4424 | float presentTime = getActiveDisplayPlugin()->getAveragePresentTime(); |
| 4421 | 4425 | float engineRunTime = (float)(_renderEngine->getConfiguration().get()->getCPURunTime()); |
| 4422 | 4426 | float gpuTime = getGPUContext()->getFrameTimerGPUAverage(); |
| 4423 | − float maxRenderTime = glm::max(gpuTime, glm::max(presentTime, engineRunTime)); | |
| 4424 | − DependencyManager::get<LODManager>()->autoAdjustLOD(maxRenderTime, deltaTime); | |
| 4427 | + auto lodManager = DependencyManager::get<LODManager>(); | |
| 4428 | + lodManager->setRenderTimes(presentTime, engineRunTime, gpuTime); | |
| 4429 | + lodManager->autoAdjustLOD(deltaTime); | |
| 4425 | 4430 | } else { |
| 4426 | 4431 | DependencyManager::get<LODManager>()->resetLODAdjust(); |
| 4427 | 4432 | } |