krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Duplicate code fix

Browse source
This commit is contained in:
scrawl 2015-10-23 18:16:26 +02:00
parent 69f234d97b
commit 6dff11f847
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
components/sceneutil/lightmanager.cpp
View file

@ -64,6 +64,16 @@ namespace SceneUtil
std::vector<osg::ref_ptr<osg::Light> > mLights; std::vector<osg::ref_ptr<osg::Light> > mLights;
}; };
LightManager* findLightManager(const osg::NodePath& path)
{
for (unsigned int i=0;i<path.size(); ++i)
{
if (LightManager* lightManager = dynamic_cast<LightManager*>(path[i]))
return lightManager;
}
return NULL;
}
// Set on a LightSource. Adds the light source to its light manager for the current frame. // Set on a LightSource. Adds the light source to its light manager for the current frame.
// This allows us to keep track of the current lights in the scene graph without tying creation & destruction to the manager. // This allows us to keep track of the current lights in the scene graph without tying creation & destruction to the manager.
class CollectLightCallback : public osg::NodeCallback class CollectLightCallback : public osg::NodeCallback
@ -82,14 +92,8 @@ namespace SceneUtil
{ {
if (!mLightManager) if (!mLightManager)
{ {
for (unsigned int i=0;i<nv->getNodePath().size(); ++i) mLightManager = findLightManager(nv->getNodePath());
{
if (LightManager* lightManager = dynamic_cast<LightManager*>(nv->getNodePath()[i]))
{
mLightManager = lightManager;
break;
}
}
if (!mLightManager) if (!mLightManager)
throw std::runtime_error("can't find parent LightManager"); throw std::runtime_error("can't find parent LightManager");
} }
@ -264,14 +268,7 @@ namespace SceneUtil
if (!mLightManager) if (!mLightManager)
{ {
for (unsigned int i=0;i<nv->getNodePath().size(); ++i) mLightManager = findLightManager(nv->getNodePath());
{
if (LightManager* lightManager = dynamic_cast<LightManager*>(nv->getNodePath()[i]))
{
mLightManager = lightManager;
break;
}
}
if (!mLightManager) if (!mLightManager)
{ {
traverse(node, nv); traverse(node, nv);