Changeset 2602 for GTP/trunk/Lib/Vis/Preprocessing/src/HavranRayCaster.cpp

Timestamp:

01/16/08 21:30:29 (16 years ago)

Author:

bittner

Message:

Havran ray Caster update

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HavranRayCaster.cpp (modified) (6 diffs)

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

@@ -92 +92 @@
 // We give a box to which each ray is clipped to before the
 // ray shooting is computed !
-void HavranRayCaster::CastRaysPacket4(const Vector3 &boxmax,
-                                                                          const Vector3 &boxmin,
-                                                                          const Vector3 origin4[],
-                                                                          const Vector3 direction4[],
-                                                                          int     result4[],
-                                                                          float   dist4[])
-{
-#if defined(_USE_HAVRAN_SSE)
-#ifdef USE_HAVRAN_RAYCASTER 
+void HavranRayCaster::CastRaysPacket4(const Vector3 &minBox,
+                                      const Vector3 &maxBox,
+                                      const Vector3 origin4[],
+                                      const Vector3 direction4[],
+                                      int     result4[],
+                                      float   dist4[])
+{
+#ifdef USE_HAVRAN_RAYCASTER 
+#ifdef _USE_HAVRAN_SSE  
   for (int i = 0; i < 4; i++) {
     result4[i] = -1;
-        //      raypack.SetObject(i, NULL);
     raypack.SetLoc(i, origin4[i]);
     raypack.SetDir(i, direction4[i]);
@@ -111 +110 @@
   // a particular ASDS, otherwise it is emulated by decomposition
   // of a packet to individual rays and traced individually.
-  mKtbtree->FindNearestI(raypack, (Vector3&)boxmin, (Vector3&)boxmax);
-  //  mKtbtree->FindNearestI(raypack, bmin, bmax);
+  mKtbtree->FindNearestI(raypack, minBox, maxBox);
 
   for (int i = 0; i < 4; i++) {
@@ -120 +118 @@
     if ( (intersectable = raypack.GetObject(i)) ) {
       // $$JB this is very hacky - > should be replaced with fetching the index of the triangle
+      // $$VH - this is object ID - is this the triangle index ???
       result4[i] = intersectable->mId;
       dist4[i] = raypack.GetT(i);
@@ -126 +125 @@
   
   return;
-#endif // USE_HAVRAN_RAYCASTER 
 #else // _USE_HAVRAN_SSE
   // Compute the result ray by ray
@@ -133 +131 @@
     sray.mOrigin = origin4[i];
     sray.mDirection = direction4[i];
-    mKtbtree->FindNearestI(sray, (Vector3&)boxmin, (Vector3&)boxmax);
+    mKtbtree->FindNearestI(sray, minBox, maxBox);
     if (SimpleRay::IntersectionRes[0].intersectable) {
       // This is object ID - is this the triangle index ???
@@ -145 +143 @@
   
 #endif // _USE_HAVRAN_SSE  
+#endif // USE_HAVRAN_RAYCASTER 
 }