Changeset 1626 for GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp

Timestamp:

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

Author:

mattausch

Message:

added kd tree loading

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/main.cpp (modified) (2 diffs)

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