Changeset 424 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

Timestamp:

11/20/05 22:57:44 (19 years ago)

Author:

mattausch

Message:

 

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -274 +274 @@
 mRoot(NULL), 
 mGenerateViewCells(false),
-//-- factors for bsp tree split plane heuristics
-mVerticalSplitsFactor(1.0f),
-mLargestPolyAreaFactor(1.0f),
-mBlockedRaysFactor(1.0f),
-mLeastRaySplitsFactor(1.0f),
-mBalancedRaysFactor(1.0f),
-mPvsFactor(1.0f),
-mLeastSplitsFactor(1.0f),
-mBalancedPolysFactor(1.0f),
-mBalancedViewCellsFactor(1.0f),
-//------------------------------------
 mStoreLeavesWithRays(false),
 mPvsUseArea(true)
@@ -299 +288 @@
         environment->GetFloatValue("BspTree.Termination.maxAccRayLenght", mTermMaxAccRayLength);
 
+        //-- factors for bsp tree split plane heuristics
+        environment->GetFloatValue("BspTree.Factor.verticalSplits", mVerticalSplitsFactor);
+        environment->GetFloatValue("BspTree.Factor.largestPolyArea", mLargestPolyAreaFactor);
+        environment->GetFloatValue("BspTree.Factor.blockedRays", mBlockedRaysFactor);
+        environment->GetFloatValue("BspTree.Factor.leastRaySplits", mLeastRaySplitsFactor);
+        environment->GetFloatValue("BspTree.Factor.balancedRays", mBalancedRaysFactor);
+        environment->GetFloatValue("BspTree.Factor.pvsFactor", mPvsFactor);
+        environment->GetFloatValue("BspTree.Factor.leastSplits" , mLeastSplitsFactor);
+        environment->GetFloatValue("BspTree.Factor.balancedPolys", mBalancedPolysFactor);
+        environment->GetFloatValue("BspTree.Factor.balancedViewCells", mBalancedViewCellsFactor);
+        environment->GetFloatValue("BspTree.Termination.ct_div_ci", mCtDivCi);
+
         //-- termination criteria for axis aligned split
-        environment->GetFloatValue("BspTree.Termination.AxisAligned.ct_div_ci", mCtDivCi);
+        environment->GetFloatValue("BspTree.Termination.AxisAligned.ct_div_ci", mAaCtDivCi);
         environment->GetFloatValue("BspTree.Termination.AxisAligned.maxCostRatio", mMaxCostRatio);
         environment->GetIntValue("BspTree.Termination.AxisAligned.maxPolys", 
@@ -1034 +1035 @@
   
         float oldCost = (float)polys.size();
-        float newCost = mCtDivCi + minSum / boxArea;
+        float newCost = mAaCtDivCi + minSum / boxArea;
         float ratio = newCost / oldCost;
 
@@ -1491 +1492 @@
 
                         if (!mPvsUseArea) // use front and back cell areas to approximate volume
-                        {
+                        {       
                                 float len = Distance(entP, extP);
                                 pOverall += len;