Changeset 178

Timestamp:

12/03/2008 11:40:33 PM (3 years ago)

Author:

art

Message:

• bypass changes

Location:

sandbox/trunk

Files:

• include/osgPPU/Unit.h (modified) (2 diffs)
• include/osgPPU/UnitBypass.h (modified) (1 diff)
• src/osgPPU/Unit.cpp (modified) (2 diffs)
• src/osgPPU/UnitBypass.cpp (modified) (1 diff)

sandbox/trunk/include/osgPPU/Unit.h

@@ -395 +395 @@
         int mInputTexIndexForViewportReference;
 
+        //! Traverse the unit
+        virtual void traverse(osg::NodeVisitor& nv);
+
     private:
         bool mbActive;
@@ -403 +406 @@
 
         void printDebugInfo(const osg::Drawable* dr);
-        void traverse(osg::NodeVisitor& nv);
 
         // it is good to have friends

sandbox/trunk/include/osgPPU/UnitBypass.h

@@ -39 +39 @@
             
             virtual ~UnitBypass();
-            
-            virtual void init();
     
         protected:
             virtual void setupInputsFromParents();
-            
+            virtual bool noticeBeginRendering (osg::RenderInfo&, const osg::Drawable* ) { return false; }            
     };
 };

sandbox/trunk/src/osgPPU/Unit.cpp

@@ -393 +393 @@
         {
             mbUpdateTraversed = true;
-        //printf("UNIT %s UPDATE traverse\n", getName().c_str());
 
             update();
@@ -405 +404 @@
         if (mbCullTraversed == false)
         {
-        //printf("UNIT %s (%d) CULL traverse\n", getName().c_str(), getOrCreateStateSet()->getBinNumber());
             mbCullTraversed = true;
             osg::Group::traverse(nv);

sandbox/trunk/src/osgPPU/UnitBypass.cpp

@@ -40 +40 @@
     }
 
-
-    //------------------------------------------------------------------------------
-    void UnitBypass::init()
-    {
-        Unit::init(); 
-    }
-
     //------------------------------------------------------------------------------
     void UnitBypass::setupInputsFromParents()