Changeset 1824 for GTP/trunk/Lib/Vis/Preprocessing/src/IntersectableWrapper.cpp

Timestamp:

11/28/06 19:46:36 (18 years ago)

Author:

bittner

Message:

global lines support

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/IntersectableWrapper.cpp (modified) (1 diff)

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

@@ -23 +23 @@
         if (ray.GetType() == Ray::LOCAL_RAY && !ray.intersections.empty())
                 nearestT = ray.intersections[0].mT;
-
+        
         const int hitCode = mItem.CastRay(ray, t, nearestT, nearestNormal);
 
         nearestT = t;
 
-        if ((hitCode == Ray::INTERSECTION) && (ray.GetType() == Ray::LOCAL_RAY))
-        {
-                if (!ray.intersections.empty())
-                {
-                        ray.intersections[0] = Ray::Intersection(nearestT, nearestNormal, this, 0);
+        if (hitCode == Ray::INTERSECTION) {
+                if (ray.GetType() == Ray::LOCAL_RAY && !ray.intersections.empty()) {
+                        ray.intersections[0] = Ray::Intersection(nearestT,
+                                                                                                                                                                                         nearestNormal,
+                                                                                                                                                                                         this,
+                                                                                                                                                                                         0);
                 }
-                else
-                {
-                        ray.intersections.push_back(Ray::Intersection(nearestT, nearestNormal, this, 0));
+                else {
+                        ray.intersections.push_back(Ray::Intersection(nearestT,
+                                                                                                                                                                                                                nearestNormal,
+                                                                                                                                                                                                                this,
+                                                                                                                                                                                                                0));
                 }
                 
                 return 1;
         }
-
+        
         return 0;
 }