use references not pointers for ViewFrustums

also unravelling some spaghetti: (1) split Octree stuff out of ViewFrustum (2) moved ViewFrustum from octree to shared lib (3) removed some cruft

Andrew Meadows committed 10 years ago

Commit bcf2cc81 parent 21fa29446 files · +412 −390Browse files

Showing the changes to libraries/render-utils/src/DebugDeferredBuffer.cpp (1 of 46 files). Show all

Unified · Split

libraries/render-utils/src/DebugDeferredBuffer.cpp+6−6

@@ -275,7 +275,7 @@ void DebugDeferredBuffer::configure(const Config& config) { · 274 unmodified lines
275		275
276	void DebugDeferredBuffer::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {	276	void DebugDeferredBuffer::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {
277	assert(renderContext->args);	277	assert(renderContext->args);
278	assert(renderContext->args->_viewFrustum);	278	assert(renderContext->args->hasViewFrustum());
279	RenderArgs* args = renderContext->args;	279	RenderArgs* args = renderContext->args;
280		280
281	gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {	281	gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
@@ -283,20 +283,20 @@ void DebugDeferredBuffer::run(const SceneContextPointer& sceneContext, const Ren · 1 unmodified line
283	const auto framebufferCache = DependencyManager::get<FramebufferCache>();	283	const auto framebufferCache = DependencyManager::get<FramebufferCache>();
284	const auto textureCache = DependencyManager::get<TextureCache>();	284	const auto textureCache = DependencyManager::get<TextureCache>();
285	const auto& lightStage = DependencyManager::get<DeferredLightingEffect>()->getLightStage();	285	const auto& lightStage = DependencyManager::get<DeferredLightingEffect>()->getLightStage();
286		286
287	glm::mat4 projMat;	287	glm::mat4 projMat;
288	Transform viewMat;	288	Transform viewMat;
289	args->_viewFrustum->evalProjectionMatrix(projMat);	289	args->getViewFrustum().evalProjectionMatrix(projMat);
290	args->_viewFrustum->evalViewTransform(viewMat);	290	args->getViewFrustum().evalViewTransform(viewMat);
291	batch.setProjectionTransform(projMat);	291	batch.setProjectionTransform(projMat);
292	batch.setViewTransform(viewMat);	292	batch.setViewTransform(viewMat);
293	batch.setModelTransform(Transform());	293	batch.setModelTransform(Transform());
294		294
295	// TODO REMOVE: Temporary until UI	295	// TODO REMOVE: Temporary until UI
296	auto first = _customPipelines.begin()->first;	296	auto first = _customPipelines.begin()->first;
297		297
298	batch.setPipeline(getPipeline(_mode, first));	298	batch.setPipeline(getPipeline(_mode, first));
299		299
300	batch.setResourceTexture(Albedo, framebufferCache->getDeferredColorTexture());	300	batch.setResourceTexture(Albedo, framebufferCache->getDeferredColorTexture());
301	batch.setResourceTexture(Normal, framebufferCache->getDeferredNormalTexture());	301	batch.setResourceTexture(Normal, framebufferCache->getDeferredNormalTexture());
302	batch.setResourceTexture(Specular, framebufferCache->getDeferredSpecularTexture());	302	batch.setResourceTexture(Specular, framebufferCache->getDeferredSpecularTexture());