Changeset 518 for trunk

Timestamp:

01/11/06 18:28:37 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Preprocessor.cpp (modified) (1 diff)
• Preprocessor.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (3 diffs)
• VssPreprocessor.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

@@ -248 +248 @@
 
         //-- parse view cells construction method
-        bool loadViewCells = false;
-        environment->GetBoolValue("ViewCells.loadFromFile", loadViewCells);
-
-        //-- load view cells from file if requested
-        if (loadViewCells)
-        {
-                char buff[100];
-                environment->GetStringValue("ViewCells.filename", buff);
-                string vcFilename(buff);
-                mViewCellsManager->LoadViewCells(vcFilename, &mObjects);
-        }
-
-
+        environment->GetBoolValue("ViewCells.loadFromFile", mLoadViewCells);
+
+        
         if (mUseGlRenderer)
           renderer = new GlRendererBuffer(1024, 768, mSceneGraph, mViewCellsManager);

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.h

@@ -126 +126 @@
   bool mUseGlRenderer;
   
+  bool mLoadViewCells;
+
 protected:
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -100 +100 @@
 void ViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays)
 {
+        Debug << "here2" << endl;
         // view cells not yet constructed
         if (!ViewCellsConstructed())
                 return;
+        Debug << "here " << rays.size() << endl;
 
         VssRayContainer::const_iterator it, it_end = rays.end();
@@ -342 +344 @@
   Ray hray(ray);
   float tmin = 0, tmax = 1.0;
-
+Debug << "here3" << endl;
   //hray.Init(ray.GetOrigin(), ray.GetDir(), Ray::LINE_SEGMENT);
   if (!GetSceneBbox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
@@ -353 +355 @@
                                   termination,
                                   viewcells);
-  //Debug << "constribution: " << (int)viewcells.size() << endl;
+  Debug << "constribution: " << (int)viewcells.size() << endl;
   // copy viewcells memory efficiently
   const bool storeViewcells = false;

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -401 +401 @@
         mViewCellsManager->SetViewSpaceBox(mKdTree->GetBox());
   }
+
+  //-- load view cells from file if requested
+  if (mLoadViewCells)
+  {
+          char buff[100];
+          environment->GetStringValue("ViewCells.filename", buff);
+          string vcFilename(buff);
+          mViewCellsManager->LoadViewCells(vcFilename, &mObjects);
+  }
+
+
   VssTree *vssTree = NULL;
 
@@ -497 +508 @@
         ExportRays(filename, mVssRays, numExportRays);
   }
+
+  /// compute view cell contribution of rays if view cells manager already constructed
+  mViewCellsManager->ComputeSampleContributions(mVssRays);
 
   // construct view cells