History

Shadows are completely working with settings on both pipeline

sam gateau committed 7 years ago

Commit 237fb4d1 parent 5a6f30b18 files · +284 −96Browse files

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

Unified · Split

libraries/render-utils/src/DeferredLightingEffect.cpp+3−6
@@ -378,8 +378,7 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext, · 377 unmodified lines
378 const HazeStage::FramePointer& hazeFrame,378 const HazeStage::FramePointer& hazeFrame,
379 const SurfaceGeometryFramebufferPointer& surfaceGeometryFramebuffer,379 const SurfaceGeometryFramebufferPointer& surfaceGeometryFramebuffer,
380 const AmbientOcclusionFramebufferPointer& ambientOcclusionFramebuffer,380 const AmbientOcclusionFramebufferPointer& ambientOcclusionFramebuffer,
381 const SubsurfaceScatteringResourcePointer& subsurfaceScatteringResource,381 const SubsurfaceScatteringResourcePointer& subsurfaceScatteringResource) {
382 bool renderShadows) {
383 382
384 auto args = renderContext->args;383 auto args = renderContext->args;
385 auto& batch = (*args->_batch);384 auto& batch = (*args->_batch);
@@ -596,9 +595,7 @@ void RenderDeferredCleanup::run(const render::RenderContextPointer& renderContex · 210 unmodified lines
596 }595 }
597}596}
598 597
599RenderDeferred::RenderDeferred(bool renderShadows):598RenderDeferred::RenderDeferred() {
600 _renderShadows(renderShadows)
601{
602 DependencyManager::get<DeferredLightingEffect>()->init();599 DependencyManager::get<DeferredLightingEffect>()->init();
603}600}
604 601
@@ -629,7 +626,7 @@ void RenderDeferred::run(const RenderContextPointer& renderContext, const Inputs · 24 unmodified lines
629 args->_batch = &batch;626 args->_batch = &batch;
630 _gpuTimer->begin(batch);627 _gpuTimer->begin(batch);
631 628
632 setupJob.run(renderContext, deferredTransform, deferredFramebuffer, lightingModel, lightFrame, shadowFrame, hazeFrame, surfaceGeometryFramebuffer, ssaoFramebuffer, subsurfaceScatteringResource, _renderShadows);629 setupJob.run(renderContext, deferredTransform, deferredFramebuffer, lightingModel, lightFrame, shadowFrame, hazeFrame, surfaceGeometryFramebuffer, ssaoFramebuffer, subsurfaceScatteringResource);
633 630
634 lightsJob.run(renderContext, deferredTransform, deferredFramebuffer, lightingModel, surfaceGeometryFramebuffer, lightClusters);631 lightsJob.run(renderContext, deferredTransform, deferredFramebuffer, lightingModel, surfaceGeometryFramebuffer, lightClusters);
635 632

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t