Changeset 2760 for GTP/trunk/App/Demos/Vis/CHC_revisited/Bvh.h

Timestamp:

06/14/08 19:04:01 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/Bvh.h (modified) (11 diffs)

GTP/trunk/App/Demos/Vis/CHC_revisited/Bvh.h

@@ -14 +14 @@
 
 ////////
-// Forward declarations
+//-- Forward declarations
 
 class SceneEntity;
 class Camera;
+class RenderState;
 
 
@@ -210 +211 @@
         /// the bounding box
         AxisAlignedBox3 mBox;
-
 };
 
@@ -347 +347 @@
         /** Returns split axis of this interior node.
         */
-        inline int GetAxis() { return (int)mAxis; }
+        //inline int GetAxis() { return (int)mAxis; }
         /** Returns position of the split axis.
         */
-        inline float GetPosition() {return (float)mPosition;}
+        //inline float GetPosition() {return (float)mPosition;}
 
 
@@ -356 +356 @@
 
         /// the position of the split plane
-        float mPosition;
+        //float mPosition;
         
         BvhNode *mBack;
@@ -407 +407 @@
                 mInteriorVol(0),
                 mLeafVol(0),
-                mBoundsInteriorSA(0),
-                mBoundsLeafSA(0),
-                mBoundsInteriorVol(0),
-                mBoundsLeafVol(0),
-                mBoundsLeavesCount(0),
                 mTriangles(0),
                 mTriangleRatio(0),
@@ -423 +418 @@
                 float mInteriorVol;
                 float mLeafVol; 
-                float mBoundsInteriorSA;
-                float mBoundsLeafSA;
-                float mBoundsInteriorVol;
-                float mBoundsLeafVol;
-                int mBoundsLeavesCount;
+                
                 int mTriangles;
 
@@ -479 +470 @@
         int RenderBoundingBoxes(const BvhNodeContainer &nodes);
 
+        /** Returns the bounding box of this bvh.
+        */
+        inline const AxisAlignedBox3 &GetBox() { return mBox; }
 
 
@@ -535 +529 @@
         const BvhStats &GetBvhStats() const {return mBvhStats;}
         
+        int Render(BvhNode *node, RenderState *state);
+
 
 protected:
@@ -543 +539 @@
         */
         Bvh();
+
+        /** Protected constructor taking scene geometry into account
+        */
+        const Bvh(const SceneEntityContainer &entities);
         
 
@@ -574 +574 @@
         */
         void RecomputeBounds();
-        /** Does some postprocessing on the leaves.
-                @returns #leaves that were chosen for tighter bounds.
-        */
-        int PostProcessLeaves(BvhLeafContainer &leaves);
-                
-        
+        /** Does some postprocessing on the nodes.
+        */
+        //void PostProcess();
+        /** Helper method that updates the number of leaves in the subtree under
+                this node.
+        */
+        void UpdateNumLeaves(BvhNode *node) const;
+
         ////////////////////////
 
@@ -619 +621 @@
         int mNumNodes;
 
+        /// the bounding box
+        AxisAlignedBox3 mBox;
 
         //////////////