Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:43:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

updating some code and probably broken in this version

Browse source
This commit is contained in:
sam gateau 2018-12-19 18:22:01 -08:00
parent 9c436bc28c
commit 253a71a20c
2 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libraries/render-utils/src/LightStage.h
View file

@ -118,15 +118,12 @@ public:
}; };
using ShadowPointer = std::shared_ptr<Shadow>; using ShadowPointer = std::shared_ptr<Shadow>;
using Shadows = render::indexed_container::IndexedPointerVector<Shadow>;
Index findLight(const LightPointer& light) const; Index findLight(const LightPointer& light) const;
Index addLight(const LightPointer& light, const bool shouldSetAsDefault = false); Index addLight(const LightPointer& light, const bool shouldSetAsDefault = false);
Index getDefaultLight() { return _defaultLightId; } Index getDefaultLight() { return _defaultLightId; }
Index addShadow(Index lightIndex, float maxDistance = 20.0f, unsigned int cascadeCount = 1U);
LightPointer removeLight(Index index); LightPointer removeLight(Index index);
bool checkLightId(Index index) const { return _lights.checkIndex(index); } bool checkLightId(Index index) const { return _lights.checkIndex(index); }
@ -135,23 +132,7 @@ public:
Index getNumFreeLights() const { return _lights.getNumFreeIndices(); } Index getNumFreeLights() const { return _lights.getNumFreeIndices(); }
Index getNumAllocatedLights() const { return _lights.getNumAllocatedIndices(); } Index getNumAllocatedLights() const { return _lights.getNumAllocatedIndices(); }
LightPointer getLight(Index lightId) const { LightPointer getLight(Index lightId) const { return _lights.get(lightId); }
return _lights.get(lightId);
}
Index getShadowId(Index lightId) const;
ShadowPointer getShadow(Index lightId) const {
return _shadows.get(getShadowId(lightId));
}
using LightAndShadow = std::pair<LightPointer, ShadowPointer>;
LightAndShadow getLightAndShadow(Index lightId) const {
auto light = getLight(lightId);
auto shadow = getShadow(lightId);
assert(shadow == nullptr || shadow->getLight() == light);
return LightAndShadow(light, shadow);
}
LightStage(); LightStage();
@ -211,8 +192,6 @@ public:
LightPointer getCurrentKeyLight(const LightStage::Frame& frame) const; LightPointer getCurrentKeyLight(const LightStage::Frame& frame) const;
LightPointer getCurrentAmbientLight(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: protected:
@ -224,7 +203,6 @@ protected:
gpu::BufferPointer _lightArrayBuffer; gpu::BufferPointer _lightArrayBuffer;
Lights _lights; Lights _lights;
Shadows _shadows;
Descs _descs; Descs _descs;
LightMap _lightMap; LightMap _lightMap;

2
libraries/render-utils/src/RenderDeferredTask.cpp
View file

@ -446,7 +446,7 @@ void DrawDeferred::run(const RenderContextPointer& renderContext, const Inputs&
const auto& lightFrame = inputs.get2(); const auto& lightFrame = inputs.get2();
const auto& lightingModel = inputs.get3(); const auto& lightingModel = inputs.get3();
const auto& lightClusters = inputs.get4(); 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(); const auto jitter = inputs.get6();
auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>(); auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>();