Changeset 2583 for GTP/trunk/Lib/Vis/Preprocessing/src/havran

Timestamp:

01/09/08 14:29:56 (16 years ago)

Author:

bittner

Message:

Havran ray caster functional except enhanced features used by mutation and object based pvs

Location:

GTP/trunk/Lib/Vis/Preprocessing/src/havran

Files:

• ktbftrav.cpp (modified) (3 diffs)
• ktbtrav.h (modified) (1 diff)
• raypack.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/havran/ktbftrav.cpp

@@ -990 +990 @@
       results[i].tdist;
   } // for i
+  return 0;
 }
 #endif
@@ -1338 +1339 @@
 CKTBTraversal::FindNearestI(RayPacket2x2 &rp, Vector3 &boxmin, Vector3 &boxmax)
 {
+
   static AxisAlignedBox3 localbox;
   localbox.SetMin(boxmin);
   localbox.SetMax(boxmax);
 
+#define USE_SIMPLE_VERSION 1
+
+#if !USE_SIMPLE_VERSION
   int m1 = _mm_movemask_ps(rp.dx4);
   if ((m1 == 0)||(m1 == 15)) {
@@ -1514 +1519 @@
     return;
   }}}
-
+#endif
   // Trace ray by ray
   SimpleRay ray;

GTP/trunk/Lib/Vis/Preprocessing/src/havran/ktbtrav.h

@@ -311 +311 @@
   }
   // $$JB correction
-  virtual int FindNearestI_16oneDir(SimpleRayContainer &rays, int offset) {
-        return 0;
-  }
+  virtual int FindNearestI_16oneDir(SimpleRayContainer &rays, int offset);
+
   int PrecomputeData(SimpleRayContainer &rays);
   void ReverseRay(const int indexA);

GTP/trunk/Lib/Vis/Preprocessing/src/havran/raypack.h

@@ -22 +22 @@
 #include "Vector3.h"
   
-// $$JB __SSE__ macro not define in _WIN32
-//#ifdef __SSE__
-#if 1
+#ifdef __SSE__
 
 // System headers for SSE