Changeset 1294 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

08/29/06 17:34:19 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (11 diffs)

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

@@ -475 +475 @@
 }
 
+
 HierarchyManager *Preprocessor::CreateHierarchyManager(const char *name)
 {
@@ -850 +851 @@
                                                                          )
 {
+#ifdef GTP_INTERNAL
         VssRay *vssRay  = NULL;
         int hits = 0;
@@ -859 +861 @@
         
         double normal[3];
-#ifdef GTP_INTERNAL
+
         hittriangle = mlrtaIntersectAS(&viewPoint.x,
                                                                    &direction.x,
                                                                    normal,
                                                                    dist);
-#else
-        hittriangle = -1;
-#endif
+
         if (hittriangle !=-1 ) {
           if (hittriangle >= mFaceParents.size())
@@ -881 +881 @@
         }
 
+        
         Vector3 dir = -direction;
-#ifdef GTP_INTERNAL
         hittriangle = mlrtaIntersectAS(&viewPoint.x,
                                                                    &dir.x,
                                                                    normal,
                                                                    dist);
-#else
-        hittriangle = -1;
-#endif
 
         if (hittriangle !=-1 ) {
@@ -913 +910 @@
                                           box
                                           );
+#else
+        return -1;
+#endif
 }
 
@@ -929 +929 @@
                 return 0;
         
+#ifdef GTP_INTERNAL
         float pforg[3];
         float pfdir[3];
@@ -936 +937 @@
         pfdir[0] = direction[0]; pfdir[1] = direction[1]; pfdir[2] = direction[2];
 
-        float dist = 0;
-#ifdef GTP_INTERNAL
+        float dist;
         const int hittriangle = mlrtaIntersectAS(pforg, pfdir, pfnorm, dist);
-#else
-        const int hittriangle = -1;
-#endif
 
         if (hittriangle == -1)
@@ -970 +967 @@
           }
         }
+
+#else
+        const int hittriangle = -1;
+        return NULL;
+#endif
+
+        
         
 }
@@ -1330 +1334 @@
         {
         case INTEL_RAYCASTER: {
-          float dist;
+         
           int hittriangle;
+          
+
+#ifdef GTP_INTERNAL
+          float dist; 
           double n[3];
 
-#ifdef GTP_INTERNAL
           hittriangle = mlrtaIntersectAS(&viewPoint.x,
                                                                          &direction.x,
@@ -1340 +1347 @@
                                                                          dist);
 
-#else
-        hittriangle = -1;
-#endif
-
-          if (hittriangle !=-1 ) {
+           if (hittriangle !=-1 ) {
                 if (hittriangle >= mFaceParents.size())
                   cerr<<"Warning: traingle index out of range! "<<hittriangle<<endl;
@@ -1353 +1356 @@
                 }
           }
+#else
+        hittriangle = -1;
+#endif
+
+         
           break;
         }