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

Timestamp:

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

Author:

bittner

Message:

Havran ray caster updates

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HavranRayCaster.cpp (modified) (3 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(Vector3 &boxmax,
-                                      Vector3 &boxmin,
-                                      Vector3 origin4[],
-                                      Vector3 direction4[],
-                                      int     result4[],
-                                      float   dist4[])
-{
-#ifdef _USE_HAVRAN_SSE  
+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 
   for (int i = 0; i < 4; i++) {
     result4[i] = -1;
+        //      raypack.SetObject(i, NULL);
     raypack.SetLoc(i, origin4[i]);
     raypack.SetDir(i, direction4[i]);
@@ -110 +111 @@
   // a particular ASDS, otherwise it is emulated by decomposition
   // of a packet to individual rays and traced individually.
-  mKtbtree->FindNearestI(raypack, boxmin, boxmax);
+  mKtbtree->FindNearestI(raypack, (Vector3&)boxmin, (Vector3&)boxmax);
+  //  mKtbtree->FindNearestI(raypack, bmin, bmax);
 
   for (int i = 0; i < 4; i++) {
@@ -131 +133 @@
     sray.mOrigin = origin4[i];
     sray.mDirection = direction4[i];
-    mKtbtree->FindNearestI(sray, boxmin, boxmax);
+    mKtbtree->FindNearestI(sray, (Vector3&)boxmin, (Vector3&)boxmax);
     if (SimpleRay::IntersectionRes[0].intersectable) {
       // This is object ID - is this the triangle index ???