Changeset 556 for trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp

Timestamp:

01/19/06 15:30:44 (18 years ago)

Author:

bittner

Message:

debug version looking for glrenderer bug...

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp

@@ -1030 +1030 @@
   //  if ( (int)(leaf->rays.size()) < termMinCost)
   //    stat.minCostNodes++;
-  if ( leaf->GetPvsSize() < termMinPvs)
+  if ( leaf->GetPvsSize() <= termMinPvs)
         stat.minPvsNodes++;
 
-  if ( leaf->GetPvsSize() < termMinRays)
+  if ( leaf->GetPvsSize() <= termMinRays)
         stat.minRaysNodes++;
 
@@ -1051 +1051 @@
 RssTree::TerminationCriteriaSatisfied(RssTreeLeaf *leaf)
 {
-  return ( (leaf->GetPvsSize() < termMinPvs) ||
-                   (leaf->rays.size() < termMinRays) ||
+  return ( (leaf->GetPvsSize() <= termMinPvs) ||
+                   (leaf->rays.size() <= termMinRays) ||
                    //                    (leaf->GetAvgRayContribution() > termMaxRayContribution ) ||
                    (leaf->depth >= termMaxDepth) ||
@@ -2081 +2081 @@
           ri++) {
         Intersectable *object = (*ri).GetObject();
-        if (object && !object->Mailed()) {
-          object->Mail();
-          pvs.push_back(object);
-          if (exporter)
-                exporter->ExportIntersectable(object);
-        }
-  }
-
+        if (object) {
+          if (!object->Mailed()) {
+                object->Mail();
+                object->mCounter = 1;
+                pvs.push_back(object);
+                if (exporter)
+                  exporter->ExportIntersectable(object);
+          } else {
+                object->mCounter++;
+          }
+        }
+  }
+  // sort objects based on their mCounter
+  sort(pvs.begin(), pvs.end(), Intersectable::GreaterCounter);
+  
   float extendedConvexCombinationProb = 0.0f; //0.7f
-  float silhouetteCheckPercentage = 0.0f; //0.5f
+  float silhouetteCheckPercentage = 0.5f; //0.5f
   for (int i=0; generated < numberOfRays && i < numberOfTries; i++) {
         bool useExtendedConvexCombination = ((nrays >= 2) && (Random(1.0f) <
@@ -2179 +2186 @@
                   oi++) {
                 Intersectable *object = *oi;
-                
                 if ( object->CastRay(traversalRay) ) {
                   intersects = true;
@@ -2197 +2203 @@
   
   //  cout<<"desired="<<numberOfRays<<" tries="<<i<<endl;
-  // assign probabilitites to the generated rays
-  float p = (box.GetVolume()*dirBox.GetVolume())/generated;
+  // assign pdfs to the generated rays
+  float p = (box.GetVolume()*dirBox.GetVolume())/i;
   for (i=startIndex; i < rays.size(); i++) {
-        rays[i].mProbability = p;
-        rays.mSumProbabilities += p;
+        rays[i].mPdf = p;
+        rays.mSumPdf += p;
   }