Changeset 1626 for GTP/trunk

Timestamp:

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

Author:

mattausch

Message:

added kd tree loading

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• HierarchyManager.cpp (modified) (1 diff)
• HierarchyManager.h (modified) (4 diffs)
• Preprocessor.cpp (modified) (1 diff)
• main.cpp (modified) (2 diffs)

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

@@ -273 +273 @@
 
 
-void HierarchyManager::ConstructInterleaved2(const VssRayContainer &sampleRays,                                                                                  
-                                                                                         const ObjectContainer &objects,
-                                                                                         AxisAlignedBox3 *forcedViewSpace)
+void HierarchyManager::ConstructInterleavedWithGradient(const VssRayContainer &sampleRays,                                                                                       
+                                                                                                                const ObjectContainer &objects,
+                                                                                                                AxisAlignedBox3 *forcedViewSpace)
 {
         mHierarchyStats.Reset();

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. 

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

@@ -817 +817 @@
 bool Preprocessor::InitRayCast(const string externKdTree, const string internkdtree)
 {
-        bool loadKdTree;
-        Environment::GetSingleton()->GetBoolValue("Preprocessor.loadKdTree", loadKdTree);
+        bool loadKdTree = true;
+        //Environment::GetSingleton()->GetBoolValue("Preprocessor.loadKdTree", loadKdTree);
+        
         
         if (!loadKdTree)
-        {       
+        {       /////////
                 //-- build new kd tree from scene geometry
+
                 BuildKdTree();
                 KdTreeStatistics(cout);

GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp

@@ -61 +61 @@
 
 
-
-
-string ReplaceSuffix(string filename,
-                                         string a,
-                                         string b)
-{
-  string result = filename;
-
-  int pos = (int)filename.rfind(a, (int)filename.size() - 1);
-  if (pos == filename.size() - a.size()) {
-        result.replace(pos, a.size(), b);
-  }
-  return result;
-}
+static string ReplaceSuffix(string filename, string a, string b)
+{
+        string result = filename;
+
+        int pos = (int)filename.rfind(a, (int)filename.size() - 1);
+        if (pos == filename.size() - a.size()) {
+                result.replace(pos, a.size(), b);
+        }
+        return result;
+}
+
+
+static string GetInternKdTreeName(string &filename)
+{
+        //Environment::GetSingleton()->GetStringValue("Preprocessor.kdTreeFilename", internKdTree);
+        
+        // hack! should take any extension
+    if (strstr(filename.c_str(), ".x3d")) 
+        {
+                return ReplaceSuffix(filename, ".x3d", ".kd");
+        } 
+        else if (strstr(filename.c_str(), ".dat"))
+        {
+                return ReplaceSuffix(filename, ".dat", ".kd");
+        } 
+        else if (strstr(filename.c_str(), ".obj"))
+        {
+                return ReplaceSuffix(filename, ".dat", ".kd");
+        }
+
+        cerr << "Error: Currently unsupported format for kd, filename " << filename << endl;
+
+        // return empty string
+        return string();
+}
+
 
 int
@@ -126 +148 @@
         }
 
-        string externKdTree = ReplaceSuffix(filename, ".obj", ".kdf");
-        char internKdTree[100];
-        Environment::GetSingleton()->GetStringValue("Preprocessor.kdTreeFilename", internKdTree);
-        //const string internKdTree = ReplaceSuffic(filename, ".x3d", ".kd");
+        const string externKdTree = ReplaceSuffix(filename, ".obj", ".kdf");
+        const string internKdTree = GetInternKdTreeName(filename);
 
         //-- initialize external ray casters