History

Merge branch 'master' into fadeFixes

HifiExperiments committed 9 months ago

Commit 958063b2 parents 17973cb fa80c9035 files · +571 −261Browse files

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

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+6−2
@@ -777,7 +777,9 @@ render::ShapePipelinePointer GeometryCache::getShapePipeline(bool textured, bool · 776 unmodified lines
777777 return std::make_shared<render::ShapePipeline>(getSimplePipeline(textured, transparent, unlit, depthBias, false, true, forward, cullFaceMode), nullptr,
778778 [](const render::ShapePipeline*, gpu::Batch& batch, render::Args* args) {
779779 batch.setResourceTexture(gr::Texture::MaterialAlbedo, DependencyManager::get<TextureCache>()->getWhiteTexture());
780− DependencyManager::get<DeferredLightingEffect>()->setupKeyLightBatch(args, batch);
780+ auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>();
781+ deferredLightingEffect->setupKeyLightBatch(args, batch);
782+ deferredLightingEffect->setupLocalLightsBatch(batch);
781783 }
782784 );
783785 }
@@ -789,7 +791,9 @@ render::ShapePipelinePointer GeometryCache::getFadingShapePipeline(bool textured · 5 unmodified lines
789791 return std::make_shared<render::ShapePipeline>(getSimplePipeline(textured, transparent, unlit, depthBias, true, true, forward, cullFaceMode), nullptr,
790792 [fadeBatchSetter](const render::ShapePipeline*, gpu::Batch& batch, render::Args* args) {
791793 batch.setResourceTexture(gr::Texture::MaterialAlbedo, DependencyManager::get<TextureCache>()->getWhiteTexture());
792− DependencyManager::get<DeferredLightingEffect>()->setupKeyLightBatch(args, batch);
794+ auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>();
795+ deferredLightingEffect->setupKeyLightBatch(args, batch);
796+ deferredLightingEffect->setupLocalLightsBatch(batch);
793797 fadeBatchSetter(nullptr, batch, args);
794798 },
795799 fadeItemSetter