Changeset 2113 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

02/12/07 08:37:26 (17 years ago)

Author:

mattausch

Message:

warning: debug version

File:

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

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

@@ -1023 +1023 @@
 
 ViewCellsManager *ViewCellsManager::LoadViewCells(const string &filename, 
-                                                                                                  ObjectContainer *objects,
+                                                                                                  ObjectContainer &pvsObjects,
+                                                                                                  ObjectContainer &preprocessorObjects,
                                                                                                   bool finalizeViewCells,
                                                                                                   BoundingBoxConverter *bconverter)
@@ -1032 +1033 @@
 
         const long startTime = GetTime();
-        bool success = parser.ParseViewCellsFile(filename, &vm, objects, bconverter);
-
-        cout<<"viewcells parsed "<<endl<<flush;
-        
-        if (success)
-        {
-                if (0)
-                {
-                        vm->ResetViewCells();
-                }
-                else
-                {
-                        //hack: should work with reset function
-                        ViewCellContainer leaves;
-
-                        vm->mViewCells.clear();
-                        vm->mViewCellsTree->CollectLeaves(vm->mViewCellsTree->GetRoot(), leaves);
-                
-                        ViewCellContainer::const_iterator it, it_end = leaves.end();
-
-                        for (it = leaves.begin(); it != it_end; ++ it)
-                        {
-                                vm->mViewCells.push_back(*it);
-                        }
-                }
-
-                vm->mViewCellsFinished = true;
-                vm->mMaxPvsSize = (int)objects->size();
-
-                
-                if (finalizeViewCells)
-                {
-                        // create the meshes and compute volumes
-                        const bool createMeshes = true;
-                        //const bool createMeshes = false;
-
-                        vm->FinalizeViewCells(createMeshes);
-                }
-
-                cout << (int)vm->mViewCells.size() << " view cells loaded in "
-                         << TimeDiff(startTime, GetTime()) * 1e-3f << " secs" << endl;
-
-                Debug << (int)vm->mViewCells.size() << " view cells loaded in "
-                          << TimeDiff(startTime, GetTime()) * 1e-3f << " secs" << endl;
-        }
-        else
+        const bool success = parser.ParseViewCellsFile(filename, 
+                                                                                                   &vm, 
+                                                                                                   pvsObjects, 
+                                                                                                   preprocessorObjects, 
+                                                                                                   bconverter);
+
+        if (!success)
         {
                 Debug << "Error: loading view cells failed!" << endl;
                 DEL_PTR(vm);
-        }
-
+
+                return NULL;
+        }
+        
+        //cout << "viewcells parsed " <<endl;
+
+        if (0)
+        {
+                vm->ResetViewCells();
+        }
+        else
+        {
+                //hack: should work with reset function
+                ViewCellContainer leaves;
+
+                vm->mViewCells.clear();
+                vm->mViewCellsTree->CollectLeaves(vm->mViewCellsTree->GetRoot(), leaves);
+                
+                ViewCellContainer::const_iterator it, it_end = leaves.end();
+
+                for (it = leaves.begin(); it != it_end; ++ it)
+                {
+                        vm->mViewCells.push_back(*it);
+                }
+        }
+
+        vm->mViewCellsFinished = true;
+        vm->mMaxPvsSize = (int)pvsObjects.size();
+
+        if (finalizeViewCells)
+        {
+                // create the meshes and compute volumes
+                const bool createMeshes = true;
+                //const bool createMeshes = false;
+
+                vm->FinalizeViewCells(createMeshes);
+        }
+
+        cout << (int)vm->mViewCells.size() << " view cells loaded in "
+                 << TimeDiff(startTime, GetTime()) * 1e-3f << " secs" << endl;
+
+        Debug << (int)vm->mViewCells.size() << " view cells loaded in "
+                  << TimeDiff(startTime, GetTime()) * 1e-3f << " secs" << endl;
+        
         return vm;
 }
@@ -6781 +6785 @@
 
 
-ViewCellsManager *VspOspViewCellsManager::LoadViewCells(const string &filename, 
-                                                                                                                ObjectContainer *objects,
-                                                                                                                const bool finalizeViewCells,
-                                                                                                                BoundingBoxConverter *bconverter)
-                                                                                                 
-{
-        ViewCellsManager *vm = 
-                ViewCellsManager::LoadViewCells(filename, objects, finalizeViewCells, bconverter);
-
-        return vm;
-}
-
-
-void
-VspOspViewCellsManager::CollectObjects(const AxisAlignedBox3 &box, ObjectContainer &objects)
+void VspOspViewCellsManager::CollectObjects(const AxisAlignedBox3 &box, 
+                                                                                        ObjectContainer &objects)
 {
         mHierarchyManager->CollectObjects(box, objects);