Changeset 1004 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.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/VspBspTree.cpp (modified) (4 diffs)

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

@@ -55 +55 @@
 
 
-VspBspTree::VspBspTree(Environment *env):
+VspBspTree::VspBspTree():
 mRoot(NULL),
 mUseAreaForPvs(false),
@@ -67 +67 @@
 {
         bool randomize = false;
-        env->GetBoolValue("VspBspTree.Construction.randomize", randomize);
+        Environment::GetSingleton()->GetBoolValue("VspBspTree.Construction.randomize", randomize);
         if (randomize)
                 Randomize(); // initialise random generator for heuristics
 
         //-- termination criteria for autopartition
-        env->GetIntValue("VspBspTree.Termination.maxDepth", mTermMaxDepth);
-        env->GetIntValue("VspBspTree.Termination.minPvs", mTermMinPvs);
-        env->GetIntValue("VspBspTree.Termination.minRays", mTermMinRays);
-        env->GetFloatValue("VspBspTree.Termination.minProbability", mTermMinProbability);
-        env->GetFloatValue("VspBspTree.Termination.maxRayContribution", mTermMaxRayContribution);
-        env->GetFloatValue("VspBspTree.Termination.minAccRayLenght", mTermMinAccRayLength);
-        env->GetFloatValue("VspBspTree.Termination.maxCostRatio", mTermMaxCostRatio);
-        env->GetIntValue("VspBspTree.Termination.missTolerance", mTermMissTolerance);
-        env->GetIntValue("VspBspTree.Termination.maxViewCells", mMaxViewCells);
+        Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.maxDepth", mTermMaxDepth);
+        Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.minPvs", mTermMinPvs);
+        Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.minRays", mTermMinRays);
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.minProbability", mTermMinProbability);
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.maxRayContribution", mTermMaxRayContribution);
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.minAccRayLenght", mTermMinAccRayLength);
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.maxCostRatio", mTermMaxCostRatio);
+        Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.missTolerance", mTermMissTolerance);
+        Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.maxViewCells", mMaxViewCells);
 
         //-- max cost ratio for early tree termination
-        env->GetFloatValue("VspBspTree.Termination.maxCostRatio", mTermMaxCostRatio);
-
-        env->GetFloatValue("VspBspTree.Termination.minGlobalCostRatio", mTermMinGlobalCostRatio);
-        env->GetIntValue("VspBspTree.Termination.globalCostMissTolerance", mTermGlobalCostMissTolerance);
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.maxCostRatio", mTermMaxCostRatio);
+
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.minGlobalCostRatio", mTermMinGlobalCostRatio);
+        Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.globalCostMissTolerance", mTermGlobalCostMissTolerance);
 
         // HACK//mTermMinPolygons = 25;
 
         //-- factors for bsp tree split plane heuristics
-        env->GetFloatValue("VspBspTree.Factor.pvs", mPvsFactor);
-        env->GetFloatValue("VspBspTree.Termination.ct_div_ci", mCtDivCi);
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.Factor.pvs", mPvsFactor);
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.ct_div_ci", mCtDivCi);
 
 
         //-- partition criteria
-        env->GetIntValue("VspBspTree.maxPolyCandidates", mMaxPolyCandidates);
-        env->GetIntValue("VspBspTree.maxRayCandidates", mMaxRayCandidates);
-        env->GetIntValue("VspBspTree.splitPlaneStrategy", mSplitPlaneStrategy);
-
-        env->GetFloatValue("VspBspTree.Construction.epsilon", mEpsilon);
-        env->GetIntValue("VspBspTree.maxTests", mMaxTests);
+        Environment::GetSingleton()->GetIntValue("VspBspTree.maxPolyCandidates", mMaxPolyCandidates);
+        Environment::GetSingleton()->GetIntValue("VspBspTree.maxRayCandidates", mMaxRayCandidates);
+        Environment::GetSingleton()->GetIntValue("VspBspTree.splitPlaneStrategy", mSplitPlaneStrategy);
+
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.Construction.epsilon", mEpsilon);
+        Environment::GetSingleton()->GetIntValue("VspBspTree.maxTests", mMaxTests);
 
         // if only the driving axis is used for axis aligned split
-        env->GetBoolValue("VspBspTree.splitUseOnlyDrivingAxis", mOnlyDrivingAxis);
+        Environment::GetSingleton()->GetBoolValue("VspBspTree.splitUseOnlyDrivingAxis", mOnlyDrivingAxis);
         
         //-- termination criteria for axis aligned split
-        env->GetFloatValue("VspBspTree.Termination.AxisAligned.maxRayContribution", 
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.AxisAligned.maxRayContribution", 
                                                                 mTermMaxRayContriForAxisAligned);
-        env->GetIntValue("VspBspTree.Termination.AxisAligned.minRays",
+        Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.AxisAligned.minRays",
                                                          mTermMinRaysForAxisAligned);
 
-        //env->GetFloatValue("VspBspTree.maxTotalMemory", mMaxTotalMemory);
-        env->GetFloatValue("VspBspTree.maxStaticMemory", mMaxMemory);
-
-        env->GetFloatValue("VspBspTree.Construction.renderCostWeight", mRenderCostWeight);
-        env->GetBoolValue("VspBspTree.usePolygonSplitIfAvailable", mUsePolygonSplitIfAvailable);
-
-        env->GetBoolValue("VspBspTree.useCostHeuristics", mUseCostHeuristics);
-        env->GetBoolValue("VspBspTree.useSplitCostQueue", mUseSplitCostQueue);
-        env->GetBoolValue("VspBspTree.simulateOctree", mCirculatingAxis);
-        env->GetBoolValue("VspBspTree.useRandomAxis", mUseRandomAxis);
-        env->GetIntValue("VspBspTree.nodePriorityQueueType", mNodePriorityQueueType);
-
-        env->GetBoolValue("ViewCells.PostProcess.emptyViewCellsMerge", mEmptyViewCellsMergeAllowed);
+        //Environment::GetSingleton()->GetFloatValue("VspBspTree.maxTotalMemory", mMaxTotalMemory);
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.maxStaticMemory", mMaxMemory);
+
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.Construction.renderCostWeight", mRenderCostWeight);
+        Environment::GetSingleton()->GetBoolValue("VspBspTree.usePolygonSplitIfAvailable", mUsePolygonSplitIfAvailable);
+
+        Environment::GetSingleton()->GetBoolValue("VspBspTree.useCostHeuristics", mUseCostHeuristics);
+        Environment::GetSingleton()->GetBoolValue("VspBspTree.useSplitCostQueue", mUseSplitCostQueue);
+        Environment::GetSingleton()->GetBoolValue("VspBspTree.simulateOctree", mCirculatingAxis);
+        Environment::GetSingleton()->GetBoolValue("VspBspTree.useRandomAxis", mUseRandomAxis);
+        Environment::GetSingleton()->GetIntValue("VspBspTree.nodePriorityQueueType", mNodePriorityQueueType);
+
+        Environment::GetSingleton()->GetBoolValue("ViewCells.PostProcess.emptyViewCellsMerge", mEmptyViewCellsMergeAllowed);
         
         char subdivisionStatsLog[100];
-        env->GetStringValue("VspBspTree.subdivisionStats", subdivisionStatsLog);
+        Environment::GetSingleton()->GetStringValue("VspBspTree.subdivisionStats", subdivisionStatsLog);
         mSubdivisionStats.open(subdivisionStatsLog);
 
-        env->GetFloatValue("VspBspTree.Construction.minBand", mMinBand);
-        env->GetFloatValue("VspBspTree.Construction.maxBand", mMaxBand);
-        env->GetBoolValue("VspBspTree.Construction.useDrivingAxisForMaxCost", mUseDrivingAxisForMaxCost);
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.Construction.minBand", mMinBand);
+        Environment::GetSingleton()->GetFloatValue("VspBspTree.Construction.maxBand", mMaxBand);
+        Environment::GetSingleton()->GetBoolValue("VspBspTree.Construction.useDrivingAxisForMaxCost", mUseDrivingAxisForMaxCost);
 
         //-- debug output
@@ -198 +198 @@
         Debug << endl;
 }
-
+/*
 VspBspTree::VspBspTree():
 mRoot(NULL),
@@ -211 +211 @@
 mEpsilon(1e-6f)
 {
-}
+}*/
 
 BspViewCell *VspBspTree::GetOutOfBoundsCell()