Changeset 1610 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

10/11/06 05:35:33 (18 years ago)

Author:

mattausch

Message:

removed vsposp bug

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (1 diff)
• HierarchyManager.cpp (modified) (5 diffs)
• VspTree.cpp (modified) (4 diffs)

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

@@ -544 +544 @@
 inline bool BvHierarchy::GlobalTerminationCriteriaMet(const BvhTraversalData &data) const
 {
+        // note: tracking for global cost termination 
+        // does not make much sense for interleaved vsp / osp partition
+        // as it is the responsibility of the hierarchy manager
+
         const bool terminationCriteriaMet =
                 (0
                 || (mBvhStats.Leaves() >= mTermMaxLeaves)
-                // does not make much sense for interleaved vsp / osp partition
                 //|| (mBvhStats.mGlobalCostMisses >= mTermGlobalCostMissTolerance)
                 //|| mOutOfMemory 
                 );
 
-        if (0 && terminationCriteriaMet)
+        if (1 && terminationCriteriaMet)
         {
                 Debug << "bvh global termination criteria met:" << endl;

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

@@ -231 +231 @@
                 );
 
-        if (0 && terminationCriteriaMet)
+#if _DEBUG
+        if (terminationCriteriaMet)
         {
                 Debug << "hierarchy global termination criteria met:" << endl;
@@ -237 +238 @@
                 Debug << "cost misses: " << mHierarchyStats.mGlobalCostMisses << " " << mTermGlobalCostMissTolerance << endl;
         }
+#endif
+
         return terminationCriteriaMet;
 }
@@ -327 +330 @@
 
         mTotalCost = mVspTree->mTotalCost;
-        Debug << "\nreseting cost, new total cost: " << mTotalCost << endl;
+        cout << "\nreseting cost for vsp, new total cost: " << mTotalCost << endl;
 
         mTQueue.Push(vsc);
@@ -392 +395 @@
 bool HierarchyManager::ApplySubdivisionCandidate(SubdivisionCandidate *sc, const bool repairQueue)
 {
+        // test if global termination criteria were met before this split
         const bool globalTerminationCriteriaMet = GlobalTerminationCriteriaMet(sc);
         const bool vspSplit = (sc->Type() == SubdivisionCandidate::VIEW_SPACE);
 
-        if (!globalTerminationCriteriaMet)
-        {
-                // cost ratio of cost decrease / totalCost
-                const float costRatio = mCurrentCandidate->GetRenderCostDecrease() / mTotalCost;
-                //Debug << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
-        
-                if (costRatio < mTermMinGlobalCostRatio)
-                {
-                        ++ mHierarchyStats.mGlobalCostMisses;
-                }
-
-                mTotalCost -= mCurrentCandidate->GetRenderCostDecrease();
-        }
-
-        bool success;
+        bool success = false;
+
         switch (sc->Type())
         {
@@ -438 +429 @@
         }
 
+        if (!success) // split was not taken
+        {
+                return false;
+        }
+
+        ///////////////
+        //-- split was successful => 
+        //-- update stats and render queue
+
+    // cost ratio of cost decrease / totalCost
+        const float costRatio = mCurrentCandidate->GetRenderCostDecrease() / mTotalCost;
+        //Debug << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
+        
+        if (costRatio < mTermMinGlobalCostRatio)
+        {
+                ++ mHierarchyStats.mGlobalCostMisses;
+        }
+        
+        mTotalCost -= mCurrentCandidate->GetRenderCostDecrease();
+        
         cout << sc->Type() << " ";
                 

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

@@ -582 +582 @@
                 );
 
-        if (0 && localTerminationCriteriaMet)
+#if _DEBUG
+        if (localTerminationCriteriaMet)
         {
                 Debug << "local termination criteria met:" << endl;
@@ -591 +592 @@
                 Debug << "depth " << data.mDepth << " " << mTermMaxDepth << endl;
         }
-
+#endif
         return localTerminationCriteriaMet;             
 }
@@ -598 +599 @@
 inline bool VspTree::GlobalTerminationCriteriaMet(const VspTraversalData &data) const
 {
+        // note: to track for global cost misses does not really 
+        // make sense because cost termination  happens in the hierarchy mananger
+
         const bool terminationCriteriaMet = (0
                 // || mOutOfMemory
                 || (mVspStats.Leaves() >= mMaxViewCells)
-                // does not really make sense because cost termination already in hierarchy
                 // || (mVspStats.mGlobalCostMisses >= mTermGlobalCostMissTolerance) 
                 );
 
-        if (0 && terminationCriteriaMet)
+#if _DEBUG
+        if (terminationCriteriaMet)
         {
                 Debug << "vsp global termination criteria met:" << endl;
@@ -611 +615 @@
                 Debug << "leaves: " << mVspStats.Leaves() << " " <<  mMaxViewCells << endl;
         }
+#endif
 
         return terminationCriteriaMet;