Changeset 552

Timestamp:

01/19/06 02:35:58 (18 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (1 diff)
• src/VssPreprocessor.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -30 +30 @@
         samplesPerPass  100000
         initialSamples 300000
-        vssSamples 1500000
+        vssSamples 1800000
         vssSamplesPerPass 100000
         useImportanceSampling true

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -2071 +2071 @@
         Debug << "\nview cell partition after sampling:\n" << mViewCellsStats << endl << endl;
 
-
+        // should maybe be done here to allow merge working with area or volume
+        // and to correct the rendering statistics
         if (1)
         {

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -704 +704 @@
         cout<<"Average PVS size = "<<avgPvs<<endl;
 
+        const int nSamples = mViewCellsManager->GetConstructionSamples();
+
         //Debug << "samples: " << samples << " construction samples " << mViewCellsManager->GetConstructionSamples() << endl;
         // construct view cells after vss
         if (!mViewCellsManager->ViewCellsConstructed() &&
-                (samples + mInitialSamples >  mViewCellsManager->GetConstructionSamples()))
+                ((samples + mInitialSamples > nSamples)  || (samples >= mVssSamples)))
         {
+                Debug << "samples " << samples << " initial " << mInitialSamples << " " << samples + mInitialSamples << endl;
                 VssRayContainer constructionRays;
-                vssTree->CollectRays(constructionRays, 
-                                                         mViewCellsManager->GetConstructionSamples());
-                mViewCellsManager->Construct(mObjects, constructionRays);
+                vssTree->CollectRays(constructionRays, nSamples);
+
+                Debug << "collected rays: " << constructionRays.size() << endl;
+
+                // test if we really have enough rays
+                if ((samples >= mVssSamples) || (constructionRays.size() >= nSamples))
+                        mViewCellsManager->Construct(mObjects, constructionRays);
         }
 
@@ -739 +746 @@
   }
 
+
   Debug << vssTree->stat << endl;
   VssRayContainer viewCellRays;