Changeset 2115 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

02/12/07 19:00:37 (17 years ago)

Author:

mattausch

Message:

changed pvs loading: loading objects in a first pass

File:

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

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

@@ -22 +22 @@
 #include "InternalRayCaster.h"
 #include "GlobalLinesRenderer.h"
+#include "ObjectsParser.h"
 
 
@@ -730 +731 @@
         if (mLoadViewCells)
         {       
-                Environment::GetSingleton()->GetStringValue("ViewCells.filename", buf);
-                cout << "loading view cells from " << buf << endl<<flush;
+        Environment::GetSingleton()->GetStringValue("ViewCells.filename", buf);
+                
+                cout << "loading objects from " << buf << endl;
+
+                // load objects which will be used as pvs entries
+                ObjectContainer pvsObjects;
+
+                LoadObjects(buf, pvsObjects, mObjects);
+
+                cout << "loading view cells from " << buf << endl;
 
                 mViewCellsManager = ViewCellsManager::LoadViewCells(buf, 
-                                                                                                                        mObjects, 
+                                                                                                                        pvsObjects,
                                                                                                                         mObjects, 
                                                                                                                         true, 
@@ -1626 +1635 @@
 
 
-}
+bool Preprocessor::LoadObjects(const string &filename,
+                                                           ObjectContainer &pvsObjects, 
+                                                           const ObjectContainer &preprocessorObjects)
+{
+        ObjectsParser parser;
+
+        const bool success = parser.ParseObjects(filename, 
+                                                                                         pvsObjects, 
+                                                                                         preprocessorObjects);
+
+        if (!success)
+        {
+                Debug << "Error: loading objects failed!" << endl;
+        }
+
+        // hack: no bvh object could be found => take preprocessor objects
+        if (!pvsObjects.empty())
+        {
+                pvsObjects = preprocessorObjects;
+        }
+
+        return success;
+}
+
+
+}