Changeset 1744 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

Timestamp:

11/13/06 21:25:40 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp (modified) (11 diffs)

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

@@ -91 +91 @@
                 << "#FullMem\n" << mFullMemory << endl
                 << "#RenderCostDecrease\n" << mRenderCostDecrease << endl
+                << "#Priority\n" << mPriority << endl
                 << "#FpsPerMb\n" << FpsPerMb() << endl
                 << endl;
@@ -142 +143 @@
         Environment::GetSingleton()->GetBoolValue(
                 "Hierarchy.Construction.considerMemory", mConsiderMemory);
-
-        Environment::GetSingleton()->GetBoolValue(
-                "Hierarchy.Construction.considerMemory2", mConsiderMemory2);
 
         Environment::GetSingleton()->GetFloatValue(
@@ -166 +164 @@
         Debug << "maximal allowed memory: " << mTermMaxMemory << endl;
         Debug << "consider memory: " << mConsiderMemory << endl;
-        Debug << "consider memory2: " << mConsiderMemory << endl;
         Debug << "min steps of same kind: " << mMinStepsOfSameType << endl;
         Debug << "max steps of same kind: " << mMaxStepsOfSameType << endl;
@@ -266 +263 @@
 {
         SubdivisionCandidate *splitCandidate = splitQueue.Top();
-
-        if (splitCandidate->IsDirty())
-                splitCandidate->EvalCandidate();
-
         splitQueue.Pop();
 
@@ -287 +280 @@
                 
         HierarchySubdivisionStats stats;
+
         stats.mNumSplits = mHierarchyStats.Leaves();
         stats.mTotalRenderCost = mHierarchyStats.mTotalCost;
@@ -295 +289 @@
         stats.mViewSpaceSplits = mVspTree->mVspStats.Leaves();
         stats.mObjectSpaceSplits = GetObjectSpaceSubdivisionLeaves();
-        
+        stats.mRenderCostDecrease = mHierarchyStats.mRenderCostDecrease;
+        stats.mPriority = mPriority;
+
         stats.Print(mSubdivisionStats);
 }
@@ -740 +736 @@
         const bool success = sc->Apply(splitQueue, terminationCriteriaMet);
 
+        if (sc->IsDirty())
+                cout << "*******************************error!" << endl;
+
         if (!success) // split was not taken
         {
+                cout << "x";
                 return false;
         }
 
+        //cout << "priority: " << sc->GetPriority() << " rc decr: " << sc->GetRenderCostDecrease() << " | ";
         ///////////////
         //-- split was successful => update stats and queue
@@ -750 +751 @@
     // cost ratio of cost decrease / totalCost
         const float costRatio = sc->GetRenderCostDecrease() / mHierarchyStats.mTotalCost;
-        //Debug << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
+        //cout << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
         
         if (costRatio < mTermMinGlobalCostRatio)
@@ -772 +773 @@
         mHierarchyStats.mMemory += (float)ObjectPvs::GetEntrySizeByte() * pvsEntriesIncr;
         mHierarchyStats.mRenderCostDecrease = sc->GetRenderCostDecrease();
+        
+        mPriority = sc->GetPriority();
 
         static float memoryCount = 0;
@@ -1391 +1394 @@
         {
                 SubdivisionCandidate *candidate = NextSubdivisionCandidate(splitQueue);
-                 // reevaluate local split plane and priority
+                
+                // reevaluate local split plane and priority
                 candidate->EvalCandidate(recomputeSplitPlane);
                 cout << ".";
@@ -1924 +1928 @@
         subStats.mViewSpaceSplits = 0;
         subStats.mObjectSpaceSplits = 0;
-        
+        subStats.mRenderCostDecrease = 0;
         subStats.Print(stats);