Changeset 1444 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

09/21/06 12:16:04 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (9 diffs)

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

@@ -62 +62 @@
 {
         MailablePvsData *vdata = obj->mViewCellPvs.Find(vc);
-//return false;
+
         if (vdata)
         {
@@ -128 +128 @@
 
         app << "#N_RAYS (number of rays / leaf)\n" << AvgRays() << endl;
-        //app << "#N_PVS: " << pvs << endl;
-
-        //app << "#N_MAXOBJECTREFS  ( Max number of object refs / leaf )\n" << maxObjectRefs << "\n";
+        
 
         app << "========== END OF VspTree statistics ==========\n";
@@ -202 +200 @@
         mTreeValid = v;
 }
+
 
 
@@ -372 +371 @@
 mHierarchyManager(NULL)
 {
+        mLocalSubdivisionCandidates = new vector<SortableEntry>;
+
         bool randomize = false;
         Environment::GetSingleton()->GetBoolValue("VspTree.Construction.randomize", randomize);
@@ -377 +378 @@
                 Randomize(); // initialise random generator for heuristics
 
+        char subdivisionStatsLog[100];
+        Environment::GetSingleton()->GetStringValue("VspTree.subdivisionStats", subdivisionStatsLog);
+        mSubdivisionStats.open(subdivisionStatsLog);
+
+        /////////////
         //-- termination criteria for autopartition
+
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.maxDepth", mTermMaxDepth);
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.minPvs", mTermMinPvs);
@@ -386 +393 @@
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.missTolerance", mTermMissTolerance);
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.maxViewCells", mMaxViewCells);
-
-        //-- max cost ratio for early tree termination
+        // max cost ratio for early tree termination
         Environment::GetSingleton()->GetFloatValue("VspTree.Termination.maxCostRatio", mTermMaxCostRatio);
 
@@ -393 +399 @@
         Environment::GetSingleton()->GetIntValue("VspTree.Termination.globalCostMissTolerance", mTermGlobalCostMissTolerance);
 
+        Environment::GetSingleton()->GetFloatValue("VspTree.maxStaticMemory", mMaxMemory);
+
+
+        //////////////
         //-- factors for bsp tree split plane heuristics
+
         Environment::GetSingleton()->GetFloatValue("VspTree.Termination.ct_div_ci", mCtDivCi);
-
-        //-- partition criteria
         Environment::GetSingleton()->GetFloatValue("VspTree.Construction.epsilon", mEpsilon);
+        Environment::GetSingleton()->GetFloatValue("VspTree.Construction.minBand", mMinBand);
+        Environment::GetSingleton()->GetFloatValue("VspTree.Construction.maxBand", mMaxBand);
+        Environment::GetSingleton()->GetIntValue("VspTree.maxTests", mMaxTests);
+
         Environment::GetSingleton()->GetFloatValue("VspTree.Construction.renderCostDecreaseWeight", mRenderCostDecreaseWeight);
-
+        
         // if only the driving axis is used for axis aligned split
         Environment::GetSingleton()->GetBoolValue("VspTree.splitUseOnlyDrivingAxis", mOnlyDrivingAxis);
-        
-        Environment::GetSingleton()->GetIntValue("VspTree.maxTests", mMaxTests);
-        Environment::GetSingleton()->GetFloatValue("VspTree.maxStaticMemory", mMaxMemory);
-
         Environment::GetSingleton()->GetBoolValue("VspTree.useCostHeuristics", mUseCostHeuristics);
         Environment::GetSingleton()->GetBoolValue("VspTree.simulateOctree", mCirculatingAxis);
-        
-        //Environment::GetSingleton()->GetBoolValue("VspTree.useKdPvsForHeuristics", mUseKdPvsForHeuristics);
-
-        char subdivisionStatsLog[100];
-        Environment::GetSingleton()->GetStringValue("VspTree.subdivisionStats", subdivisionStatsLog);
-        mSubdivisionStats.open(subdivisionStatsLog);
-
-        Environment::GetSingleton()->GetFloatValue("VspTree.Construction.minBand", mMinBand);
-        Environment::GetSingleton()->GetFloatValue("VspTree.Construction.maxBand", mMaxBand);
-        
-
+
+
+        //////////////
         //-- debug output
 
@@ -445 +446 @@
         Debug << "maxband: " << mMaxBand << endl;
 
-        mLocalSubdivisionCandidates = new vector<SortableEntry>;
-
         Debug << endl;
 }
@@ -565 +564 @@
                 );
 
-        if (0 && terminationCriteriaMet)
+        if (1 && terminationCriteriaMet)
         {
                 Debug << "vsp global termination criteria met:" << endl;