Showing the changes to interface/src/Application.cpp (1 of 65 files). Show all
Unified · Split
| @@ -573,8 +573,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 572 unmodified lines | ||
| 573 | 573 | } |
| 574 | 574 | }; |
| 575 | 575 | reportAndQuit("--protocolVersion", [&](FILE* fp) { |
| 576 | − DependencyManager::set<AddressManager>(); | |
| 577 | − auto version = DependencyManager::get<AddressManager>()->protocolVersion(); | |
| 576 | + auto version = protocolVersionsSignatureBase64(); | |
| 578 | 577 | fputs(version.toLatin1().data(), fp); |
| 579 | 578 | }); |
| 580 | 579 | reportAndQuit("--version", [&](FILE* fp) { |
| @@ -2093,6 +2092,11 @@ void Application::cleanupBeforeQuit() { · 1512 unmodified lines | ||
| 2093 | 2092 | DependencyManager::destroy<AudioInjectorManager>(); |
| 2094 | 2093 | DependencyManager::destroy<AudioScriptingInterface>(); |
| 2095 | 2094 | |
| 2095 | + // The PointerManager must be destroyed before the PickManager because when a Pointer is deleted, | |
| 2096 | + // it accesses the PickManager to delete its associated Pick | |
| 2097 | + DependencyManager::destroy<PointerManager>(); | |
| 2098 | + DependencyManager::destroy<PickManager>(); | |
| 2099 | + | |
| 2096 | 2100 | qCDebug(interfaceapp) << "Application::cleanupBeforeQuit() complete"; |
| 2097 | 2101 | } |
| 2098 | 2102 | |
| @@ -4351,8 +4355,9 @@ void Application::updateLOD(float deltaTime) const { · 2252 unmodified lines | ||
| 4351 | 4355 | float presentTime = getActiveDisplayPlugin()->getAveragePresentTime(); |
| 4352 | 4356 | float engineRunTime = (float)(_renderEngine->getConfiguration().get()->getCPURunTime()); |
| 4353 | 4357 | float gpuTime = getGPUContext()->getFrameTimerGPUAverage(); |
| 4354 | − float maxRenderTime = glm::max(gpuTime, glm::max(presentTime, engineRunTime)); | |
| 4355 | − DependencyManager::get<LODManager>()->autoAdjustLOD(maxRenderTime, deltaTime); | |
| 4358 | + auto lodManager = DependencyManager::get<LODManager>(); | |
| 4359 | + lodManager->setRenderTimes(presentTime, engineRunTime, gpuTime); | |
| 4360 | + lodManager->autoAdjustLOD(deltaTime); | |
| 4356 | 4361 | } else { |
| 4357 | 4362 | DependencyManager::get<LODManager>()->resetLODAdjust(); |
| 4358 | 4363 | } |