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

Timestamp:

03/05/07 11:07:44 (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

@@ -238 +238 @@
   
                                         
+VssRay *RayCaster::RequestRay(const Vector3 &origin, 
+                                                          const Vector3 &termination, 
+                                                          Intersectable *originObject, 
+                                                          Intersectable *terminationObject, 
+                                                          const int pass, 
+                                                          const float pdf)
+{
+ #if DEBUG_RAYCAST
+        Debug<<"PR2a"<<flush;
+#endif
+        
+        // old method: always allocate
+        if (1) return new VssRay(origin, termination, originObject, terminationObject, pass, pdf);
+
+        VssRay *vssRay = mVssRayPool.Alloc();
+
+#if DEBUG_RAYCAST
+        Debug<<"PR2b"<<flush;
+#endif
+        
+        *vssRay = VssRay(origin, termination, originObject, terminationObject, pass, pdf);
+
+#if DEBUG_RAYCAST
+        Debug<<"PR2c"<<flush;
+#endif
+
+        return vssRay;
+}
+
 
 int
@@ -306 +335 @@
 
           if (!pruneInvalidRays || hitA.mObject) {
-#if DEBUG_RAYCAST
-                Debug<<"PR2a"<<flush;
-#endif
-                
-                VssRay *vssRay = mVssRayPool.Alloc();
-
-#if DEBUG_RAYCAST
-                Debug<<"PR2b"<<flush;
-#endif
-                *vssRay = VssRay(
-                                                 !castDoubleRay ? simpleRay.mOrigin : clipB,
+
+                  VssRay *vssRay = 
+                          RequestRay(!castDoubleRay ? simpleRay.mOrigin : clipB,
                                                  hitA.mPoint,
                                                  hitB.mObject,
@@ -323 +344 @@
                                                  1.0f //simpleRay.mPdf
                                                  );
-#if DEBUG_RAYCAST
-                Debug<<"PR2c"<<flush;
-#endif
-                
+
                 if (validA)
                   vssRay->mFlags |= VssRay::Valid;
@@ -344 +362 @@
         if (castDoubleRay && (!pruneInvalidRays || hitB.mObject))
         {
-                VssRay *vssRay = mVssRayPool.Alloc();
-
-                *vssRay = VssRay(
-                        clipA,
-                        hitB.mPoint,
-                        hitA.mObject,
-                        hitB.mObject,
-                        mPreprocessor.mPass,
-                        1.0f //simpleRay.mPdf
-                        );
+                VssRay *vssRay = RequestRay(
+                                                                        clipA,
+                                                                        hitB.mPoint,
+                                                                        hitA.mObject,
+                                                                        hitB.mObject,
+                                                                        mPreprocessor.mPass,
+                                                                        1.0f //simpleRay.mPdf
+                                                                        );
 
                 if (validB)
@@ -381 +397 @@
                                         const bool pruneInvalidRays )
 {
-  SimpleRayContainer::const_iterator rit, rit_end = rays.end();
-  
-  for (rit = rays.begin(); rit != rit_end; ++ rit) {
-        CastRay(
+        SimpleRayContainer::const_iterator rit, rit_end = rays.end();
+
+        for (rit = rays.begin(); rit != rit_end; ++ rit) {
+                CastRay(
                         *rit,                           
                         vssRays,
@@ -390 +406 @@
                         castDoubleRay,
                         pruneInvalidRays);
-  }
-  
-}
-
-}
+        }
+}
+
+
+}