Changeset 339 for trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

Timestamp:

10/18/05 14:21:26 (19 years ago)

Author:

bittner

Message:

changed mailbox naming convention, added intersectable ids

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -27 +27 @@
 void
 SamplingPreprocessor::SetupRay(Ray &ray, 
-                                                           const Vector3 &point, 
-                                                           const Vector3 &direction,
-                                                           const int type)
+                                                                                                                         const Vector3 &point, 
+                                                                                                                         const Vector3 &direction,
+                                                                                                                         const int type)
 {
   ray.intersections.clear();
@@ -148 +148 @@
 
 int
-SamplingPreprocessor::CastRay(Intersectable *object, Ray &ray)
+SamplingPreprocessor::CastRay(Intersectable *object,
+                                                                                                                        Ray &ray)
 {
         int sampleContributions = 0;
 
+        long t1 = GetTime();
         // cast ray to KD tree to find intersection with other objects
         mKdTree->CastRay(ray);
-        
+        long t2 = GetTime();
+
+        cout<<object->GetId()<<" "<<TimeDiff(t1, t2);
+
         if (mViewCellsType == BSP_VIEW_CELLS)
-        {
-                // cast ray to BSP tree to get intersection with view cells
-                if (mBspTree)
                 {
-                        mBspTree->CastRay(ray);
-                
-                        sampleContributions += AddObjectSamples(object, ray);
+                        // cast ray to BSP tree to get intersection with view cells
+                        if (mBspTree)
+                                {
+                                        mBspTree->CastRay(ray);
+                                        
+                                        sampleContributions += AddObjectSamples(object, ray);
                                 
-                        if (!ray.intersections.empty()) // second intersection found
-                        {
-                                sampleContributions += 
-                                        AddObjectSamples(ray.intersections[0].mObject, ray);
-                        }
+                                        if (!ray.intersections.empty()) // second intersection found
+                                                {
+                                                        sampleContributions += 
+                                                                AddObjectSamples(ray.intersections[0].mObject, ray);
+                                                }
+                                }
                 }
-        }
         else
-        {
-                if (ray.leaves.size()) {
-                        sampleContributions += AddNodeSamples(object, ray);
-                
-                        if (ray.intersections.size()) {
-                                sampleContributions += AddNodeSamples(ray.intersections[0].mObject, ray);
-                        }
-                } 
-        }       
+                {
+                        if (ray.leaves.size()) {
+                                sampleContributions += AddNodeSamples(object, ray);
+                                
+                                if (ray.intersections.size()) {
+                                        sampleContributions += AddNodeSamples(ray.intersections[0].mObject, ray);
+                                }
+                        } 
+                }       
         
         return sampleContributions;