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

Timestamp:

01/20/06 22:32:51 (18 years ago)

Author:

mattausch

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -26 +26 @@
 mTotalArea(0.0f),
 mViewCellsFinished(false),
-mMaxPvsSize(99999),
+mMaxPvsSize(9999999),
+mMinPvsSize(1), // only empty view cells are invalid
 mMaxPvsRatio(1.0)
 {
@@ -39 +40 @@
 mPostProcessSamples(0),
 mVisualizationSamples(0),
-mViewCellsFinished(false)
+mTotalAreaValid(false),
+mTotalArea(0.0f),
+mViewCellsFinished(false),
+mMaxPvsSize(9999999),
+mMinPvsSize(1), // only empty view cells are invalid
+mMaxPvsRatio(1.0)
 {
         mViewSpaceBox.Initialize();
@@ -111 +117 @@
 
 bool ViewCellsManager::CheckValidity(ViewCell *vc, 
-                                                                         float minPvsRatio, 
-                                                                         float maxPvsRatio) const
-{
-        if ((vc->GetPvs().GetSize() > mMaxPvsSize * maxPvsRatio) ||
-                (vc->GetPvs().GetSize() < mMaxPvsSize * minPvsRatio))
+                                                                         int minPvsSize, 
+                                                                         int maxPvsSize) const
+{
+        if ((vc->GetPvs().GetSize() > mMaxPvsSize) ||
+                (vc->GetPvs().GetSize() < mMinPvsSize))
         {       
                 return false;
@@ -121 +127 @@
 
         return true;
+}
+
+
+void ViewCellsManager::SetValidity(ViewCell *vc, 
+                                                                   int minPvs, 
+                                                                   int maxPvs) const
+{
+        vc->SetValid(CheckValidity(vc, minPvs, maxPvs));
 }
 
@@ -427 +441 @@
 
 
+int ViewCellsManager::GetMinPvsSize() const
+{
+        return mMinPvsSize;
+}
+
+
+
 float ViewCellsManager::GetMaxPvsRatio() const
 {
@@ -442 +463 @@
         // matt TODO: remove this!!
         Ray hray(ray);
+        //static Ray hray;
+        //hray.Init(ray.GetOrigin(), ray.GetDir(), Ray::LINE_SEGMENT);
+        
         float tmin = 0, tmax = 1.0;
 
-        //hray.Init(ray.GetOrigin(), ray.GetDir(), Ray::LINE_SEGMENT);
         if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
                 return;
@@ -451 +474 @@
         Vector3 termination = hray.Extrap(tmax);
 
-        CastLineSegment(origin,
-                                        termination,
-                                        viewcells);
+        CastLineSegment(origin, termination, viewcells);
         //Debug << "constribution: " << (int)viewcells.size() << endl;
         // copy viewcells memory efficiently
@@ -2373 +2394 @@
                                                                                  ViewCell *vc) const
 {
-        if (CheckValidity(vc, 0.0, mMaxPvsRatio) && (mColorCode == 0)) // Random color
+        if (CheckValidity(vc, mMinPvsSize, mMaxPvsSize) && (mColorCode == 0)) // Random color
                 return;
 
@@ -2406 +2427 @@
         }
 
-        m.mDiffuseColor.b = CheckValidity(vc, 0.0, mMaxPvsRatio) ? 1.0f : 0.0f;
+        m.mDiffuseColor.b = CheckValidity(vc, mMinPvsSize, mMaxPvsSize) ? 1.0f : 0.0f;
         m.mDiffuseColor.r = importance;
         m.mDiffuseColor.g = 1.0f - m.mDiffuseColor.r;
@@ -2488 +2509 @@
         
         mViewCellsFinished = true;
+        mMaxPvsSize = (int)objects->size();
 
         FinalizeViewCells(true);
-
+        
         Debug << (int)mViewCells.size() << " view cells loaded" << endl;