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

Timestamp:

01/23/06 15:58:00 (18 years ago)

Author:

bittner

Message:

viewcell validy setting functions extended

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -124 +124 @@
                                                                          int maxPvsSize) const
 {
-        if ((vc->GetPvs().GetSize() > mMaxPvsSize) ||
-                (vc->GetPvs().GetSize() < mMinPvsSize))
-        {
-                return false;
-        }
-
-        return true;
+
+  if ((vc->GetPvs().GetSize() > maxPvsSize) ||
+          (vc->GetPvs().GetSize() < minPvsSize))
+        {
+          return false;
+        }
+  
+  return true;
 }
 
@@ -141 +142 @@
 }
 
+void
+ViewCellsManager::SetValidity(
+                                                          int minPvsSize, 
+                                                          int maxPvsSize) const
+{
+  ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+  
+  for (it = mViewCells.begin(); it != it_end; ++ it) {
+        SetValidity(*it, minPvsSize, maxPvsSize);
+  }
+}
+
+void
+ViewCellsManager::SetValidityPercentage(
+                                                                                const float minValid,
+                                                                                const float maxValid
+                                                                                )
+{
+  sort(mViewCells.begin(), mViewCells.end(), ViewCell::SmallerPvs);
+  
+  int start = mViewCells.size()*minValid;
+  int end = mViewCells.size()*maxValid;
+  
+  for (int i=0; i < mViewCells.size(); i++)
+        mViewCells[i]->SetValid(i >= start && i <= end);
+}
+
+int
+ViewCellsManager::CountValidViewcells() const
+{
+  ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+  int valid = 0;
+  for (it = mViewCells.begin(); it != it_end; ++ it) {
+        if ((*it)->GetValid())
+          valid++;
+  }
+  return valid;
+}
 
 bool ViewCellsManager::LoadViewCells(const string filename, ObjectContainer *objects)
@@ -171 +210 @@
 bool ViewCellsManager::ViewPointValid(const Vector3 &viewPoint) const
 {
+  if (!ViewCellsConstructed())
         return mViewSpaceBox.IsInside(viewPoint);
+  else {
+        if (!mViewSpaceBox.IsInside(viewPoint))
+          return false;
+        ViewCell *viewcell = GetViewCell(viewPoint);
+        if (!viewcell || !viewcell->GetValid())
+          return false;
+  }
+  return true;
 }
 
@@ -487 +535 @@
   for (it = viewcells->begin(); it != viewcells->end(); ++it) {
         ViewCell *viewcell = *it;
-        // if ray not outside of view space
-        viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+        if (viewcell->GetValid()) {
+          // if ray not outside of view space
+          viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+        }
   }
 }
@@ -526 +576 @@
   if (storeViewcells)
   {
-          ray.mViewCells.reserve(viewcells.size());
-          ray.mViewCells = viewcells;
-          }
+        ray.mViewCells.reserve(viewcells.size());
+        ray.mViewCells = viewcells;
+  }
 
   ViewCellContainer::const_iterator it = viewcells.begin();
@@ -535 +585 @@
   for (; it != viewcells.end(); ++it) {
         ViewCell *viewcell = *it;
-        // if ray not outside of view space
-        float contribution;
-        if (viewcell->GetPvs().GetSampleContribution(ray.mTerminationObject,
-                                                                                                 ray.mPdf,
-                                                                                                 contribution
-                                                                                                 ))
-          ray.mPvsContribution++;
-        ray.mRelativePvsContribution += contribution;
+        if (viewcell->GetValid()) {
+          // if ray not outside of view space
+          float contribution;
+          if (viewcell->GetPvs().GetSampleContribution(ray.mTerminationObject,
+                                                                                                   ray.mPdf,
+                                                                                                   contribution
+                                                                                                   ))
+                ray.mPvsContribution++;
+          ray.mRelativePvsContribution += contribution;
+        }
   }
 
@@ -548 +600 @@
         for (it = viewcells.begin(); it != viewcells.end(); ++it) {
           ViewCell *viewcell = *it;
-          // if ray not outside of view space
-          viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
-        }
-
+          if (viewcell->GetValid()) {
+                // if ray not outside of view space
+                viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+          }
+        }
+  
   return ray.mRelativePvsContribution;
 }
@@ -1179 +1233 @@
 
 
-ViewCell *BspViewCellsManager::GetViewCell(const Vector3 &point)
+ViewCell *BspViewCellsManager::GetViewCell(const Vector3 &point) const
 {
   if (!mBspTree)
@@ -1880 +1934 @@
 }
 
+
+
 int VspBspViewCellsManager::Construct(const ObjectContainer &objects,
                                                                           const VssRayContainer &rays)
@@ -2209 +2265 @@
 bool VspBspViewCellsManager::ViewPointValid(const Vector3 &viewPoint) const
 {
-        return mViewSpaceBox.IsInside(viewPoint) &&
-                   mVspBspTree->ViewPointValid(viewPoint);
+  // $$JB -> implemented in viewcellsmanager (slower, but allows dynamic
+  // validy update in preprocessor for all managers)
+  return ViewCellsManager::ViewPointValid(viewPoint);
+  
+  //    return mViewSpaceBox.IsInside(viewPoint) &&
+  //               mVspBspTree->ViewPointValid(viewPoint);
 }
 
@@ -2518 +2578 @@
 
 
-ViewCell *VspBspViewCellsManager::GetViewCell(const Vector3 &point)
+ViewCell *VspBspViewCellsManager::GetViewCell(const Vector3 &point) const
 {
         if (!mVspBspTree)