Changeset 452 for trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

Timestamp:

12/05/05 20:33:53 (19 years ago)

Author:

mattausch

Message:

started to add view cell merging to vsp kd tree

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -390 +390 @@
                 delete exporter;
         }
-
-        //-- post process view cells
+        
+        // construct view cells if not already constructed
+        if (!mViewCellsManager->ViewCellsConstructed())
+                mViewCellsManager->Construct(objects, mVssSampleRays);
+
         mViewCellsManager->PostProcess(objects, mSampleRays);
-                
-
+        
         //-- several visualizations and statistics
-                 
+        Debug << "===== Final view cells statistics ==========" << endl;
+
+        mViewCellsManager->PrintStatistics(Debug);
+
         //-- render simulation after merge
         cout << "\nevaluating bsp view cells render time after merge ... ";
@@ -406 +411 @@
         Debug << ss << endl;
         
-
         mViewCellsManager->Visualize(objects, mSampleRays);     
     
@@ -423 +427 @@
         if (!mViewCellsManager->ViewCellsConstructed())
         {
-                RayContainer::const_iterator it, it_end = newRays.end();
-
-                if ((int)mVssSampleRays.size() < 
-                        mViewCellsManager->GetConstructionSamples())
+                if ((int)mVssSampleRays.size() < mViewCellsManager->GetConstructionSamples())
                 {
+                        RayContainer::const_iterator it, it_end = newRays.end();
+
                         for (it = newRays.begin(); it != it_end; ++ it)
-                        {
                                 mVssSampleRays.push_back(new VssRay(*(*it)));
-                        }
                 }
                 else
@@ -443 +444 @@
         }
         // Need rays (with ordered intersections) for post processing => collect new rays
-        else if (((int)mSampleRays.size() < mViewCellsManager->GetPostProcessSamples()) ||
-                         ((int)mSampleRays.size() < mViewCellsManager->GetVisualizationSamples()))
+        if (((int)mSampleRays.size() < mViewCellsManager->GetPostProcessSamples()) ||
+            ((int)mSampleRays.size() < mViewCellsManager->GetVisualizationSamples()))
         {
                 RayContainer::const_iterator it, it_end = newRays.end();