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

Timestamp:

12/02/05 19:46:07 (19 years ago)

Author:

mattausch

Message:

fixed error in ray to vssray conversion

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -32 +32 @@
                                                            const Ray::Intersection &origin)
 {
-  ray.intersections.clear();
-  ray.kdLeaves.clear();
-  ray.testedObjects.clear();
-  ray.bspIntersections.clear();
+        ray.intersections.clear();
+        ray.kdLeaves.clear();
+        ray.testedObjects.clear();
+        ray.bspIntersections.clear();
   
         ray.mFlags |= Ray::STORE_KDLEAVES | Ray::STORE_BSP_INTERSECTIONS;
-  //  cout<<point<<" "<<direction<<endl;
-  ray.Init(point, direction, type);
+        //  cout<<point<<" "<<direction<<endl;
+
+        ray.Init(point, direction, type);
         ray.sourceObject = origin;
 }
@@ -319 +320 @@
                                         Ray *ray = new Ray();
 
-                                        // the source object
-                                        Ray::Intersection source = 
-                                                Ray::Intersection(0, reverseSample ? NULL : object, faceIndex);
-                        
                                         // construct a ray
-                                        SetupRay(*ray, point, direction, Ray::LOCAL_RAY, source);
+                                        SetupRay(*ray, point, direction, Ray::LOCAL_RAY, 
+                                                         Ray::Intersection(0, reverseSample ? NULL : object, faceIndex));
+
                                         passRays.push_back(ray);
                                         
@@ -428 +427 @@
                 {
                         for (it = newRays.begin(); it != it_end; ++ it)
+                        {
                                 mVssSampleRays.push_back(new VssRay(*(*it)));
+                        }
                 }
                 else
                 {
+                        // construct view cells using the collected samples
+                        cout << "building view cells from " << (int)mVssSampleRays.size() << " samples " << endl;
+
                         mViewCellsManager->Construct(objects, mVssSampleRays);
-        
-                        // construct view cells using the collected samples
-                        cout << "building view cells from " << (int)mSampleRays.size() << " samples " << endl;
-                
-                        // add contributions of saved samples to PVS
-                        //contributingSamples += mBspTree->GetStat().contributingSamples;
-                        //sampleContributions += mBspTree->GetStat().sampleContributions;
-
+                        
                         // throw away samples 
                         CLEAR_CONTAINER(mVssSampleRays);