Changeset 1149 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp

Timestamp:

07/25/06 08:42:07 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -1358 +1358 @@
                                           float &position)
 {
-        RayInfoContainer usedRays, savedRays;
-
-/*      if (mMaxTests < rays.size())
-        {
-                GetRaySets(rays, mMaxTests, usedRays, savedRays);
+        RayInfoContainer usedRays;
+
+        if (mMaxTests < rays.size())
+        {
+                GetRayInfoSets(rays, mMaxTests, usedRays);
         }
         else
-        {*/
+        {
                 usedRays = rays;
-        //}
+        }
 
         const float minBox = box.Min(axis);
@@ -1405 +1405 @@
 
         // set all object as belonging to the front pvs
-        for(ri = rays.begin(); ri != ri_end; ++ ri)
+        for(ri = usedRays.begin(); ri != ri_end; ++ ri)
         {
                 Intersectable *oObject = (*ri).mRay->mOriginObject;
@@ -1500 +1500 @@
                         
                         // HACK: current positition is BETWEEN visibility events
-                        if ((ci + 1) != ci_end)
+                        if (0 && ((ci + 1) != ci_end))
+                        {
                                 currentPos = ((*ci).value + (*(ci + 1)).value) * 0.5f;
+                        }
                         else
-                                currentPos = (*ci).value;                       
+                currentPos = (*ci).value;                       
 
                         //Debug  << "pos=" << (*ci).value << "\t pvs=(" <<  pvsl << "," << pvsr << ")" << endl;