Changeset 296 for trunk/VUT

Timestamp:

09/21/05 10:30:44 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT

Files:

• GtpVisibilityPreprocessor/src/ViewCellBsp.cpp (modified) (4 diffs)
• GtpVisibilityPreprocessor/src/ViewCellBsp.h (modified) (2 diffs)
• scripts/GtpVisibility.suo (modified) (previous)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -18 +18 @@
 int BspTree::sSplitPlaneStrategy = NEXT_POLYGON; 
 int BspTree::sConstructionMethod = VIEW_CELLS;
+float BspTree::sLeastSplitsFactor = 1.0f
+float BspTree::sBalancedTreeFactor = 2.0f;
+float BspTree::sVerticalFactor = 50.0f // very important criterium for 2.5d scenes
+
 
 /** Evaluates split plane classification with respect to the plane's 
@@ -688 +692 @@
         }
 
-        /*if (sSplitPlaneStrategy & DRIVING_AXIS)
+        /*if (sSplitPlaneStrategy & VERTICAL_AXIS)
         {
                 const float dot_thres = 0.999;
@@ -737 +741 @@
 float BspTree::EvalSplitPlane(const PolygonContainer &polys, const Plane3 &candidatePlane) const
 {
-        float sumBalanced = 0, sumLeastSplits, drivingAxis = 0;
-        
-        if (sSplitPlaneStrategy & DRIVING_AXIS)
-        {
-        drivingAxis = (candidatePlane.mNormal.DrivingAxis() == mBox.Size().DrivingAxis()) ?
-                        99.0f : 0.0f; // always prefer driving axis => very high value
+        float sumBalanced = 0, sumLeastSplits = 0, verticalAxis = 0;
+        
+        if (sSplitPlaneStrategy & VERTICAL_AXIS)
+        {
+                Vector3 thinAxis(0,0,0); thinAxis[mBox.size().ThinAxis()] = 1.0f;
+                // want to minimize this dot product
+                verticalAxis = DotProd(candidatePlane.mNormal, thinAxis);
+                
+        //drivingAxis = (candidatePlane.mNormal.DrivingAxis() == mBox.Size().DrivingAxis()) ? 99.0f : 0.0f;
         }
         if ((sSplitPlaneStrategy & BALANCED_TREE) || (sSplitPlaneStrategy & LEAST_SPLITS))
@@ -761 +768 @@
 
         // return linear combination of the sums
-        return fabs(sumBalanced) + sumLeastSplits + drivingAxis;
+        return sBalancedFactor * fabs(sumBalanced) + sLeastSplitsFactor * sumLeastSplits + sVerticalFactor * dotProd;
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -439 +439 @@
                   LEAST_SPLITS = 2, 
                   BALANCED_TREE = 4, 
-                  DRIVING_AXIS = 8, 
+                  VERTICAL_AXIS = 8, 
                   AXIS_ALIGNED = 16};
 
@@ -466 +466 @@
         static int sConstructionMethod;
 
+        static float sLeastSplitsFactor;
+        static float sBalancedTreeFactor;
+        static float sVerticalFactor;
+
 private:
         /** Evaluates split plane classification with respect to the plane's