Changeset 1779 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.h

Timestamp:

11/22/06 10:49:09 (18 years ago)

Author:

mattausch

Message:

warning: this version contains bugs!!

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.h (modified) (3 diffs)

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

@@ -304 +304 @@
                 first split candidates.
         */
-        SubdivisionCandidate *PrepareObjectSpaceSubdivision(const VssRayContainer &sampleRays,
-                                                                                                                const ObjectContainer &objects);
+        void PrepareObjectSpaceSubdivision(SplitQueue &tQueue,
+                                                                           const VssRayContainer &sampleRays,
+                                                                           const ObjectContainer &objects);
 
 
@@ -412 +413 @@
         /** Prepare bv hierarchy for subdivision
         */
-        SubdivisionCandidate *PrepareBvHierarchy(const VssRayContainer &sampleRays,
-                                                                           const ObjectContainer &objects);
+        void PrepareBvHierarchy(SplitQueue &tQueue,
+                                                        const VssRayContainer &sampleRays,
+                                                        const ObjectContainer &objects);
 
         /** Prepare object space kd tree for subdivision.
         */
-        SubdivisionCandidate *PrepareOspTree(const VssRayContainer &sampleRays,
-                                                                   const ObjectContainer &objects);
+        void PrepareOspTree(SplitQueue &tQueue,
+                                                const VssRayContainer &sampleRays,
+                                                const ObjectContainer &objects);
 
         /** Prepare view space subdivision and add candidate to queue.
         */
-        SubdivisionCandidate *PrepareViewSpaceSubdivision(const VssRayContainer &sampleRays,
-                                                                                                          const ObjectContainer &objects);
+        void PrepareViewSpaceSubdivision(SplitQueue &tQueue,
+                                                                         const VssRayContainer &sampleRays,
+                                                                         const ObjectContainer &objects);
 
         /** Was object space subdivision already constructed?
@@ -488 +492 @@
                 so construction can be restarted.
         */
-        SubdivisionCandidate *ResetObjectSpaceSubdivision(const VssRayContainer &rays, 
-                                                                                                          const ObjectContainer &objects);
-
-        SubdivisionCandidate *ResetViewSpaceSubdivision(const VssRayContainer &rays, 
-                                                                                                        const ObjectContainer &objects,
-                                                                                                        AxisAlignedBox3 *forcedViewSpace);
+        void ResetObjectSpaceSubdivision(SplitQueue &tQueue,
+                                                                         const VssRayContainer &rays, 
+                                                                         const ObjectContainer &objects);
+
+        void ResetViewSpaceSubdivision(SplitQueue &tQueue,
+                                                                   const VssRayContainer &rays, 
+                                                                   const ObjectContainer &objects,
+                                                                   AxisAlignedBox3 *forcedViewSpace);
 
 
         ///////////////////////////
 
-        void ExportStats(ofstream &stats, SplitQueue &tQueue, const ObjectContainer &objects);
+        void ExportStats(ofstream &stats, 
+                                         SplitQueue &tQueue, 
+                                         const ObjectContainer &objects);
 
         void CollectBestSet(const int maxSplits,