Changeset 1912 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h

Timestamp:

12/20/06 00:26:02 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h (modified) (7 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h

@@ -382 +382 @@
                 mNode(NULL),
                 mDepth(0),
-                mProbability(0.0),
                 mMaxCostMisses(0), 
                 mAxis(0),
-                mNumRays(0)
+                mNumRays(0),
+                mCorrectedPvs(0),
+                mPvs(0),
+                mCorrectedRenderCost(0),
+                mRenderCost(0)
                 {
                         for (int i = 0; i < 4; ++ i)
@@ -397 +400 @@
                 mNode(node), 
                 mDepth(depth),
-                //mBoundingBox(box),
-                mProbability(v),
                 mMaxCostMisses(0),
                 mAxis(0),
-                mNumRays(numRays)
+                mNumRays(numRays),
+                mCorrectedPvs(0),
+                mPvs(0),
+                mCorrectedRenderCost(0),
+                mRenderCost(v)
                 {
                         for (int i = 0; i < 4; ++ i)
@@ -420 +425 @@
                 /// current depth
                 int mDepth;
-                /// the probability that this node is seen
-                float mProbability;
-                /// the bounding box of the node
-                //AxisAlignedBox3 mBoundingBox;
+                /// the render cost of the node
+                float mRenderCost;
+                /// the corrected render cost;
+                float mCorrectedRenderCost;
                 /// how often this branch has missed the max-cost ratio
                 int mMaxCostMisses;
@@ -430 +435 @@
                 /// number of rays
                 int mNumRays;
+                /// parent Pvs;
+                float mPvs;
+                /// parent pvs correction factor
+                float mCorrectedPvs;
+
                 /// the sorted objects for the three dimensions
                 ObjectContainer *mSortedObjects[4];             
@@ -486 +496 @@
                         return mPriority;
                 }
+
+                /////////////////////////////7
 
                 /// pointer to parent tree.
@@ -496 +508 @@
                 /// the objects on the back of the potential split
                 ObjectContainer mBackObjects;
+                        
+                float mCorrectedFrontPvs;
+                float mCorrectedBackPvs;
+
+                float mCorrectedFrontCost;
+                float mCorrectedBackCost;
         };
 
@@ -821 +839 @@
         /** Evaluates increase in pvs size.
         */
-        int EvalPvsEntriesIncr(BvhSubdivisionCandidate &splitCandidate) const;
+        int EvalPvsEntriesIncr(BvhSubdivisionCandidate &splitCandidate, const float avgRayContri) const;
 
         /** Rays will be clipped to the bounding box.