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

Timestamp:

12/14/05 15:25:44 (19 years ago)

Author:

bittner

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp

@@ -121 +121 @@
   environment->GetBoolValue("RssTree.randomize", randomize);
   environment->GetBoolValue("RssTree.splitUseOnlyDrivingAxis", mSplitUseOnlyDrivingAxis);
-  environment->GetBoolValue("RssTree.useRss", mUseRss);
 
   environment->GetBoolValue("RssTree.interleaveDirSplits", mInterleaveDirSplits);
@@ -292 +291 @@
   dirBBox.Initialize();
 
-  if (mUseRss)
-        forcedBoundingBox = NULL;
 
   mForcedBoundingBox = forcedBoundingBox;
@@ -990 +987 @@
                    //                    (leaf->GetAvgRayContribution() > termMaxRayContribution ) ||
                    (leaf->depth >= termMaxDepth) ||
-                   (SqrMagnitude(GetBBox(leaf).Size()) <= termMinSize) ||
-                   (mUseRss && leaf->mPassingRays == leaf->rays.size())
+                   (SqrMagnitude(GetBBox(leaf).Size()) <= termMinSize) 
                    );
 }
@@ -1769 +1765 @@
 
 void
+RssTree::PickEdgeRays(RssTreeLeaf *leaf,
+                                          int &r1,
+                                          int &r2
+                                          )
+{
+  int nrays = leaf->rays.size();
+
+  if (nrays == 2) {
+        r1 = 0;
+        r2 = 1;
+        return;
+  }
+  
+  int tries = min(20, nrays);
+
+  while (--tries) {
+        r1 = Random(nrays);
+        r2 = Random(nrays);
+        if (leaf->rays[r1].mRay->mTerminationObject != leaf->rays[r2].mRay->mTerminationObject)
+          break;
+  }
+
+  if (r1 == r2)
+        r2 = (r1+1)%leaf->rays.size();
+}
+
+
+void
 RssTree::GenerateLeafRays(RssTreeLeaf *leaf,
                                                   const int numberOfRays,
@@ -1776 +1800 @@
   int nrays = leaf->rays.size();
   for (int i=0; i < numberOfRays; i++) {
-        bool useExtendedConvexCombination = (nrays >= 3) && (i > numberOfRays/2);
+        bool useExtendedConvexCombination = (nrays >= 2) && (i > numberOfRays/2);
 
                 
@@ -1783 +1807 @@
         if (useExtendedConvexCombination) {
           // pickup 3 random rays
-          int r1 = Random(nrays);
-          int r2 = Random(nrays);
-          int r3 = Random(nrays);
+          int r1, r2;
+          PickEdgeRays(leaf, r1, r2);
           
           Vector3 o1 = leaf->rays[r1].GetOrigin();
-          
           Vector3 o2 = leaf->rays[r2].GetOrigin();
           
-          Vector3 o3 = leaf->rays[r3].GetOrigin();
-          
-          const float overlap = 0.0;
-          
-
-          float w1, w2, w3;
-          GenerateExtendedConvexCombinationWeights(w1, w2, w3, overlap);
-          origin = w1*o1 + w2*o2 + w3*o3;
+          const float overlap = 0.1f;
+          float w1, w2;
+          GenerateExtendedConvexCombinationWeights2(w1, w2, overlap);
+          origin = w1*o1 + w2*o2;
           direction =
                 w1*leaf->rays[r1].mRay->GetDir() +
-                w2*leaf->rays[r2].mRay->GetDir() +
-                w3*leaf->rays[r3].mRay->GetDir();
+                w2*leaf->rays[r2].mRay->GetDir();
           // shift the origin a little bit
           origin += direction*0.1f;