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

Timestamp:

01/15/08 23:02:37 (17 years ago)

Author:

bittner

Message:

Havran ray caster updates

File:

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

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

@@ -18 +18 @@
 
 namespace GtpVisibilityPreprocessor {
+
+
 
 #define MUTATION_USE_CDF 0
@@ -92 +94 @@
                 
                 Intersectable *newObject = vssRays[i]->mTerminationObject;
-
+                
                 Intersectable *oldObject = mRays[vssRays[i]->mGeneratorId].mRay->mTerminationObject;
                 // the ray generated a contribution although it hits the same object
@@ -130 +132 @@
                 Intersectable *oldObject = oldRay->mTerminationObject;
 
+                  
                 // only allow one reverse mutation per generator ray
                 if (!mRays[newRay->mGeneratorId].HasReverseMutation()) {
@@ -333 +336 @@
   // in search for unocclude reverse ray
   box.Scale(2.0f);
+  //box.Scale(200.0f);
   
   const int packetSize = 4;
@@ -369 +373 @@
                 // break on first passing ray
             break;
-          }
+          } 
         }
         float rr = left + (i+1)*(right-left)/(packetSize+1);
@@ -377 +381 @@
   }
 
+
   float t = right;
   if (right==1.0f)
         return false;
-  
+
+
   if (i == packetSize)
         origin = newPivot + right*line;
@@ -464 +470 @@
   float left = 0.0f;
   float right = radius;
+  
+  AxisAlignedBox3 _box = box;
+  _box.Scale(1.1f);
   // cast rays to find silhouette ray
   for (int j=0; j < mSilhouetteSearchSteps; j++) {
@@ -476 +485 @@
         // mlrtaTraverseGroupASEye4(&box.Min().x, &box.Max().x, hit_triangles, dist);
         assert(preprocessor->mRayCaster);
-        preprocessor->mRayCaster->CastRaysPacket4(box.Min(), box.Max(),
-                                                  origs, dirs, hit_triangles, dist);       
+        preprocessor->mRayCaster->CastRaysPacket4(_box.Min(),
+                                                                                          _box.Max(),
+                                                                                          origs,
+                                                                                          dirs,
+                                                                                          hit_triangles,
+                                                                                          dist);       
         
         for (i=0; i < packetSize; i++) {
@@ -491 +504 @@
         right = rr;
   }
+
+  Vector3 shift;
   
   if (i == packetSize) {
@@ -497 +512 @@
         //cout<<"W"<<i<<endl;
         //      return (RandomValue(1.0f, 1.5f)*radius)*line;
-        return right*line;
-  }
-  
-  //  cout<<i<<endl;
-  return shifts[i];
-
+        shift = right*line;
+  } else {
+        //  cout<<i<<endl;
+        shift = shifts[i];
+  }
+  
+
+  if (0) {
+        
+        static VssRayContainer rRays;
+        static int counter = 0;
+        char filename[256];
+
+        if (counter < 50) {
+          sprintf(filename, "sil_rays_%03d.x3d", counter++);
+          
+          VssRay tRays[10];
+          rRays.push_back((VssRay *)&ray);
+          for (int k=0; k < packetSize; k++)
+                if (k!=i) {
+                  tRays[k] = VssRay(origin, ray.mTermination + shifts[k], NULL, NULL);
+                  rRays.push_back(&tRays[k]);
+                }
+          
+          Exporter *exporter = NULL;
+          exporter = Exporter::GetExporter(filename);
+          
+          exporter->SetFilled();
+          
+          Intersectable *occluder = 
+                ray.mTerminationObject;
+
+          // cout<<occluder->Type()<<endl;
+          
+          exporter->SetForcedMaterial(RgbColor(0,0,1));
+          exporter->ExportIntersectable(occluder);
+
+          exporter->SetWireframe();
+          
+          exporter->SetForcedMaterial(RgbColor(0,1,0));
+          exporter->ExportBox(occluder->GetBox());
+
+          exporter->SetForcedMaterial(RgbColor(0,1,1));
+          exporter->ExportBox(_box);
+
+          exporter->ResetForcedMaterial();
+
+          exporter->ExportRays(rRays, RgbColor(1, 0, 0));
+
+          rRays.clear();
+          tRays[0] = VssRay(origin, ray.mTermination+shift, NULL, NULL);
+          rRays.push_back((VssRay *)&tRays[0]);
+          exporter->ExportRays(rRays, RgbColor(1, 1, 0));
+
+          delete exporter;
+          rRays.clear();
+        }
+  }
+
+  return shift;
+
+  
 #else
   //cerr << "warning: shiluette mutation not supported" << endl;
@@ -540 +611 @@
 #if !MUTATION_USE_CDF
 #if SORT_RAY_ENTRIES
+  // RAYS are sorted -> find mitation candidate from the tail of the buffer
   index = mLastIndex - 1;
   if (index < 0 || index >= mRays.size()-1) {
@@ -574 +646 @@
 #endif
 #else
+
   static HaltonSequence iHalton;
   iHalton.GetNext(1, rr);
@@ -596 +669 @@
   //  cout<<index<<" "<<rr[0]<<" "<<mRays[index].mCdf<<" "<<mRays[(index+1)%mRays.size()].mCdf<<endl;
 
+  // WE HAVE THE INDEX HERE
+
   mLastIndex = index;
   //  Debug<<index<<" "<<mRays[index].GetSamplingFactor()<<endl;