Changeset 1004 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.cpp

Timestamp:

06/07/06 18:38:29 (18 years ago)

Author:

mattausch

Message:

environment as a singleton

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.cpp (modified) (1 diff)

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

@@ -227 +227 @@
 
         //-- termination criteria for autopartition
-        environment->GetIntValue("BspTree.Termination.maxDepth", mTermMaxDepth);
-        environment->GetIntValue("BspTree.Termination.minPvs", mTermMinPvs);
-        environment->GetIntValue("BspTree.Termination.minPolygons", mTermMinPolys);
-        environment->GetIntValue("BspTree.Termination.minRays", mTermMinRays);
-        environment->GetFloatValue("BspTree.Termination.minProbability", mTermMinProbability);  
-        environment->GetFloatValue("BspTree.Termination.maxRayContribution", mTermMaxRayContribution);
-        environment->GetFloatValue("BspTree.Termination.minAccRayLenght", mTermMinAccRayLength);
+        Environment::GetSingleton()->GetIntValue("BspTree.Termination.maxDepth", mTermMaxDepth);
+        Environment::GetSingleton()->GetIntValue("BspTree.Termination.minPvs", mTermMinPvs);
+        Environment::GetSingleton()->GetIntValue("BspTree.Termination.minPolygons", mTermMinPolys);
+        Environment::GetSingleton()->GetIntValue("BspTree.Termination.minRays", mTermMinRays);
+        Environment::GetSingleton()->GetFloatValue("BspTree.Termination.minProbability", mTermMinProbability);  
+        Environment::GetSingleton()->GetFloatValue("BspTree.Termination.maxRayContribution", mTermMaxRayContribution);
+        Environment::GetSingleton()->GetFloatValue("BspTree.Termination.minAccRayLenght", mTermMinAccRayLength);
 
         //-- 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.pvs", 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);
+        Environment::GetSingleton()->GetFloatValue("BspTree.Factor.verticalSplits", mVerticalSplitsFactor);
+        Environment::GetSingleton()->GetFloatValue("BspTree.Factor.largestPolyArea", mLargestPolyAreaFactor);
+        Environment::GetSingleton()->GetFloatValue("BspTree.Factor.blockedRays", mBlockedRaysFactor);
+        Environment::GetSingleton()->GetFloatValue("BspTree.Factor.leastRaySplits", mLeastRaySplitsFactor);
+        Environment::GetSingleton()->GetFloatValue("BspTree.Factor.balancedRays", mBalancedRaysFactor);
+        Environment::GetSingleton()->GetFloatValue("BspTree.Factor.pvs", mPvsFactor);
+        Environment::GetSingleton()->GetFloatValue("BspTree.Factor.leastSplits" , mLeastSplitsFactor);
+        Environment::GetSingleton()->GetFloatValue("BspTree.Factor.balancedPolys", mBalancedPolysFactor);
+        Environment::GetSingleton()->GetFloatValue("BspTree.Factor.balancedViewCells", mBalancedViewCellsFactor);
+        Environment::GetSingleton()->GetFloatValue("BspTree.Termination.ct_div_ci", mCtDivCi);
 
         //-- termination criteria for axis aligned split
-        environment->GetFloatValue("BspTree.Termination.AxisAligned.ct_div_ci", mAxisAlignedCtDivCi);
-        environment->GetFloatValue("BspTree.Termination.maxCostRatio", mMaxCostRatio);
-        environment->GetIntValue("BspTree.Termination.AxisAligned.minPolys", 
+        Environment::GetSingleton()->GetFloatValue("BspTree.Termination.AxisAligned.ct_div_ci", mAxisAlignedCtDivCi);
+        Environment::GetSingleton()->GetFloatValue("BspTree.Termination.maxCostRatio", mMaxCostRatio);
+        Environment::GetSingleton()->GetIntValue("BspTree.Termination.AxisAligned.minPolys", 
                                                          mTermMinPolysForAxisAligned);
-        environment->GetIntValue("BspTree.Termination.AxisAligned.minRays", 
+        Environment::GetSingleton()->GetIntValue("BspTree.Termination.AxisAligned.minRays", 
                                                          mTermMinRaysForAxisAligned);
-        environment->GetIntValue("BspTree.Termination.AxisAligned.minObjects", 
+        Environment::GetSingleton()->GetIntValue("BspTree.Termination.AxisAligned.minObjects", 
                                                          mTermMinObjectsForAxisAligned);
         //-- partition criteria
-        environment->GetIntValue("BspTree.maxPolyCandidates", mMaxPolyCandidates);
-        environment->GetIntValue("BspTree.maxRayCandidates", mMaxRayCandidates);
-        environment->GetIntValue("BspTree.splitPlaneStrategy", mSplitPlaneStrategy);
-        environment->GetFloatValue("BspTree.AxisAligned.splitBorder", mSplitBorder);
-        environment->GetIntValue("BspTree.maxTests", mMaxTests);
-        environment->GetIntValue("BspTree.Termination.maxViewCells", mMaxViewCells);
-
-        environment->GetFloatValue("BspTree.Construction.epsilon", mEpsilon);
+        Environment::GetSingleton()->GetIntValue("BspTree.maxPolyCandidates", mMaxPolyCandidates);
+        Environment::GetSingleton()->GetIntValue("BspTree.maxRayCandidates", mMaxRayCandidates);
+        Environment::GetSingleton()->GetIntValue("BspTree.splitPlaneStrategy", mSplitPlaneStrategy);
+        Environment::GetSingleton()->GetFloatValue("BspTree.AxisAligned.splitBorder", mSplitBorder);
+        Environment::GetSingleton()->GetIntValue("BspTree.maxTests", mMaxTests);
+        Environment::GetSingleton()->GetIntValue("BspTree.Termination.maxViewCells", mMaxViewCells);
+
+        Environment::GetSingleton()->GetFloatValue("BspTree.Construction.epsilon", mEpsilon);
 
         char subdivisionStatsLog[100];
-        environment->GetStringValue("BspTree.subdivisionStats", subdivisionStatsLog);
+        Environment::GetSingleton()->GetStringValue("BspTree.subdivisionStats", subdivisionStatsLog);
         mSubdivisionStats.open(subdivisionStatsLog);