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

Fixed assingment of layerLocator

Browse Source
This commit is contained in:
Robert Osfield
2009-09-07 08:30:54 +00:00
parent 80be1d9dd6
commit b9e4313029
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osgVolume/RayTracedTechnique.cpp
View File

@@ -167,8 +167,8 @@ void RayTracedTechnique::init()
} }
if (!masterLocator && layerLocator) masterLocator = _volumeTile->getLayer()->getLocator(); if (!masterLocator && layerLocator) masterLocator = layerLocator;
if (!layerLocator && masterLocator) layerLocator = layerLocator; if (!layerLocator && masterLocator) layerLocator = masterLocator;
osg::Matrix geometryMatrix; osg::Matrix geometryMatrix;
@@ -448,7 +448,10 @@ void RayTracedTechnique::init()
osg::ref_ptr<TexGenLocatorCallback> locatorCallback = new TexGenLocatorCallback(texgen, masterLocator, layerLocator); osg::ref_ptr<TexGenLocatorCallback> locatorCallback = new TexGenLocatorCallback(texgen, masterLocator, layerLocator);
masterLocator->addCallback(locatorCallback.get()); masterLocator->addCallback(locatorCallback.get());
if (masterLocator != layerLocator) layerLocator->addCallback(locatorCallback.get()); if (masterLocator != layerLocator)
{
if (layerLocator) layerLocator->addCallback(locatorCallback.get());
}
stateset->setTextureAttributeAndModes(0, texgen, osg::StateAttribute::ON); stateset->setTextureAttributeAndModes(0, texgen, osg::StateAttribute::ON);