Changeset 577 for trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.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/RssPreprocessor.cpp (modified) (3 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -467 +467 @@
 
   mViewSpaceBox = NULL;
-  mViewCellsManager->SetViewSpaceBox(mKdTree->GetBox());
-  
-  
-  //-- load view cells from file if requested
-  if (mLoadViewCells) { 
-        // load now because otherwise bounding box not correct
-        mViewCellsManager->LoadViewCells(mViewCellsFilename, &mObjects);
-        // $$JB tmp make all viewcelss valid
-        mViewCellsManager->SetValidity(0, 9999999999); 
-
-  }
-  else
-  {
+
+  // if not already loaded, construct view cells from file
+  if (!mLoadViewCells) {        
+        
+          mViewCellsManager->SetViewSpaceBox(mKdTree->GetBox());
+
           // construct view cells using it's own set of samples
           mViewCellsManager->Construct(this);
@@ -487 +480 @@
           mViewCellsManager->PrintStatistics(Debug);
   }
-  
+
+
   int rssPass = 0;
   int rssSamples = 0;
@@ -515 +509 @@
   
   if (mExportRays) {
+        
         char filename[64];
         sprintf(filename, "rss-rays-initial.x3d");
         ExportRays(filename, mVssRays, mExportNumRays);
+        
   }