mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 03:40:24 +00:00
Code Issues Releases Wiki Activity

Fix uninitialized variables in the LightManager

Browse source
This commit is contained in:
Andrei Kortunov 2021-04-14 08:20:23 +04:00
parent e309f75938
commit bce6effe95
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/sceneutil/lightmanager.cpp
View file

@ -400,7 +400,7 @@ namespace SceneUtil
class LightStateAttributePerObjectUniform : public osg::StateAttribute class LightStateAttributePerObjectUniform : public osg::StateAttribute
{ {
public: public:
LightStateAttributePerObjectUniform() {} LightStateAttributePerObjectUniform() : mLightManager(nullptr) {}
LightStateAttributePerObjectUniform(const std::vector<osg::ref_ptr<osg::Light>>& lights, LightManager* lightManager) : mLights(lights), mLightManager(lightManager) {} LightStateAttributePerObjectUniform(const std::vector<osg::ref_ptr<osg::Light>>& lights, LightManager* lightManager) : mLights(lights), mLightManager(lightManager) {}
LightStateAttributePerObjectUniform(const LightStateAttributePerObjectUniform& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) LightStateAttributePerObjectUniform(const LightStateAttributePerObjectUniform& copy,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
@ -613,7 +613,7 @@ namespace SceneUtil
class LightManagerCullCallback : public osg::NodeCallback class LightManagerCullCallback : public osg::NodeCallback
{ {
public: public:
LightManagerCullCallback(LightManager* lightManager) : mLightManager(lightManager) {} LightManagerCullCallback(LightManager* lightManager) : mLightManager(lightManager), mLastFrameNumber(0) {}
void operator()(osg::Node* node, osg::NodeVisitor* nv) override void operator()(osg::Node* node, osg::NodeVisitor* nv) override
{ {
@ -903,6 +903,10 @@ namespace SceneUtil
, mLightingMask(copy.mLightingMask) , mLightingMask(copy.mLightingMask)
, mSun(copy.mSun) , mSun(copy.mSun)
, mLightingMethod(copy.mLightingMethod) , mLightingMethod(copy.mLightingMethod)
, mPointLightRadiusMultiplier(copy.mPointLightRadiusMultiplier)
, mPointLightFadeEnd(copy.mPointLightFadeEnd)
, mPointLightFadeStart(copy.mPointLightFadeStart)
, mMaxLights(copy.mMaxLights)
{ {
} }