Changeset 2592 for GTP/trunk/Lib/Vis/Preprocessing/src/Mutation.cpp

Timestamp:

01/14/08 15:54:15 (17 years ago)

Author:

bittner

Message:

havran ray caster update

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Mutation.cpp (modified) (16 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Mutation.cpp

@@ -94 +94 @@
 
                 Intersectable *oldObject = mRays[vssRays[i]->mGeneratorId].mRay->mTerminationObject;
-                
+                // the ray generated a contribution although it hits the same object
+                // mark this using a counter
                 if (oldObject == newObject)
                   dummyCMutations++;
@@ -106 +107 @@
                 mRays.push_back(RayEntry(newRay));
           } else {
-                // unref the old ray
+                // unref the old ray and add the new ray into the mutation buffer
                 *mRays[mBufferStart].mRay = *vssRays[i];
                 mRays[mBufferStart].mMutations = 0;
@@ -117 +118 @@
           }
         } else {
+          // the ray did not generate any contribution
           if (vssRays[i]->mDistribution == MUTATION_BASED_DISTRIBUTION &&
                   vssRays[i]->mGeneratorId != -1
                   ) {
                 // check whether not to store a new backward mutation candidate
+                // this happens if the new ray is occluded significantly closer than
+                // the generator ray
                 VssRay *oldRay = mRays[vssRays[i]->mGeneratorId].mRay;
                 VssRay *newRay = vssRays[i];
 
-
                 Intersectable *oldObject = oldRay->mTerminationObject;
-                
-
+
+                // only allow one reverse mutation per generator ray
                 if (!mRays[newRay->mGeneratorId].HasReverseMutation()) {
                   if (DotProd(oldRay->GetDir(), newRay->GetDir()) > 0.0f) {
@@ -149 +152 @@
                 Intersectable *newObject = vssRays[i]->mTerminationObject;
 
-
                 if (oldObject == newObject)
                   dummyNcMutations++;
@@ -163 +165 @@
         cout<<"Dummy NC mutations ratio:"<<100.0f*dummyNcMutations/(float)mutationRays<<"%"<<endl;
         cout<<"Dummy C mutations ratio:"<<100.0f*dummyCMutations/(float)mutationRays<<"%"<<endl;
-        cout<<"Reverse candidates:"<<reverseCandidates<<endl;
+        cout<<"Reverse candidates:"<<100.0f*reverseCandidates/(float)mutationRays<<endl;
   }
   
   float pContributingRays = contributingRays/(float)vssRays.size();
   
-  cout<<"Percentage of contributing rays:"<<pContributingRays<<endl;
+  cout<<"Ratio of contributing rays:"<<pContributingRays<<endl;
   
   if (mUseUnsuccCountImportance) {
@@ -233 +235 @@
                                                                                                  )
 {
-#if 0
-  Vector3 v;
-  if (d.DrivingAxis() == 0)
-        v = Vector3(0, r[0]-0.5f, r[1]-0.5f);
-  else
-        if (d.DrivingAxis() == 1)
-          v = Vector3(r[0]-0.5f, 0, r[1]-0.5f);
-        else
-          v = Vector3(r[0]-0.5f, r[1]-0.5f, 0);
-  return v*(2*radius);
-#endif
 #if 0
   return (U*(r[0] - 0.5f) + V*(r[1] - 0.5f))*(2*radius);
@@ -339 +330 @@
   
   AxisAlignedBox3 box = occluder->GetBox();
+  // consider slightly larger neighborhood of the occluder
+  // in search for unocclude reverse ray
   box.Scale(2.0f);
   
@@ -430 +423 @@
   }
 
+  return true;
 #else
   cerr << "warning: reverse mutation not supported!" << endl;
-#endif
-  
-  return true;
+  return false;
+#endif
+  
   
   // now the origin and termination is swapped compred to the generator ray
@@ -510 +504 @@
 
 #else
-        cerr << "warning: shiluette mutation not supported" << endl;
-        return Vector3(0, 0, 0);
+  //cerr << "warning: shiluette mutation not supported" << endl;
+  return Vector3(0, 0, 0);
 #endif
   
@@ -523 +517 @@
   if (mRays.size() == 0) {
         float rr[5];
-        // use direction based distribution
+        // use direction based distribution until we have some mutation candidates
         Vector3 origin, direction;
 
@@ -532 +526 @@
                                                                                                   Vector3(rr[0], rr[1], rr[2]));
         
-
+        
         direction = UniformRandomVector(rr[3], rr[4]);
         
@@ -538 +532 @@
         sray = SimpleRay(origin, direction, MUTATION_BASED_DISTRIBUTION, pdf);
         sray.mGeneratorId = -1;
-
+        
         return true;
-  } 
+  }
 
   int index;
@@ -552 +546 @@
         if (
                 mRays[index].GetSamplingFactor() >= mRays[mLastIndex].GetSamplingFactor()) {
-          // make another round
+          // make another round to equalize the oversampling factor
 
           //      cout<<"R2"<<endl;
@@ -666 +660 @@
   
   if (mUseSilhouetteSamples && a < mSilhouetteProb) {
-        
         termination += ComputeSilhouetteTerminationMutation(*ray,
                                                                                                                 origin,
@@ -692 +685 @@
   
   // shift the origin a little bit
+#if 1
   origin += direction*0.5f;
+#else
+  // $$JB - 14.1. 2008 increase shift to test HavranRayCaster
+  origin = 0.5f*(origin + termination);
+#endif
   
   direction.Normalize();
@@ -718 +716 @@
     mRays[index].mMutations++;
         mRays[index].mUnsuccessfulMutations++;
-
         return true;
   }