Changeset 1665 for GTP

Timestamp:

10/23/06 10:38:44 (18 years ago)

Author:

mattausch

Message:

improved ratio method for vsposp subdivision

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (4 diffs)
• Environment.cpp (modified) (2 diffs)
• VspTree.cpp (modified) (4 diffs)

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

@@ -543 +543 @@
                 const float factor = mRenderCostDecreaseWeight;
                 
+                priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+
                 // take render cost of node into account 
                 // otherwise danger of being stuck in a local minimum!!
@@ -549 +551 @@
                         //cout << "here7 rc: " << factor * renderCostDecr << " pvs: " << (1.0f - factor) * splitCandidate.GetPvsEntriesIncr() << endl;
                         //priority = factor * renderCostDecr - (1.0f - factor) * splitCandidate.GetPvsEntriesIncr();// / mBvhStats.Leaves();
-                        priority = renderCostDecr / ((float)splitCandidate.GetPvsEntriesIncr() + 1.0f);
-                }
-                else
-                {
-                        priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+                        priority /= ((float)splitCandidate.GetPvsEntriesIncr() + 1.0f);
                 }
         }
@@ -584 +582 @@
         const float factor = mRenderCostDecreaseWeight;
         
-        float priority;
+        float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
 
         // $$ matt temp
@@ -591 +589 @@
                 //cout << "here5 rc: " << factor * renderCostDecr << " pvs: " << (1.0f - factor) * splitCandidate.GetPvsEntriesIncr() << endl;
                 //const float priority = factor * renderCostDecr - (1.0f - factor) * (float)splitCandidate.GetPvsEntriesIncr();
-                priority = renderCostDecr / ((float)splitCandidate.GetPvsEntriesIncr() + 1.0f);
-        }
-        else
-        {
-                priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-        }
-
+                priority /= ((float)splitCandidate.GetPvsEntriesIncr() + 1.0f);
+        }
+        
         return priority;
 }

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

@@ -2171 +2171 @@
                                 optFloat,
                                 "vsp_construction_render_cost_decrease_weight=",
-                                "1.0");
+                                "0.99");
 
         RegisterOption("VspTree.Termination.maxDepth",
@@ -2459 +2459 @@
                                    optFloat,
                                    "bvh_construction_render_cost_decrease_weight=",
-                                   "1.0");
+                                   "0.99");
         
         RegisterOption("BvHierarchy.Construction.useGlobalSorting",

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

@@ -822 +822 @@
         const float factor = mRenderCostDecreaseWeight;
 
-        float priority;
+        float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
 
         if (mHierarchyManager->mConsiderMemory)
@@ -828 +828 @@
                 //cout << "here4 rc: " << factor * renderCostDecr << " pvs: " << (1.0f - factor) * splitCandidate.GetPvsEntriesIncr() << endl;
                 //const float priority = factor * renderCostDecr - (1.0f - factor) * splitCandidate.GetPvsEntriesIncr();
-                priority = renderCostDecr / ((float)splitCandidate.GetPvsEntriesIncr() +  + 1.0f);
-        }
-        else
-        {
-                priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+                priority /= ((float)splitCandidate.GetPvsEntriesIncr() +  + 1.0f);
         }
         
@@ -851 +847 @@
         const float factor = mRenderCostDecreaseWeight;
 
-        float priority;
+        float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
 
         if (mHierarchyManager->mConsiderMemory)
@@ -857 +853 @@
                 //cout << "here2 rc: " << factor * renderCostDecr << " pvs: " << (1.0f - factor) * splitCandidate.GetPvsEntriesIncr() << endl; 
                 //const float priority = factor * renderCostDecr - (1.0f - factor) * splitCandidate.GetPvsEntriesIncr();
-                priority = renderCostDecr / ((float)splitCandidate.GetPvsEntriesIncr() + 1.0f);
-        }
-        else
-        {
-                priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
+                priority /= ((float)splitCandidate.GetPvsEntriesIncr() + 1.0f);
         }