FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Jean-Sebastien Guay, fix for handling texture unit >= 8 and negative LigthNum.

Browse Source
This commit is contained in:
Robert Osfield 2011-11-25 09:24:50 +00:00
parent 92ed903a7f
commit 2b2c1b5671
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgShadow/ViewDependentShadowMap.cpp
View File

@ -1052,7 +1052,14 @@ void ViewDependentShadowMap::cull(osgUtil::CullVisitor& cv)
// pass on shadow data to ShadowDataList // pass on shadow data to ShadowDataList
sd->_textureUnit = textureUnit; sd->_textureUnit = textureUnit;
sdl.push_back(sd); if (textureUnit >= 8)
{
OSG_NOTICE<<"Shadow texture unit is invalid for texgen, will not be used."<<std::endl;
}
else
{
sdl.push_back(sd);
}
// increment counters. // increment counters.
++textureUnit; ++textureUnit;
@ -1095,7 +1102,7 @@ bool ViewDependentShadowMap::selectActiveLights(osgUtil::CullVisitor* cv, ViewDe
++itr) ++itr)
{ {
const osg::Light* light = dynamic_cast<const osg::Light*>(itr->first.get()); const osg::Light* light = dynamic_cast<const osg::Light*>(itr->first.get());
if (light) if (light && light->getLightNum() >= 0)
{ {
// is LightNum matched to that defined in settings // is LightNum matched to that defined in settings
if (settings && settings->getLightNum()>=0 && light->getLightNum()!=settings->getLightNum()) continue; if (settings && settings->getLightNum()>=0 && light->getLightNum()!=settings->getLightNum()) continue;