Changeset 2575 for GTP/trunk/Lib/Vis/Preprocessing/src/RayCaster.cpp

Timestamp:

01/03/08 15:53:44 (17 years ago)

Author:

bittner

Message:

big merge: preparation for havran ray caster, check if everything works

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RayCaster.cpp (modified) (5 diffs)

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

@@ -270 +270 @@
 int
 RayCaster::ProcessRay(const SimpleRay &simpleRay,
-                                          Intersection &hitA,
-                                          Intersection &hitB,
-                                          VssRayContainer &vssRays,
-                                          const AxisAlignedBox3 &box,
-                                          const bool castDoubleRay,
-                                          const bool pruneInvalidRays)
+                      Intersection &hitA,
+                      Intersection &hitB,
+                      VssRayContainer &vssRays,
+                      const AxisAlignedBox3 &box,
+                      const bool castDoubleRay,
+                      const bool pruneInvalidRays)
 {
   int hits = 0;
@@ -325 +325 @@
         Debug<<"PR2"<<flush;
 #endif
+
+        // VH - I do not know what this is for, commented out temporarily
+        // !!!!!!!!!!!!!! !!!!!!!!!!!! !!!!!!!!!!
+#if 1
         const bool validSample = true;
         if (validSample) {
@@ -363 +367 @@
         {
                 VssRay *vssRay = RequestRay(
-                                                                        clipA,
-                                                                        hitB.mPoint,
-                                                                        hitA.mObject,
-                                                                        hitB.mObject,
-                                                                        mPreprocessor.mPass,
-                                                                        1.0f //simpleRay.mPdf
-                                                                        );
+                                            clipA,
+                                            hitB.mPoint,
+                                            hitA.mObject,
+                                            hitB.mObject,
+                                            mPreprocessor.mPass,
+                                            1.0f //simpleRay.mPdf
+                                            );
 
                 if (validB)
@@ -383 +387 @@
           Debug<<"PR4"<<flush;
 #endif
-        }
+        } // validSample
+#else
+        // Just pass if intersected or not
+        hits = (hitA.mObject != 0) ? 1 : 0;
+        intersect = hitA;
+#endif  
         
         return hits;
@@ -391 +400 @@
 void
 RayCaster::CastRays(
-                                        SimpleRayContainer &rays,
-                                        VssRayContainer &vssRays,
-                                        const AxisAlignedBox3 &sbox,
-                                        const bool castDoubleRay,
-                                        const bool pruneInvalidRays )
-{
-        SimpleRayContainer::const_iterator rit, rit_end = rays.end();
-
-        for (rit = rays.begin(); rit != rit_end; ++ rit) {
-                
-                CastRay(
-                        *rit,                           
-                        vssRays,
-                        sbox,
-                        castDoubleRay,
-                        pruneInvalidRays);
-        }
-}
-
-
-}
+                    SimpleRayContainer &rays,
+                    VssRayContainer &vssRays,
+                    const AxisAlignedBox3 &sbox,
+                    const bool castDoubleRay,
+                    const bool pruneInvalidRays )
+{
+  SimpleRayContainer::const_iterator rit, rit_end = rays.end();
+  
+  for (rit = rays.begin(); rit != rit_end; ++ rit) {
+    
+    CastRay(
+            *rit,                               
+            vssRays,
+            sbox,
+            castDoubleRay,
+            pruneInvalidRays);
+        }
+}
+  
+
+}