Changeset 481 for trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

Timestamp:

12/24/05 09:52:23 (19 years ago)

Author:

mattausch

Message:

removed axis aligned options for vsp bsp.
updated axis aligned heuristics for vsp bsp

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -590 +590 @@
                                                                                   const AxisAlignedBox3 &box,
                                                                                   const int pvsSize,
-                                                                                  int &axis,
+                                                                                  const int &axis,
                                           float &position)
 {
@@ -599 +599 @@
         int pvsFront;
 
-        axis = box.Size().DrivingAxis();
+        //axis = box.Size().DrivingAxis();
 
         SortSplitCandidates(rays, axis);
@@ -724 +724 @@
                 box.Include((*ri).ExtrapTermination());
 
-        int axis = 0;
         const bool useCostHeuristics = false;
-
-        if (useCostHeuristics)
-        {
-                float position;
-
-                const float ratio = 
-                        BestCostRatioHeuristics(*tData.mRays,
-                                                                    box,
-                                                                        tData.mPvs,
-                                                                        axis,
-                                                                        position);
-
-                Vector3 normal(0,0,0); normal[axis] = 1;
-                plane = Plane3(normal, position);
-
-                return ratio;
-        }
 
         //-- regular split
@@ -753 +735 @@
         const int sAxis = box.Size().DrivingAxis();
                 
-        for (axis = 0; axis < 3; ++ axis)
+        for (int axis = 0; axis < 3; ++ axis)
         {
                 if (!mOnlyDrivingAxis || axis == sAxis)
@@ -764 +746 @@
                                 nCostRatio[axis] = SplitPlaneCost(Plane3(normal, nPosition[axis]), tData);
                         }
-                        
+                        else
+                        {
+                                nCostRatio[axis] = 
+                                        BestCostRatioHeuristics(*tData.mRays,
+                                                                                    box,
+                                                                                        tData.mPvs,
+                                                                                        axis,
+                                                                                        nPosition[axis]);
+                        }
+
                         if (bestAxis == -1)
                         {