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

Timestamp:

10/18/06 01:49:50 (18 years ago)

Author:

mattausch

Message:

multiple path support for kd

File:

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

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

@@ -20 +20 @@
 #include "MeshKdTree.h"
 #include "Preprocessor.h"
-
+#include "common.h"
 
 #include "PreprocessorThread.h"
@@ -73 +73 @@
 
 
-static string GetInternKdTreeName(string &filename)
-{
-        //Environment::GetSingleton()->GetStringValue("Preprocessor.kdTreeFilename", internKdTree);
-        string suffix;
-
-        if (preprocessor->mLoadMeshes)
-        {
-                suffix = ".kdm";        
-        }
-        else
-        {
-                suffix = ".kdt";
-        }
-
-        // hack! should take any extension
-    if (strstr(filename.c_str(), ".x3d")) 
-        {
-                return ReplaceSuffix(filename, ".x3d", suffix);
-        } 
-        else if (strstr(filename.c_str(), ".dat"))
-        {
-                return ReplaceSuffix(filename, ".dat", suffix);
-        } 
-        else if (strstr(filename.c_str(), ".obj"))
-        {
-                return ReplaceSuffix(filename, ".dat", suffix);
-        }
-
-        cerr << "Error: Currently unsupported format for kd, filename " << filename << endl;
-
-        // return empty string
-        return string();
+static int SplitFilenames(const string str, vector<string> &filenames)
+{
+        int pos = 0;
+
+        while(1) {
+                int npos = (int)str.find(';', pos);
+                
+                if (npos < 0 || npos - pos < 1)
+                        break;
+                filenames.push_back(string(str, pos, npos - pos));
+                pos = npos + 1;
+        }
+        
+        filenames.push_back(string(str, pos, str.size() - pos));
+        return (int)filenames.size();
+}
+
+
+static string GetInternKdTreeName(const string &filename)
+{
+        vector<string> filenames;
+        const int files = SplitFilenames(filename, filenames);
+
+        vector<string>::const_iterator sit, sit_end = filenames.end();
+        string kdFilename;
+
+        int i = 0;
+        for (sit = filenames.begin(); sit != sit_end; ++ sit, ++ i)
+        {
+                string currentFile = *sit;
+                //cout << "here6 " << currentFile << endl;
+                string strippedFilename;
+
+                if (i == 0)
+                {       
+                        strippedFilename = currentFile;
+                }
+                else
+                {
+                        strippedFilename = string(StripPath(currentFile.c_str()));
+                }
+                
+                string suffix("_");
+
+                if (i == (int)filenames.size() - 1)
+                {
+                        if (preprocessor->mLoadMeshes)
+                        {
+                                suffix = ".kdm";        
+                        }
+                        else
+                        {
+                                suffix = ".kdt";
+                        }
+                }
+
+                if (strstr(strippedFilename.c_str(), ".x3d")) 
+                {
+                        kdFilename += ReplaceSuffix(strippedFilename, ".x3d", suffix);
+                }
+        else if (strstr(strippedFilename.c_str(), ".dat"))
+                {
+                        kdFilename += ReplaceSuffix(strippedFilename, ".dat", suffix);
+                } 
+                else if (strstr(strippedFilename.c_str(), ".obj"))
+                {
+                        kdFilename += ReplaceSuffix(strippedFilename, ".dat", suffix);
+                }
+                else
+                {
+                        cerr << "Error: Currently unsupported format for kd, filename " << currentFile << endl;
+                }
+        }
+
+        //cout << "kdfilename: " << kdFilename << endl;
+        return kdFilename;
 }
 
@@ -150 +194 @@
         Environment::GetSingleton()->GetStringValue("Scene.filename", buff);
         string filename(buff);
+        const string dummyname = GetInternKdTreeName(filename);
 
         if (!preprocessor->LoadScene(filename))