Changeset 2585

Timestamp:

01/09/08 16:12:42 (16 years ago)

Author:

bittner

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• HavranRayCaster.cpp (modified) (2 diffs)
• Makefile (modified) (1 diff)
• common.h (modified) (2 diffs)

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

@@ -281 +281 @@
     {
       Intersectable *intersect =
-        SimpleRay::IntersectionRes[i+16].intersectable;
+                SimpleRay::IntersectionRes[i+16].intersectable;
 
       if (intersect)
       { 
-        hitB.mObject = intersect;
-        hitB.mNormal = intersect->GetNormal(0);;
-        float tdist = SimpleRay::IntersectionRes[i].tdist;
-        hitB.mPoint = rays[k].Extrap(-tdist);
+                hitB.mObject = intersect;
+                hitB.mNormal = intersect->GetNormal(0);
+                // $$ JB : i -> i+16
+                float tdist = SimpleRay::IntersectionRes[i+16].tdist;
+                hitB.mPoint = rays[k].Extrap(-tdist);
       }
     }
@@ -298 +299 @@
 #if 1
     ProcessRay(rays[k],
-               hitA,
-               hitB,
-               vssRays,
-               sbox,
-               castDoubleRays,
-               pruneInvalidRays
-               );
+                           hitA,
+                           hitB,
+                           vssRays,
+                           sbox,
+                           castDoubleRays,
+                           pruneInvalidRays
+                           );
 #endif
   } // for

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: st 9. I 13:30:43 2008
+# Generated by qmake (2.00a) (Qt 4.1.2) on: st 9. I 14:48:54 2008
 # Project:  preprocessor.pro
 # Template: app

GTP/trunk/Lib/Vis/Preprocessing/src/common.h

@@ -21 +21 @@
 #include <limits.h>
 
-// use perftimer
-// #define PERFTIMER
+
 
 #define USE_HAVRAN_RAYCASTER
@@ -30 +29 @@
   
 #if defined(_MSC_VER)
+// use perftimer only on msvc
+#define PERFTIMER
+
 // define __SSE__ macro as it is not defined under MSVC
 #define __SSE__