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

Timestamp:

09/12/06 19:30:31 (18 years ago)

Author:

mattausch

Message:

started with global objects sorting for bvh split heuristics

File:

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

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

@@ -283 +283 @@
 public:
         
+        struct SortableEntry;
+        typedef vector<SortableEntry> SortableEntryContainer;
+
         /** Additional data which is passed down the BSP tree during traversal.
         */
@@ -294 +297 @@
                 mProbability(0.0),
                 mMaxCostMisses(0), 
-                mPriority(0),
                 mAxis(0)
+                //mObjectsStart(0),
+                //mObjectsEnd(0)
                 {}
                 
@@ -307 +311 @@
                 mProbability(v),
                 mMaxCostMisses(0),
-                mPriority(0),
                 mAxis(0)
+                //mObjectsStart(0)
+                //mObjectsEnd(0)
                 {}
-
-
-                /** Returns cost of the traversal data.
-                */
-                float GetCost() const
-                {
-                        return mPriority;
-                }
 
                 /// deletes contents and sets them to NULL
@@ -337 +334 @@
                 /// current axis
                 int mAxis;
-                /// current priority
-                float mPriority;
-
-
-                friend bool operator<(const BvhTraversalData &a, const BvhTraversalData &b)
-                {
-                        return a.GetCost() < b.GetCost();
-                }
+                /// start of objects
+                SortableEntryContainer::const_iterator mObjectsStart;
+                /// end of objects
+                SortableEntryContainer::const_iterator mObjectsEnd;
     };
 
@@ -544 +537 @@
                 }
         };
- 
+
         /** Evaluate balanced object partition.
         */
@@ -586 +579 @@
         
         /** Subdivides leaf.
-                @param leaf the leaf to be subdivided
+                @param sc the subdivisionCandidate holding all necessary data for subdivision           
                 
-                @param polys the polygons to be split
-                @param frontPolys returns the polygons in front of the split plane
-                @param backPolys returns the polygons in the back of the split plane
-                
-                @param rays the polygons to be filtered
-                @param frontRays returns the polygons in front of the split plane
-                @param backRays returns the polygons in the back of the split plane
-
-                @returns the root of the subdivision
+                @param frontData returns the traversal data for the front node
+                @param backData returns the traversal data for the back node
+
+                @returns the new interior node = the of the subdivision
         */
         BvhInterior *SubdivideNode(
-                const ObjectContainer &frontObjects,
-                const ObjectContainer &backObjects,
-                const BvhTraversalData &tData,
+                const BvhSubdivisionCandidate &sc,
                 BvhTraversalData &frontData,
                 BvhTraversalData &backData);
@@ -636 +622 @@
                 @param axis the current split axis
         */
-        void SortSubdivisionCandidates(
-                const BvhTraversalData &data,
+        static void SortSubdivisionCandidates(
+                const ObjectContainer &objects,
+                vector<SortableEntry> **subdivisionCandidates,
                 const int axis);
 
@@ -724 +711 @@
 protected:
         
+        /// pre-sorted subdivision candidtes for all three directions.
+        vector<SortableEntry> *mGlobalSubdivisionCandidates[3];
+
         /// pointer to the hierarchy of view cells
         ViewCellsTree *mViewCellsTree;