Renamed osgUtil::RenderStageLighting osgUtil::PositionalStateContainer

src/osgUtil/CullVisitor.cpp

@@ -1122,12 +1122,12 @@ void CullVisitor::apply(osg::CameraNode& camera)
         rtts->setViewport( viewport );
         
 
-        // set up to charge the same RenderStageLighting is the parent previous stage.
+        // set up to charge the same PositionalStateContainer is the parent previous stage.
         osg::Matrix inhertiedMVtolocalMV;
         inhertiedMVtolocalMV.invert(originalModelView);
         inhertiedMVtolocalMV.postMult(getModelViewMatrix());
-        rtts->setInheritedRenderStageLightingMatrix(inhertiedMVtolocalMV);
-        rtts->setInheritedRenderStageLighting(previous_stage->getRenderStageLighting());
+        rtts->setInheritedPositionalStateContainerMatrix(inhertiedMVtolocalMV);
+        rtts->setInheritedPositionalStateContainer(previous_stage->getPositionalStateContainer());
 
         // record the render bin, to be restored after creation
         // of the render to text

src/osgUtil/GNUmakefile

@@ -16,7 +16,7 @@ CXXFILES = \
 	RenderGraph.cpp\
 	RenderLeaf.cpp\
 	RenderStage.cpp\
-	RenderStageLighting.cpp\
+	PositionalStateContainer.cpp\
 	SceneView.cpp\
 	Simplifier.cpp\
 	SmoothingVisitor.cpp\

src/osgUtil/PositionalStateContainer.cpp

@@ -10,29 +10,29 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
  * OpenSceneGraph Public License for more details.
 */
-#include <osgUtil/RenderStageLighting>
+#include <osgUtil/PositionalStateContainer>
 
 using namespace osg;
 using namespace osgUtil;
 
-// register a RenderStageLighting prototype with the RenderBin prototype list.
-//RegisterRenderBinProxy<RenderStageLighting> s_registerRenderStageLightingProxy;
+// register a PositionalStateContainer prototype with the RenderBin prototype list.
+//RegisterRenderBinProxy<PositionalStateContainer> s_registerPositionalStateContainerProxy;
 
-RenderStageLighting::RenderStageLighting()
+PositionalStateContainer::PositionalStateContainer()
 {
 }
 
-RenderStageLighting::~RenderStageLighting()
+PositionalStateContainer::~PositionalStateContainer()
 {
 }
 
-void RenderStageLighting::reset()
+void PositionalStateContainer::reset()
 {
     _attrList.clear();
     _texAttrListMap.clear();
 }
 
-void RenderStageLighting::draw(osg::State& state,RenderLeaf*& previous, const osg::Matrix* postMultMatrix)
+void PositionalStateContainer::draw(osg::State& state,RenderLeaf*& previous, const osg::Matrix* postMultMatrix)
 {
 
     if (previous)

src/osgUtil/RenderStage.cpp

@@ -406,9 +406,9 @@ void RenderStage::drawImplementation(osg::State& state,RenderLeaf*& previous)
     glLoadIdentity();
 
     // apply the positional state.
-    if (_inheritedRenderStageLighting.valid())
+    if (_inheritedPositionalStateContainer.valid())
     {
-        _inheritedRenderStageLighting->draw(state, previous, &_inheritedRenderStageLightingMatrix);
+        _inheritedPositionalStateContainer->draw(state, previous, &_inheritedPositionalStateContainerMatrix);
     }
 
     // apply the positional state.