Changeset 1292 for GTP/trunk/Lib/Vis/Preprocessing/src/SamplingPreprocessor.cpp

Timestamp:

08/28/06 21:13:40 (18 years ago)

Author:

bittner

Message:

intel ray caster updates

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/SamplingPreprocessor.cpp (modified) (3 diffs)

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

@@ -15 +15 @@
 
 
-SamplingPreprocessor::SamplingPreprocessor(): mPass(0)
+SamplingPreprocessor::SamplingPreprocessor(): Preprocessor(), mPass(0)
 {
   // this should increase coherence of the samples
@@ -36 +36 @@
                                                           )
 {
-  static Ray ray;
   AxisAlignedBox3 box = mViewCellsManager->GetViewSpaceBox();
   
@@ -43 +42 @@
   if (!sbox.IsInside(origin))
         return 0;
-        
-  ray.intersections.clear();
-  // do not store anything else then intersections at the ray
-  ray.Init(origin, direction, Ray::LOCAL_RAY);
-
-  ray.mFlags &= ~Ray::CULL_BACKFACES;
-
-
+  
+  Vector3 point, normal;
+  Intersectable *object;
 
   // cast ray to KD tree to find intersection with other objects
-  Intersectable *objectA = NULL;
-  Vector3 pointA;
-  float bsize = Magnitude(box.Size());
-  
-  if (mKdTree->CastRay(ray)) {
-        if (!mDetectEmptyViewSpace || DotProd(ray.intersections[0].mNormal, direction) < 0) {
-          objectA = ray.intersections[0].mObject;
-          pointA = ray.Extrap(ray.intersections[0].mT);
-        }
-  }
-  return objectA;
+  object = CastSimpleRay(origin,
+                                                 direction,
+                                                 mKdTree->GetBox(),
+                                                 point,
+                                                 normal
+                                                 );
+  
+  if (mDetectEmptyViewSpace && DotProd(normal, direction) >= 0) {
+        object = NULL;
+  }
+  
+  return object;
 }