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

Timestamp:

01/23/06 10:10:34 (18 years ago)

Author:

bittner

Message:

rss preprocessor simplification - mixed sampling strategies

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp

@@ -2097 +2097 @@
   
   float extendedConvexCombinationProb = 0.0f; //0.7f
-  float silhouetteCheckPercentage = 0.0f; //0.5f
+  float silhouetteCheckPercentage = 1.0f; //0.5f
   for (int i=0; generated < numberOfRays && i < numberOfTries; i++) {
         bool useExtendedConvexCombination = ((nrays >= 2) && (Random(1.0f) <
@@ -2178 +2178 @@
                 selectedRays.push_back(ray);
           }
-
+          
           // check whether the ray does not intersect already visible objects
           Ray traversalRay;
@@ -2186 +2186 @@
                   oi++) {
                 Intersectable *object = *oi;
+                // do not test every object
+                if (Random(1.0f) > 0.5f)
+                  break;
                 if ( object->CastRay(traversalRay) ) {
                   intersects = true;
@@ -2322 +2325 @@
                                    )
 {
-  bool globalPrunning = false;
+  bool globalPrunning = true;
 
   stack<RssTreeNode *> tstack;
@@ -2369 +2372 @@
           if (node->IsLeaf()) {
                 RssTreeLeaf *leaf = (RssTreeLeaf *)node;
-                //              prunned += PruneRaysRandom(leaf, ratio);
+                // prunned += PruneRaysRandom(leaf, ratio);
                 prunned += PruneRaysContribution(leaf, ratio);
           } else {
@@ -2474 +2477 @@
 // if small very high importance of the last sample
 // if 1.0f then weighs = 1 1/2 1/3 1/4
-float passSampleWeightDecay = 0.5f;
+float passSampleWeightDecay = 1.0f;
 
 void
@@ -2503 +2506 @@
           break;
         default:
-          weight = 0.01f;
+          weight = 0.0f;
           break;
           //    case 1: