Changeset 577 for trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

Timestamp:

01/25/06 17:45:45 (18 years ago)

Author:

mattausch

Message:

fixed loading function: the view cell manager is chosen depending on
the type in the file. the view space box is saved with the file

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -417 +417 @@
                 vm->CastBeam(beam);
 
-                Debug << "found " << beam.mViewCells.size() << " view cells and " 
-                          << beam.mKdNodes.size() << " kd nodes" << endl;
+                Debug << "found " << (int)beam.mViewCells.size() << " view cells and " 
+                          << (int)beam.mKdNodes.size() << " kd nodes" << endl;
 
                 BeamSampleStatistics stats;
@@ -526 +526 @@
   {
         mViewSpaceBox = box;
-        mViewCellsManager->SetViewSpaceBox(*box);
   }
   else
   {
         mViewSpaceBox = NULL;
-        mViewCellsManager->SetViewSpaceBox(mKdTree->GetBox());
-  }
-  
+  }
+  
+  AxisAlignedBox3 vbox = mViewSpaceBox ? *mViewSpaceBox : mKdTree->GetBox();
+
   //-- load view cells from file if requested
-  if (mLoadViewCells)
-  {     
-          // load now because otherwise bounding box not correct
-          mViewCellsManager->LoadViewCells(mViewCellsFilename, &mObjects);
-  }
-  else
-  {
+  if (!mLoadViewCells)
+  {
+          mViewCellsManager->SetViewSpaceBox(vbox);
           // construct view cells using it's own set of samples
           mViewCellsManager->Construct(this);