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

Timestamp:

11/21/06 19:41:11 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -404 +404 @@
                 mNumRays(0)
                 {
-                        mSortedObjects[0] = mSortedObjects[1] = mSortedObjects[2] = NULL;
+                        for (int i = 0; i < 4; ++ i)
+                                mSortedObjects[i] = NULL;
                 }
                 
@@ -419 +420 @@
                 mNumRays(numRays)
                 {
-                        mSortedObjects[0] = mSortedObjects[1] = mSortedObjects[2] = NULL;
+                        for (int i = 0; i < 4; ++ i)
+                                mSortedObjects[i] = NULL;
                 }
 
@@ -427 +429 @@
                 {
                         DEL_PTR(mNode);
-                        DEL_PTR(mSortedObjects[0]);
-                        DEL_PTR(mSortedObjects[1]);
-                        DEL_PTR(mSortedObjects[2]);
+                        for (int i = 0; i < 4; ++ i)
+                                DEL_PTR(mSortedObjects[i]);
                 }
 
@@ -447 +448 @@
                 int mNumRays;
                 /// the sorted objects for the three dimensions
-                ObjectContainer *mSortedObjects[3];             
+                ObjectContainer *mSortedObjects[4];             
     };
 
@@ -895 +896 @@
                 some criteria (size, shader)
         */
-        void InititialSubdivision();
-
-        void ChooseSplitPlane(BvhLeaf *leaf);
-
-        bool InitialTerminationCriteriaMet(BvhLeaf *leaf);
-        float mMinInitialSuffaceArea;
+        void InititialSubdivision(ObjectContainer &objects);
+
+        void ChooseSplitIndex(const ObjectContainer &objects, 
+                                                  ObjectContainer::const_iterator &oit);
+
+        bool InitialTerminationCriteriaMet(BvhLeaf *leaf) const;
+        float mMinInitialSurfaceArea;
+int mInititialObjectsSize;
 protected:
         
@@ -987 +990 @@
         bool mUseBboxAreaForSah;
 
-        SortableEntryContainer *mSortedObjects[3];
+        SortableEntryContainer *mSortedObjects[4];
 
         int mMinRaysForVisibility;