History

debugging and fixing the problem to get Config for complex path

Sam Gateau committed 8 years ago

Commit 2eec5b01 parent d2a66b94 files · +31 −21Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Application.cpp+3−3
@@ -4444,7 +4444,7 @@ void Application::idle() { · 4443 unmodified lines
4444 PROFILE_COUNTER_IF_CHANGED(app, "pendingProcessing", int, DependencyManager::get<StatTracker>()->getStat("PendingProcessing").toInt());4444 PROFILE_COUNTER_IF_CHANGED(app, "pendingProcessing", int, DependencyManager::get<StatTracker>()->getStat("PendingProcessing").toInt());
4445 auto renderConfig = _graphicsEngine.getRenderEngine()->getConfiguration();4445 auto renderConfig = _graphicsEngine.getRenderEngine()->getConfiguration();
4446 PROFILE_COUNTER_IF_CHANGED(render, "gpuTime", float, (float)_graphicsEngine.getGPUContext()->getFrameTimerGPUAverage());4446 PROFILE_COUNTER_IF_CHANGED(render, "gpuTime", float, (float)_graphicsEngine.getGPUContext()->getFrameTimerGPUAverage());
4447 auto opaqueRangeTimer = renderConfig->getConfig("OpaqueRangeTimer");4447/* auto opaqueRangeTimer = renderConfig->getConfig("OpaqueRangeTimer");
4448 auto linearDepth = renderConfig->getConfig("LinearDepth");4448 auto linearDepth = renderConfig->getConfig("LinearDepth");
4449 auto surfaceGeometry = renderConfig->getConfig("SurfaceGeometry");4449 auto surfaceGeometry = renderConfig->getConfig("SurfaceGeometry");
4450 auto renderDeferred = renderConfig->getConfig("RenderDeferred");4450 auto renderDeferred = renderConfig->getConfig("RenderDeferred");
@@ -4456,7 +4456,7 @@ void Application::idle() { · 5 unmodified lines
4456 { "SurfaceGeometry", surfaceGeometry ? surfaceGeometry->property("gpuRunTime") : 0 },4456 { "SurfaceGeometry", surfaceGeometry ? surfaceGeometry->property("gpuRunTime") : 0 },
4457 { "RenderDeferred", renderDeferred ? renderDeferred->property("gpuRunTime") : 0 },4457 { "RenderDeferred", renderDeferred ? renderDeferred->property("gpuRunTime") : 0 },
4458 { "ToneAndPostRangeTimer", toneAndPostRangeTimer ? toneAndPostRangeTimer->property("gpuRunTime") : 0 }4458 { "ToneAndPostRangeTimer", toneAndPostRangeTimer ? toneAndPostRangeTimer->property("gpuRunTime") : 0 }
4459 });4459 });*/
4460 4460
4461 PROFILE_RANGE(app, __FUNCTION__);4461 PROFILE_RANGE(app, __FUNCTION__);
4462 4462
@@ -5759,7 +5759,7 @@ void Application::update(float deltaTime) { · 1296 unmodified lines
5759 // TODO: Fix this by modeling the way the secondary camera works on how the main camera works5759 // TODO: Fix this by modeling the way the secondary camera works on how the main camera works
5760 // ie. Use a camera object stored in the game logic and informs the Engine on where the secondary5760 // ie. Use a camera object stored in the game logic and informs the Engine on where the secondary
5761 // camera should be.5761 // camera should be.
5762 updateSecondaryCameraViewFrustum();5762 // updateSecondaryCameraViewFrustum();
5763 }5763 }
5764 5764
5765 quint64 now = usecTimestampNow();5765 quint64 now = usecTimestampNow();