diff --git a/libraries/render-utils/src/LightStage.h b/libraries/render-utils/src/LightStage.h index 6c84859164..1fb1754862 100644 --- a/libraries/render-utils/src/LightStage.h +++ b/libraries/render-utils/src/LightStage.h @@ -118,15 +118,12 @@ public: }; using ShadowPointer = std::shared_ptr; - using Shadows = render::indexed_container::IndexedPointerVector; Index findLight(const LightPointer& light) const; Index addLight(const LightPointer& light, const bool shouldSetAsDefault = false); Index getDefaultLight() { return _defaultLightId; } - Index addShadow(Index lightIndex, float maxDistance = 20.0f, unsigned int cascadeCount = 1U); - LightPointer removeLight(Index index); bool checkLightId(Index index) const { return _lights.checkIndex(index); } @@ -135,23 +132,7 @@ public: Index getNumFreeLights() const { return _lights.getNumFreeIndices(); } Index getNumAllocatedLights() const { return _lights.getNumAllocatedIndices(); } - LightPointer getLight(Index lightId) const { - return _lights.get(lightId); - } - - Index getShadowId(Index lightId) const; - - ShadowPointer getShadow(Index lightId) const { - return _shadows.get(getShadowId(lightId)); - } - - using LightAndShadow = std::pair; - LightAndShadow getLightAndShadow(Index lightId) const { - auto light = getLight(lightId); - auto shadow = getShadow(lightId); - assert(shadow == nullptr || shadow->getLight() == light); - return LightAndShadow(light, shadow); - } + LightPointer getLight(Index lightId) const { return _lights.get(lightId); } LightStage(); @@ -211,8 +192,6 @@ public: LightPointer getCurrentKeyLight(const LightStage::Frame& frame) const; LightPointer getCurrentAmbientLight(const LightStage::Frame& frame) const; - ShadowPointer getCurrentKeyShadow(const LightStage::Frame& frame) const; - LightAndShadow getCurrentKeyLightAndShadow(const LightStage::Frame& frame) const; protected: @@ -224,7 +203,6 @@ protected: gpu::BufferPointer _lightArrayBuffer; Lights _lights; - Shadows _shadows; Descs _descs; LightMap _lightMap; diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp index d9bc802adc..ef19cbb3ea 100644 --- a/libraries/render-utils/src/RenderDeferredTask.cpp +++ b/libraries/render-utils/src/RenderDeferredTask.cpp @@ -446,7 +446,7 @@ void DrawDeferred::run(const RenderContextPointer& renderContext, const Inputs& const auto& lightFrame = inputs.get2(); const auto& lightingModel = inputs.get3(); const auto& lightClusters = inputs.get4(); - const auto& shadowFrame = inputs.get5(); + // Not used yet but will be: const auto& shadowFrame = inputs.get5(); const auto jitter = inputs.get6(); auto deferredLightingEffect = DependencyManager::get();