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

Timestamp:

01/03/07 01:36:35 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -24 +24 @@
 
 VssRay *RayCaster::CastRay(const SimpleRay &simpleRay,
-                                                   const AxisAlignedBox3 &box,
-                                                   const bool castDoubleRay)
+                                                   const AxisAlignedBox3 &box)
+                                                   //const bool castDoubleRay) 
 {
-  VssRayContainer rays;
-  CastRay(simpleRay, rays, box, castDoubleRay);
-  
-  if (!rays.empty())
-        return rays.back();
-  else
-        return NULL;
+        // note: make no sense otherwise
+        const bool castDoubleRay = false;
+        VssRayContainer rays;
+        CastRay(simpleRay, rays, box, castDoubleRay);
+    
+        if (!rays.empty())
+                return rays.back();
+        else
+                return NULL;
 }
 
@@ -45 +47 @@
                                            Intersection &hit)
 {
-  if (!hit.mObject)  {
-        // compute intersection with the scene bounding box
+        if (!hit.mObject)  
+        {
+                // compute intersection with the scene bounding box
 #if EXACT_BOX_CLIPPING
-        static Ray ray;
-        mPreprocessor.SetupRay(ray, origin, direction);
-        
-        float tmin, tmax;
-        if (box.ComputeMinMaxT(ray, &tmin, &tmax) && (tmin < tmax)) {
-          hit.mPoint = ray.Extrap(tmax);
+                static Ray ray;
+                mPreprocessor.SetupRay(ray, origin, direction);
+
+                float tmin, tmax;
+                if (box.ComputeMinMaxT(ray, &tmin, &tmax) && (tmin < tmax)) 
+                {
+                        hit.mPoint = ray.Extrap(tmax);
+                }
+                else 
+                {
+                        // cout<<" invalid hp "<<tmin<<" "<<tmax<<endl;
+                        // cout<<" box "<<box<<endl;
+                        // cout<<" origin "<<origin<<endl;
+                        // cout<<" direction "<<direction<<endl;
+                        // cout<< "inv dir"<<ray.GetInvDir()<<endl;
+                        return false;
+                }
+#else
+                hit.mPoint = origin + direction * Magnitude(box.Diagonal());
+#endif
         }
-        else {
-          //            cout<<" invalid hp "<<tmin<<" "<<tmax<<endl;
-          //            cout<<" box "<<box<<endl;
-          //            cout<<" origin "<<origin<<endl;
-          //            cout<<" direction "<<direction<<endl;
-          //            cout<< "inv dir"<<ray.GetInvDir()<<endl;
-          return false;
+        else
+        {
+                if (mPreprocessor.mDetectEmptyViewSpace) 
+                {
+                        if (DotProd(hit.mNormal, direction) >= -Limits::Small) 
+                        {       
+                                hit.mObject = NULL;
+                                return false;
+                        }
+                }
         }
-#else
-        hit.mPoint = origin + direction*Magnitude(box.Diagonal());
-#endif
-  }
-  else
-        if (mPreprocessor.mDetectEmptyViewSpace) {
-          if (DotProd(hit.mNormal, direction) >= -Limits::Small) {      
-                hit.mObject = NULL;
-                return false;
-          }
-        }
-  
-  return true;
+
+        return true;
 }
 
@@ -98 +107 @@
         //        return 0;
         
-        if (pruneInvalidRays) {
-          if (!hitA.mObject && !hitB.mObject) {
-                return 0;
-          }
+        if (pruneInvalidRays) 
+        {
+                if (!hitA.mObject && !hitB.mObject) 
+                {
+                        return 0;
+                }
         }
         
@@ -107 +118 @@
           ValidateRay(simpleRay.mOrigin, simpleRay.mDirection, box, hitA);
         
-        const bool validB = castDoubleRay && 
-          ValidateRay(simpleRay.mOrigin, -simpleRay.mDirection, box, hitB);
+        // note: should we check for backward valitidy also for single rays?
+        const bool validB = //castDoubleRay && 
+                ValidateRay(simpleRay.mOrigin, -simpleRay.mDirection, box, hitB);
         
 #if DEBUG_RAYCAST
@@ -115 +127 @@
         
         // reset both contributions
-        if (!validA || !validB) {
-          if (pruneInvalidRays)
-                return 0;
-          // reset both contributions of this ray
-          hitA.mObject = NULL;
-          hitB.mObject = NULL;
+        if (!validA || !validB)
+        {
+                if (pruneInvalidRays)
+                        return 0;
+                
+                // reset both contributions of this ray
+                hitA.mObject = NULL;
+                hitB.mObject = NULL;
         }
           
-        
-        const bool validSample = true;
         // 8.11. 2007 JB
         // degenerate rays checked by geometrical constraint...
@@ -133 +145 @@
 #endif
 
-        if (validSample) {
-          if (!pruneInvalidRays || hitA.mObject) {
-                VssRay *vssRay = new VssRay(
-                                                                        hitB.mPoint,
+        if (!pruneInvalidRays || hitA.mObject) 
+        {
+                VssRay *vssRay = new VssRay(hitB.mPoint,
                                                                         hitA.mPoint,
                                                                         hitB.mObject,
                                                                         hitA.mObject,
                                                                         mPreprocessor.mPass,
-                                                                        simpleRay.mPdf
-                                                                        );
-                
+                                                                        simpleRay.mPdf);
+
                 if (validA)
-                  vssRay->mFlags |= VssRay::Valid;
+                        vssRay->mFlags |= VssRay::Valid;
+
                 vssRay->mDistribution = simpleRay.mDistribution;
                 vssRays.push_back(vssRay);
                 ++ hits;
                 //cout << "vssray 1: " << *vssRay << " " << vssRay->mTermination - vssRay->mOrigin << endl;
-          }
-          
+        }
+
 #if DEBUG_RAYCAST
-          Debug<<"PR3"<<flush;
+        Debug<<"PR3"<<flush;
 #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(hitA.mPoint,
+                                                                        hitB.mPoint,
+                                                                        hitA.mObject,
+                                                                        hitB.mObject,
+                                                                        mPreprocessor.mPass,
+                                                                        simpleRay.mPdf);
+
+                if (validB)
                         vssRay->mFlags |= VssRay::Valid;
-                  
-                  vssRay->mDistribution = simpleRay.mDistribution;
-                  vssRays.push_back(vssRay);
-                  ++ hits;
-                  //cout << "vssray 2: " << *vssRay << endl;
-                }
+
+                vssRay->mDistribution = simpleRay.mDistribution;
+                vssRays.push_back(vssRay);
+                ++ hits;
+                //cout << "vssray 2: " << *vssRay << endl;
         }