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

Timestamp:

10/16/06 17:17:42 (18 years ago)

Author:

mattausch

Message:

added kd tree loading

File:

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

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

@@ -216 +216 @@
         /** Exports object space hierarchy for visualization.
         */
-        void ExportObjectSpaceHierarchy(
-                Exporter *exporter, 
-                const ObjectContainer &objects,
-                const AxisAlignedBox3 *bbox,
-                const bool exportBounds = true) const;
+        void ExportObjectSpaceHierarchy(Exporter *exporter, 
+                                                                        const ObjectContainer &objects,
+                                                                        const AxisAlignedBox3 *bbox,
+                                                                        const bool exportBounds = true) const;
 
         /** Returns intersectable pierced by this ray.
         */
-        Intersectable *GetIntersectable(
-                const VssRay &ray, 
-                const bool isTermination) const;
+        Intersectable *GetIntersectable(const VssRay &ray, const bool isTermination) const;
+
+        /** Export object space partition bounding boxes.
+        */
+        void ExportBoundingBoxes(OUT_STREAM &stream, const ObjectContainer &objects);
 
         friend ostream &operator<<(ostream &s, const HierarchyManager &hm) 
@@ -233 +234 @@
                 return s;
         } 
-
-        void ExportBoundingBoxes(OUT_STREAM &stream, const ObjectContainer &objects);
-
 
 protected:
@@ -386 +384 @@
                 for the next split.
         */
-        void ConstructInterleaved(
-                const VssRayContainer &sampleRays,
-                const ObjectContainer &objects,
-                AxisAlignedBox3 *forcedViewSpace);
+        void ConstructInterleaved(const VssRayContainer &sampleRays,
+                                                          const ObjectContainer &objects,
+                                                          AxisAlignedBox3 *forcedViewSpace);
 
         /** Construct object space partition interleaved with view space partition.
@@ -399 +396 @@
                 next number of split.
         */
-        void ConstructInterleaved2(
-                const VssRayContainer &sampleRays,
-                const ObjectContainer &objects,
-                AxisAlignedBox3 *forcedViewSpace);
+        void ConstructInterleavedWithGradient(const VssRayContainer &sampleRays,
+                                                                                  const ObjectContainer &objects,
+                                                                                  AxisAlignedBox3 *forcedViewSpace);
 
         /** Use iteration to construct the object space hierarchy.
         */
-        void ConstructMultiLevel(
-                const VssRayContainer &sampleRays,
-                const ObjectContainer &objects,
-                AxisAlignedBox3 *forcedViewSpace);
+        void ConstructMultiLevel(const VssRayContainer &sampleRays,
+                                                         const ObjectContainer &objects,
+                                                         AxisAlignedBox3 *forcedViewSpace);
 
         /** Reset the object space subdivision.