Changeset 3214

Timestamp:

08/02/04 14:19:50 (9 years ago)

Author:

robert

Message:

Made the member variables in RenderStage? and RenderBin? protected

Location:

OpenSceneGraph/trunk

Files:

• examples/osgdepthshadow/osgdepthshadow.cpp (modified) (4 diffs)
• examples/osgdistortion/osgdistortion.cpp (modified) (3 diffs)
• examples/osgprerender/osgprerender.cpp (modified) (3 diffs)
• examples/osgprerendercubemap/osgprerendercubemap.cpp (modified) (3 diffs)
• examples/osgshadowtexture/CreateShadowedScene.cpp (modified) (3 diffs)
• include/osgUtil/CullVisitor (modified) (3 diffs)
• include/osgUtil/RenderBin (modified) (4 diffs)
• include/osgUtil/RenderStage (modified) (2 diffs)
• include/osgUtil/SceneView (modified) (1 diff)
• src/osgUtil/CullVisitor.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgdepthshadow/osgdepthshadow.cpp

@@ -135 +135 @@
   {
 
-    osgUtil::CullVisitor* cullVisitor = dynamic_cast<osgUtil::CullVisitor*>(nv);
-    if (cullVisitor && _texture.valid() && _subgraph.valid())
+     osgUtil::CullVisitor* cullVisitor = dynamic_cast<osgUtil::CullVisitor*>(nv);
+     if (cullVisitor && _texture.valid() && _subgraph.valid())
       {            
         _request_render_to_depth_texture(*node, *cullVisitor);
@@ -164 +164 @@
   // currently ignore lights in the scene graph itself..
   // will do later.
-  osgUtil::RenderStage* previous_stage = cv.getCurrentRenderBin()->_stage;
+  osgUtil::RenderStage* previous_stage = cv.getCurrentRenderBin()->getStage();
 
   // set up the background color and clear mask.
   rtts->setClearMask(GL_DEPTH_BUFFER_BIT);
-  rtts->_colorMask = new ColorMask(false, false, false, false);
+  rtts->setColorMask(new ColorMask(false, false, false, false));
 
   // set up to charge the same RenderStageLighting is the parent previous stage.
@@ -220 +220 @@
   cv.setCurrentRenderBin(previousRenderBin);
 
-  if (rtts->_renderGraphList.size()==0 && rtts->_bins.size()==0)
+  if (rtts->getRenderGraphList().size()==0 && rtts->getRenderBinList().size()==0)
     {
       // getting to this point means that all the subgraph has been
@@ -231 +231 @@
   // and the render to texture stage to the current stages
   // dependancy list.
-  cv.getCurrentRenderBin()->_stage->addToDependencyList(rtts.get());
+  cv.getCurrentRenderBin()->getStage()->addToDependencyList(rtts.get());
 
   // if one exist attach texture to the RenderToTextureStage.

OpenSceneGraph/trunk/examples/osgdistortion/osgdistortion.cpp

@@ -186 +186 @@
     // currently ignore lights in the scene graph itself..
     // will do later.
-    osgUtil::RenderStage* previous_stage = cv.getCurrentRenderBin()->_stage;
+    osgUtil::RenderStage* previous_stage = cv.getCurrentRenderBin()->getStage();
 
     // set up the background color and clear mask.
@@ -217 +217 @@
     cv.setCurrentRenderBin(previousRenderBin);
 
-    if (rtts->_renderGraphList.size()==0 && rtts->_bins.size()==0)
+    if (rtts->getRenderGraphList().size()==0 && rtts->getRenderBinList().size()==0)
     {
         // getting to this point means that all the subgraph has been
@@ -244 +244 @@
     // and the render to texture stage to the current stages
     // dependancy list.
-    cv.getCurrentRenderBin()->_stage->addToDependencyList(rtts.get());
+    cv.getCurrentRenderBin()->getStage()->addToDependencyList(rtts.get());
 
     // if one exist attach texture to the RenderToTextureStage.

OpenSceneGraph/trunk/examples/osgprerender/osgprerender.cpp

@@ -101 +101 @@
     // currently ignore lights in the scene graph itself..
     // will do later.
-    osgUtil::RenderStage* previous_stage = cv.getCurrentRenderBin()->_stage;
+    osgUtil::RenderStage* previous_stage = cv.getCurrentRenderBin()->getStage();
 
     // set up the background color and clear mask.
@@ -160 +160 @@
     cv.setCurrentRenderBin(previousRenderBin);
 
-    if (rtts->_renderGraphList.size()==0 && rtts->_bins.size()==0)
+    if (rtts->getRenderGraphList().size()==0 && rtts->getRenderBinList().size()==0)
     {
         // getting to this point means that all the subgraph has been
@@ -189 +189 @@
     // and the render to texture stage to the current stages
     // dependancy list.
-    cv.getCurrentRenderBin()->_stage->addToDependencyList(rtts.get());
+    cv.getCurrentRenderBin()->getStage()->addToDependencyList(rtts.get());
 
     // if one exist attach texture to the RenderToTextureStage.

OpenSceneGraph/trunk/examples/osgprerendercubemap/osgprerendercubemap.cpp

@@ -164 +164 @@
     // currently ignore lights in the scene graph itself..
     // will do later.
-    osgUtil::RenderStage* previous_stage = cv.getCurrentRenderBin()->_stage;
+    osgUtil::RenderStage* previous_stage = cv.getCurrentRenderBin()->getStage();
 
     // set up the background color and clear mask.
@@ -222 +222 @@
     cv.setCurrentRenderBin(previousRenderBin);
 
-    if (rtts->_renderGraphList.size()==0 && rtts->_bins.size()==0)
+    if (rtts->getRenderGraphList().size()==0 && rtts->getRenderBinList().size()==0)
     {
         // getting to this point means that all the subgraph has been
@@ -248 +248 @@
     // and the render to texture stage to the current stages
     // dependancy list.
-    cv.getCurrentRenderBin()->_stage->addToDependencyList(rtts.get());
+    cv.getCurrentRenderBin()->getStage()->addToDependencyList(rtts.get());
 
     // if one exist attach image to the RenderToTextureStage.

OpenSceneGraph/trunk/examples/osgshadowtexture/CreateShadowedScene.cpp

@@ -80 +80 @@
     // currently ignore lights in the scene graph itself..
     // will do later.
-    osgUtil::RenderStage* previous_stage = cv.getCurrentRenderBin()->_stage;
+    osgUtil::RenderStage* previous_stage = cv.getCurrentRenderBin()->getStage();
 
     // set up the background color and clear mask.
     rtts->setClearColor(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
-    rtts->setClearMask(previous_stage->getClearMask());
+    //rtts->setClearMask(previous_stage->getClearMask());
 
     // set up to charge the same RenderStageLighting is the parent previous stage.
@@ -161 +161 @@
     cv.setCurrentRenderBin(previousRenderBin);
 
-    if (rtts->_renderGraphList.size()==0 && rtts->_bins.size()==0)
+    if (rtts->getRenderGraphList().size()==0 && rtts->getRenderBinList().size()==0)
     {
         // getting to this point means that all the shadower has been
@@ -190 +190 @@
     // and the render to texture stage to the current stages
     // dependancy list.
-    cv.getCurrentRenderBin()->_stage->addToDependencyList(rtts.get());
+    cv.getCurrentRenderBin()->getStage()->addToDependencyList(rtts.get());
 
     // if one exist attach texture to the RenderToTextureStage.

OpenSceneGraph/trunk/include/osgUtil/CullVisitor

@@ -108 +108 @@
             if (_currentRenderGraph->_stateset->useRenderBinDetails())
             {
-                _currentRenderBin = _currentRenderBin->_parent;
+                _currentRenderBin = _currentRenderBin->getParent();
             }
             _currentRenderGraph = _currentRenderGraph->_parent;
@@ -352 +352 @@
 inline void CullVisitor::addPositionedAttribute(osg::RefMatrix* matrix,const osg::StateAttribute* attr)
 {
-    _currentRenderBin->_stage->addPositionedAttribute(matrix,attr);
+    _currentRenderBin->getStage()->addPositionedAttribute(matrix,attr);
 }
 
@@ -358 +358 @@
 inline void CullVisitor::addPositionedTextureAttribute(unsigned int textureUnit, osg::RefMatrix* matrix,const osg::StateAttribute* attr)
 {
-    _currentRenderBin->_stage->addPositionedTextureAttribute(textureUnit,matrix,attr);
+    _currentRenderBin->getStage()->addPositionedTextureAttribute(textureUnit,matrix,attr);
 }
 

OpenSceneGraph/trunk/include/osgUtil/RenderBin

@@ -63 +63 @@
         virtual void reset();
         
+        RenderBin* getParent() { return _parent; }
+        const RenderBin* getParent() const { return _parent; }
+
+        RenderStage* getStage() { return _stage; }
+        const RenderStage* getStage() const { return _stage; }
+
+        RenderGraphList& getRenderGraphList() { return _renderGraphList; }
+        const RenderGraphList& getRenderGraphList() const { return _renderGraphList; }
+
+        RenderBinList& getRenderBinList() { return _bins; }
+        const RenderBinList& getRenderBinList() const { return _bins; }
+
+        RenderLeafList& getRenderLeafList() { return _renderLeafList; }
+        const RenderLeafList& getRenderLeafList() const { return _renderLeafList; }
+
+
         RenderBin* find_or_insert(int binNum,const std::string& binName);
 
@@ -105 +121 @@
         const DrawCallback* getDrawCallback() const { return _drawCallback.get(); }
 
-
-
         /** extract stats for current draw list. */
         bool getStats(Statistics* primStats);
@@ -112 +126 @@
         bool getPrims(Statistics* primStats, int nbin);
 
+#ifndef USE_DEPRECATED_API
+    protected:
+#endif
 
-    public:
-
+        virtual ~RenderBin();
 
         void copyLeavesFromRenderGraphListToRenderLeafList();
@@ -131 +147 @@
         osg::ref_ptr<DrawCallback>      _drawCallback;
 
-    protected:
-    
-        virtual ~RenderBin();
 
 };

OpenSceneGraph/trunk/include/osgUtil/RenderStage

@@ -134 +134 @@
         bool getStats(Statistics* primStats); 
         
-    public:
+#ifndef USE_DEPRECATED_API
+    protected:
+#endif
         
+        virtual ~RenderStage();
+
         typedef std::vector< osg::ref_ptr<RenderStage> > DependencyList;
 
@@ -153 +157 @@
         mutable osg::ref_ptr<RenderStageLighting>   _renderStageLighting;
         
-    protected:
     
-        virtual ~RenderStage();
 
 };

OpenSceneGraph/trunk/include/osgUtil/SceneView

@@ -132 +132 @@
         const osg::StateSet* getLocalStateSet() const { return _localStateSet.get(); }
 
-#if 1
         typedef Options LightingMode;
-#else
-        enum LightingMode {
-            HEADLIGHT, // default
-            SKY_LIGHT,
-            NO_SCENEVIEW_LIGHT
-        };
-#endif
+
         void setLightingMode(LightingMode mode) { _lightingMode=mode; }
         LightingMode getLightingMode() const { return _lightingMode; }

OpenSceneGraph/trunk/src/osgUtil/CullVisitor.cpp

@@ -1203 +1203 @@
     // currently ignore lights in the scene graph itself..
     // will do later.
-    RenderStage* previous_stage = _currentRenderBin->_stage;
+    RenderStage* previous_stage = _currentRenderBin->getStage();
 
     // set up the background color and clear mask.
@@ -1331 +1331 @@
 
 
-    if (rtts->_renderGraphList.size()==0 && rtts->_bins.size()==0)
+    if (rtts->getRenderGraphList().size()==0 && rtts->getRenderBinList().size()==0)
     {
         // getting to this point means that all the subgraph has been
@@ -1476 +1476 @@
     // and the render to texture stage to the current stages
     // dependancy list.
-    _currentRenderBin->_stage->addToDependencyList(rtts.get());
+    _currentRenderBin->getStage()->addToDependencyList(rtts.get());
 
     // attach texture to the RenderToTextureStage.