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

Timestamp:

01/05/07 16:29:54 (17 years ago)

Author:

bittner

Message:

tmp commit

File:

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

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

@@ -3 +3 @@
 #include "Ray.h"
 #include "Preprocessor.h"
+#include "ViewCellsManager.h"
 
 
@@ -10 +11 @@
 #define DEBUG_RAYCAST 0
 
-#define EXACT_BOX_CLIPPING 1
+#define EXACT_BOX_CLIPPING 0
 
 RayCaster::RayCaster(const Preprocessor &preprocessor):
@@ -38 +39 @@
 }
 
+bool
+RayCaster::ClipToViewSpaceBox(const Vector3 &origin,
+                                                          const Vector3 &termination,
+                                                          Vector3 &clippedOrigin,
+                                                          Vector3 &clippedTermination)
+{
+  Ray ray(origin, termination - origin, Ray::LINE_SEGMENT);     
+  ray.Precompute();
+  
+  float tmin, tmax;
+  if ((!mPreprocessor.mViewCellsManager->
+           GetViewSpaceBox().ComputeMinMaxT(ray, &tmin, &tmax)) ||
+          tmin>=tmax
+          )
+        return false;
+
+  if (tmin >= 1.0f || tmax <=0.0f)
+        return false;
+  
+  if (tmin > 0.0f)
+        clippedOrigin = ray.Extrap(tmin);
+  else
+        clippedOrigin = origin;
+  
+  if (tmax < 1.0f)
+        clippedTermination = ray.Extrap(tmax);
+  else
+        clippedTermination = termination;
+  
+  return true;
+}
 
 /** Checks if ray is valid, (e.g., not in empty view space or outside the view space)
@@ -140 +172 @@
         // degenerate rays checked by geometrical constraint...
         //      !pruneInvalidRays || (hitA.mObject != hitB.mObject);
+
         
 #if DEBUG_RAYCAST
         Debug<<"PR2"<<flush;
 #endif
-
-        if (!pruneInvalidRays || hitA.mObject) 
-        {
-                VssRay *vssRay = new VssRay(hitB.mPoint,
+        const bool validSample = true;
+        if (validSample) {
+          Vector3 clipA, clipB;
+          if (!ClipToViewSpaceBox(hitA.mPoint,
+                                                          hitB.mPoint,
+                                                          clipA,
+                                                          clipB))
+                return 0;
+          if (!pruneInvalidRays || hitA.mObject) {
+                VssRay *vssRay = new VssRay(
+                                                                        clipB,
                                                                         hitA.mPoint,
                                                                         hitB.mObject,
@@ -167 +207 @@
 #endif
 
-        if (castDoubleRay && (!pruneInvalidRays || hitB.mObject))
-        {
-                VssRay *vssRay = new VssRay(hitA.mPoint,
-                                                                        hitB.mPoint,
-                                                                        hitA.mObject,
-                                                                        hitB.mObject,
-                                                                        mPreprocessor.mPass,
-                                                                        simpleRay.mPdf);
-
-                if (validB)
+          if (castDoubleRay && (!pruneInvalidRays || hitB.mObject))
+                {
+                  VssRay *vssRay = new VssRay(
+                                                                          clipA,
+                                                                          hitB.mPoint,
+                                                                          hitA.mObject,
+                                                                          hitB.mObject,
+                                                                          mPreprocessor.mPass,
+                                                                          simpleRay.mPdf
+                                                                          );
+                  if (validB)
                         vssRay->mFlags |= VssRay::Valid;
 
@@ -183 +224 @@
                 ++ hits;
                 //cout << "vssray 2: " << *vssRay << endl;
-        }
-        
-#if DEBUG_RAYCAST
-        Debug<<"PR4"<<flush;
-#endif
-
+                }
+#if DEBUG_RAYCAST
+          Debug<<"PR4"<<flush;
+#endif
+        }
+        
         return hits;
 }