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

Timestamp:

01/09/08 11:14:26 (17 years ago)

Author:

bittner

Message:

Havran Ray Caster compiles and links, but still does not work

File:

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

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

@@ -27 +27 @@
   //#define Q_SEARCH_STEPS 3
 
-#define SORT_RAY_ENTRIES 1
+  // VH - commened out !!!!! 8/1/2008
+  // #define SORT_RAY_ENTRIES 1
 
 // use avg ray contribution as importance
@@ -367 +368 @@
   static Vector3 dirs[packetSize];
   static Vector3 shifts[packetSize];
+  static Vector3 origs[packetSize];
   // now find the silhouette along the line
   int i;
@@ -378 +380 @@
           shifts[i] = r*line;
           dirs[i] = Normalize(newPivot + shifts[i] - termination );
-          mlrtaStoreRayASEye4(&termination.x,
-                                                  &dirs[i].x,
-                                                  i);
-        }
-        
-        mlrtaTraverseGroupASEye4(&box.Min().x,
-                                                         &box.Max().x,
-                                                         hit_triangles,
-                                                         dist);
+          origs[i] = termination;
+          // mlrtaStoreRayASEye4(&termination.x, &dirs[i].x, i);
+        }
+
+        // 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);       
         
         for (i=0; i < packetSize; i++) {
           if (hit_triangles[i] == -1) {
-                // break on first passing ray
-                break;
+            // break on first passing ray
+            break;
           }
         }
@@ -473 +477 @@
   static Vector3 dirs[packetSize];
   static Vector3 shifts[packetSize];
+  static Vector3 origs[packetSize];
   // mutate the 
   float alpha = RandomValue(0.0f, Real(2.0*M_PI));
@@ -491 +496 @@
           shifts[i] = r*line;
           dirs[i] = Normalize(ray.mTermination + shifts[i] - origin );
-          mlrtaStoreRayASEye4(&origin.x,
-                                                  &dirs[i].x,
-                                                  i);
-        }
-        
-        mlrtaTraverseGroupASEye4(&box.Min().x,
-                                                         &box.Max().x,
-                                                         hit_triangles,
-                                                         dist);
+          origs[i] = origin;
+          //mlrtaStoreRayASEye4(&origin.x, &dirs[i].x, i);
+        }
+        
+        // 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);       
         
         for (i=0; i < packetSize; i++) {