Changeset 4202 for OpenSceneGraph/trunk/examples/osgteapot/osgteapot.cpp

Timestamp:

05/12/05 16:03:22 (8 years ago)

Author:

robert

Message:

Added new Node/Drawable::s/getInitialBound and Node/Drawable::s/getComputeBoundCallback
methods and reimplement computeBound so that it passes back a bounding volume rather
than modifying the local one.

Files:

• OpenSceneGraph/trunk/examples/osgteapot/osgteapot.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgteapot/osgteapot.cpp

@@ -227 +227 @@
         
         
-    protected:
-    
-        virtual ~Teapot() {}
-        
         // we need to set up the bounding box of the data too, so that the scene graph knows where this
         // objects is, for both positioning the camera at start up, and most importantly for culling.
-        virtual bool computeBound() const
+        virtual osg::BoundingBox computeBound() const
         {
-            _bbox.init();
+            osg::BoundingBox bbox;
 
             // follow is some truely horrible code required to calculate the 
@@ -266 +262 @@
                   }
                   
-                  _bbox.expandBy(osg::Vec3(p[j][k][0],p[j][k][1],p[j][k][2]));
-                  _bbox.expandBy(osg::Vec3(q[j][k][0],q[j][k][1],q[j][k][2]));
+                  bbox.expandBy(osg::Vec3(p[j][k][0],p[j][k][1],p[j][k][2]));
+                  bbox.expandBy(osg::Vec3(q[j][k][0],q[j][k][1],q[j][k][2]));
 
                   if (i < 6)
                   {
-                    _bbox.expandBy(osg::Vec3(r[j][k][0],r[j][k][1],r[j][k][2]));
-                    _bbox.expandBy(osg::Vec3(s[j][k][0],s[j][k][1],s[j][k][2]));
+                    bbox.expandBy(osg::Vec3(r[j][k][0],r[j][k][1],r[j][k][2]));
+                    bbox.expandBy(osg::Vec3(s[j][k][0],s[j][k][1],s[j][k][2]));
                   }
                   
@@ -280 +276 @@
             }
 
-            _bbox_computed = true;
-            return true;
+            return bbox;
         }
+
+    protected:
+    
+        virtual ~Teapot() {}
+        
 };