Changeset 378 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

Timestamp:

11/04/05 03:47:27 (19 years ago)

Author:

mattausch

Message:

 

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -24 +24 @@
 int BspTree::sTermMaxRays = -1;
 int BspTree::sMinPvsDif = 10;
+int BspTree::sMinPvs = 10;
+int BspTree::sMaxPvs = 500;
 
 float BspTree::sCt_div_ci = 1.0f;
@@ -349 +351 @@
         app << setprecision(4);
 
+        app << "#N_OVERALLPVS ( objects in PVS )\n" << pvs << endl;
+
         app << "#N_PMAXPVS ( largest PVS )\n" << maxPvs << endl;
 
@@ -1482 +1486 @@
         Vector3::sDistToleranceSqrt = Vector3::sDistTolerance * Vector3::sDistTolerance;
 
-        environment->GetIntValue("ViewCells.minPvsDif", sMinPvsDif);
+        // post processing stuff
+        environment->GetIntValue("ViewCells.PostProcessing.minPvsDif", sMinPvsDif);
+        environment->GetIntValue("ViewCells.PostProcessing.minPvs", sMinPvs);
+        environment->GetIntValue("ViewCells.PostProcessing.maxPvs", sMaxPvs);
 
     Debug << "BSP max depth: " << sTermMaxDepth << endl;
@@ -1814 +1821 @@
                 return false;
 
-        /*Debug << "merge (" << sMinPvsDif << ")" << endl;
-        Debug << "size f: " << fvc->GetPvs().GetSize() << ", "
-                  << "size b: " << bvc->GetPvs().GetSize() << endl;
-        
-        Debug << "diff f: " << fvc->GetPvs().Diff(bvc->GetPvs()) << ", "
-                  << "diff b: " << bvc->GetPvs().Diff(fvc->GetPvs()) << endl;*/
-
-    if ((fvc->GetPvs().Diff(bvc->GetPvs()) < sMinPvsDif) &&
-            (bvc->GetPvs().Diff(fvc->GetPvs()) < sMinPvsDif))
-                return true;
-
+        int fdiff = fvc->GetPvs().Diff(bvc->GetPvs());
+
+        if (fvc->GetPvs().GetSize() + fdiff < sMaxPvs)
+        {
+                if ((fvc->GetPvs().GetSize() < sMinPvs) ||      
+                        (bvc->GetPvs().GetSize() < sMinPvs) ||
+                        ((fdiff < sMinPvsDif) && (bvc->GetPvs().Diff(fvc->GetPvs()) < sMinPvsDif)))
+                {
+                        return true;
+                }
+        }
+        
         return false;
 }