also unravelling some spaghetti: (1) split Octree stuff out of ViewFrustum (2) moved ViewFrustum from octree to shared lib (3) removed some cruft
Showing the changes to libraries/render-utils/src/DebugDeferredBuffer.cpp (1 of 46 files). Show all
Unified · Split
| @@ -275,7 +275,7 @@ void DebugDeferredBuffer::configure(const Config& config) { · 274 unmodified lines | ||
| 275 | 275 | |
| 276 | 276 | void DebugDeferredBuffer::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) { |
| 277 | 277 | assert(renderContext->args); |
| 278 | − assert(renderContext->args->_viewFrustum); | |
| 278 | + assert(renderContext->args->hasViewFrustum()); | |
| 279 | 279 | RenderArgs* args = renderContext->args; |
| 280 | 280 | |
| 281 | 281 | gpu::doInBatch(args->_context, [&](gpu::Batch& batch) { |
| @@ -283,20 +283,20 @@ void DebugDeferredBuffer::run(const SceneContextPointer& sceneContext, const Ren · 1 unmodified line | ||
| 283 | 283 | const auto framebufferCache = DependencyManager::get<FramebufferCache>(); |
| 284 | 284 | const auto textureCache = DependencyManager::get<TextureCache>(); |
| 285 | 285 | const auto& lightStage = DependencyManager::get<DeferredLightingEffect>()->getLightStage(); |
| 286 | − | |
| 286 | + | |
| 287 | 287 | glm::mat4 projMat; |
| 288 | 288 | Transform viewMat; |
| 289 | − args->_viewFrustum->evalProjectionMatrix(projMat); | |
| 290 | − args->_viewFrustum->evalViewTransform(viewMat); | |
| 289 | + args->getViewFrustum().evalProjectionMatrix(projMat); | |
| 290 | + args->getViewFrustum().evalViewTransform(viewMat); | |
| 291 | 291 | batch.setProjectionTransform(projMat); |
| 292 | 292 | batch.setViewTransform(viewMat); |
| 293 | 293 | batch.setModelTransform(Transform()); |
| 294 | 294 | |
| 295 | 295 | // TODO REMOVE: Temporary until UI |
| 296 | 296 | auto first = _customPipelines.begin()->first; |
| 297 | − | |
| 297 | + | |
| 298 | 298 | batch.setPipeline(getPipeline(_mode, first)); |
| 299 | − | |
| 299 | + | |
| 300 | 300 | batch.setResourceTexture(Albedo, framebufferCache->getDeferredColorTexture()); |
| 301 | 301 | batch.setResourceTexture(Normal, framebufferCache->getDeferredNormalTexture()); |
| 302 | 302 | batch.setResourceTexture(Specular, framebufferCache->getDeferredSpecularTexture()); |