Changeset 547 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

Timestamp:

01/17/06 23:28:10 (18 years ago)

Author:

mattausch

Message:

 

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (13 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -25 +25 @@
 mTotalAreaValid(false),
 mTotalArea(0.0f),
-mViewCellsFinished(false)
+mViewCellsFinished(false),
+mMaxPvsSize(99999)
 {
         mViewSpaceBox.Initialize();
@@ -49 +50 @@
         environment->GetBoolValue("ViewCells.Visualization.exportRays", mExportRays);
         environment->GetBoolValue("ViewCells.Visualization.exportGeometry", mExportGeometry);
+        environment->GetFloatValue("ViewCells.maxPvsRatio", mMaxPvsRatio);
 
         char buf[50];
@@ -105 +107 @@
         return (int)rays.size();
 }
+
+
+bool ViewCellsManager::CheckValid(ViewCell *vc) const
+{
+        if (vc->GetPvs().GetSize() > mMaxPvsSize)
+                return false;
+
+        return true;
+}
+
 
 bool ViewCellsManager::LoadViewCells(const string filename, ObjectContainer *objects)
@@ -347 +359 @@
 }
 
+
 ViewCellContainer &ViewCellsManager::GetViewCells()
 {
@@ -375 +388 @@
         // has to be recomputed
         mTotalAreaValid = false;
+}
+
+
+int ViewCellsManager::GetMaxPvsSize() const
+{
+        return mMaxPvsSize;
 }
 
@@ -1797 +1816 @@
 float VspBspViewCellsManager::GetProbability(ViewCell *viewCell)
 {
-#if 0
-        return GetArea(viewCell) / GetViewSpaceBox().SurfaceArea();
-#else
-        return GetArea(viewCell) / GetAccVcArea();
-#endif
+        if (mVspBspTree->mUseAreaForPvs)
+                return GetArea(viewCell) / GetAccVcArea();
+        else
+                return GetVolume(viewCell) / mViewSpaceBox.GetVolume();
 }
 
@@ -1807 +1825 @@
 void VspBspViewCellsManager::CollectViewCells()
 {
-        mVspBspTree->CollectViewCells(mViewCells);
+        mVspBspTree->CollectViewCells(mViewCells, false);
 }
 
@@ -1852 +1870 @@
         Debug << "saved rays: " << (int)savedRays.size() << endl;
 
+        mMaxPvsSize = (int)(mMaxPvsRatio * (float)objects.size());
+        
         mVspBspTree->Construct(constructionRays, &mViewSpaceBox);
 
@@ -1929 +1949 @@
 
         // TODO: should be done BEFORE the ray casting
-        merged = mVspBspTree->MergeViewCells(rays);
+        merged = mVspBspTree->MergeViewCells(rays, objects);
 
         //-- stats and visualizations
@@ -2300 +2320 @@
                                                                                  ViewCell *vc) const
 {
-        if (mColorCode == 0) // Random color
+        if (CheckValid(vc) && (mColorCode == 0)) // Random color
                 return;
 
         float importance = 0;
-
+        
+        Material m;
+        
         switch (mColorCode)
         {
@@ -2319 +2341 @@
                         importance = (float)bspVc->mLeaves.size() /
                                 (float)mViewCellsStats.maxLeaves;
+
+                        if (CheckValid(vc))
+                                m.mDiffuseColor.b = 1.0f;
+                        m.mDiffuseColor.r = importance;
+                        m.mDiffuseColor.g = 1.0f - m.mDiffuseColor.r;
                 }
                 break;
@@ -2325 +2352 @@
                         importance = (float)GetMaxTreeDiff(vc) /
                                 (float)(mVspBspTree->GetStatistics().maxDepth * 2);
+
+                        if (CheckValid(vc))
+                                m.mDiffuseColor.b = 1.0f;
+                        m.mDiffuseColor.r = importance;
+                        m.mDiffuseColor.g = 1.0f - m.mDiffuseColor.r;
                 }
                 break;
@@ -2331 +2363 @@
         }
 
-        Material m;
-        m.mDiffuseColor.b = 1.0f;
+        m.mDiffuseColor.b = CheckValid(vc) ? 1.0f : 0.0f;
         m.mDiffuseColor.r = importance;
         m.mDiffuseColor.g = 1.0f - m.mDiffuseColor.r;
+
         //Debug << "importance: " << importance << endl;
         exporter->SetForcedMaterial(m);