Changeset 663 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.h

Timestamp:

02/27/06 07:58:27 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.h (modified) (6 diffs)

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

@@ -28 +28 @@
 struct BspRay;
 
-#define OCTREE_HACK 0
+//#define OCTREE_HACK 0
 /**
         This is a view space partitioning specialised BSPtree.  
@@ -44 +44 @@
         /** Additional data which is passed down the BSP tree during traversal.
         */
-        struct VspBspTraversalData
+        class VspBspTraversalData
         {  
+        public:
                 /// the current node
                 BspNode *mNode;
@@ -64 +65 @@
                 /// if this node is a kd-node (i.e., boundaries are axis aligned
                 bool mIsKdNode;
-
-
-#if OCTREE_HACK // OCTREE HACK
+                // hack for octree
                 int mAxis;
-#endif
-                /// bounding box of current view space.
-                ///AxisAlignedBox3 mBbox;
-                
+                float mPriority;
+
+                static bool sBreathFirstSplits;
+
                 /** Returns average ray contribution.
                 */
@@ -129 +128 @@
                 float GetCost() const
                 {
-#if 1
-                        return mPvs * mProbability;
-#endif
-#if 0
-                        return (float) (-mDepth); // for regular grid
-#endif
-#if 0
-                        return (float)(mPvs * (int)mRays->size());
-#endif
-#if 0
-                        return (float)mPvs;
-#endif
-#if 0
-                        return mProbabiliy * (float)mRays->size();
-#endif
+                        if (sBreathFirstSplits)
+                                return mPvs * mProbability;
+                        else
+                                return (float) (-mDepth); // for kd tree
                 }
 
@@ -160 +148 @@
     };
         
+
         typedef std::priority_queue<VspBspTraversalData> VspBspTraversalQueue;
         
@@ -788 +777 @@
 
         //int mSplits;
-
+        /// subdivision stats output file
         ofstream mSubdivsionStats;
-
+        /// if random split axis should be used
         bool mUseRandomAxis;
-
+        /// use polygon split whenever there are polys left
         bool mUsePolygonSplitIfAvailable;
-
+        /// current time stamp (used for keeping split history)
         int mTimeStamp;
-
+        /// number of currenly generated view cells
         int mCreatedViewCells;
+        /// if vsp bsp tree should simulate octree
+        bool mSimulateOctree;
+
+        int mBreathFirstSplits;
 
 private: