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

Timestamp:

05/18/08 00:30:13 (16 years ago)

Author:

mattausch

Message:

fixed several problems

File:

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

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

@@ -59 +59 @@
 
 
+static string GetViewPointsListName(const string &filename)
+{
+        string viewCellPointsFile;
+
+        char buff[200];
+        Environment::GetSingleton()->GetStringValue("ViewCells.randomViewPointsList", buff);
+
+        string vpList(buff);
+
+        if (vpList == "")
+        {
+                // if not specified, take file that has same prefix as scene file
+                if (strstr(filename.c_str(), ".obj"))
+                        viewCellPointsFile = ReplaceSuffix(filename, ".obj", ".vc");
+                else if (strstr(filename.c_str(), ".dat"))
+                        viewCellPointsFile = ReplaceSuffix(filename, ".dat", ".vc");
+                else if (strstr(filename.c_str(), ".x3d"))
+                        viewCellPointsFile = ReplaceSuffix(filename, ".x3d", ".vc");
+        }
+        else
+        {
+                viewCellPointsFile = vpList;
+        }
+
+        return viewCellPointsFile;
+}
+
 
 void Cleanup()
@@ -240 +267 @@
                 cout << "view cells successfully loaded" << endl;
 
-        string viewCellPointsFile;
-
-        if (strstr(filename.c_str(), ".obj"))
-                viewCellPointsFile = ReplaceSuffix(filename, ".obj", ".vc");
-        else if (strstr(filename.c_str(), ".dat"))
-                viewCellPointsFile = ReplaceSuffix(filename, ".dat", ".vc");
-        else if (strstr(filename.c_str(), ".x3d"))
-                viewCellPointsFile = ReplaceSuffix(filename, ".x3d", ".vc");
+
+        const string viewCellPointsFile = GetViewPointsListName(filename);
 
         bool importRandomViewCells;
-        Environment::GetSingleton()->GetBoolValue("ViewCells.importRandomViewCells",
-                importRandomViewCells);
+        Environment::GetSingleton()->GetBoolValue("ViewCells.importRandomViewCells", importRandomViewCells);
 
         if (importRandomViewCells)
         {
-                cout << "importing random view cells" << endl;
+                cout << "importing random view points" << endl;
+
                 if (preprocessor->mViewCellsManager->ImportViewCellsList(viewCellPointsFile))
                         cout << "successfully loaded " << viewCellPointsFile << endl;
                 else
-                        cerr << "error: file << " << viewCellPointsFile << " not found, generating random view points!" << endl;
+                        cerr << "error: file << " << viewCellPointsFile << " not found" << endl;
         }
 
@@ -369 +390 @@
                         //rendererWidget->SetWindowTitle("Global Visualization");
 
-                        if (1) // not working with vbo
+                        if (0 && !rendererWidget->GetUseVbos()) // viewer not working with vbo
                         {
                                 cout << "starting the qt viewer" << endl;