Changeset 554 for trunk

Timestamp:

01/19/06 09:59:14 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

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

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -2073 +2073 @@
         // should maybe be done here to allow merge working with area or volume
         // and to correct the rendering statistics
-        if (1)
+        if (0)
         {
                 FinalizeViewCells(false);

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 >= mVssSamples))
+        if (!mViewCellsManager->ViewCellsConstructed() && 
+                (samples + mInitialSamples >= mViewCellsManager->GetConstructionSamples()))
         {
                 Debug << "samples " << samples << " initial " << mInitialSamples << " " << samples + mInitialSamples << endl;
                 VssRayContainer constructionRays;
-                vssTree->CollectRays(constructionRays, nSamples);
+                vssTree->CollectRays(constructionRays, mViewCellsManager->GetConstructionSamples());
 
                 Debug << "collected rays: " << constructionRays.size() << endl;
 
                 // test if we really have enough rays
-                if (constructionRays.size() >= nSamples)
-                        mViewCellsManager->Construct(mObjects, constructionRays);
+                //if (constructionRays.size() >= nSamples)
+                mViewCellsManager->Construct(mObjects, constructionRays);
         }
 
@@ -751 +749 @@
           VssRayContainer constructionRays;
 
-          vssTree->CollectRays(constructionRays);
+          vssTree->CollectRays(constructionRays, 
+                                                   mViewCellsManager->GetConstructionSamples());
           Debug << "collected rays: " << constructionRays.size() << endl;