Changeset 1668 for GTP/trunk/Lib/Vis

Timestamp:

10/23/06 20:32:01 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -821 +821 @@
 
         // take render cost of node into account 
-        // otherwise danger of being stuck in a local minimum!!
+        // otherwise danger of being stuck in a local minimum!
         const float factor = mRenderCostDecreaseWeight;
         float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
@@ -832 +832 @@
         splitCandidate.SetPriority(priority);
 }
-
-
-/*float VspTree::EvalPriority(const VspSubdivisionCandidate &splitCandidate) const
-{
-        // compute global decrease in render cost
-        float oldRenderCost;
-        const float renderCostDecr = EvalRenderCostDecrease(splitCandidate.mSplitPlane, 
-                                                                                                                splitCandidate.mParentData,
-                                                                                                                oldRenderCost);
-    
-        // take render cost of node into account 
-        // otherwise danger of being stuck in a local minimum!!
-        const float factor = mRenderCostDecreaseWeight;
-
-        float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-
-        if (mHierarchyManager->mConsiderMemory)
-        {
-                //cout << "here2 rc: " << factor * renderCostDecr << " pvs: " << (1.0f - factor) * splitCandidate.GetPvsEntriesIncr() << endl; 
-                //const float priority = factor * renderCostDecr - (1.0f - factor) * splitCandidate.GetPvsEntriesIncr();
-                priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mHierarchyManager->mMemoryConst);
-        }
-
-        return priority;
-}*/
 
 
@@ -865 +840 @@
         float bPvsSize = 0;
         
-        AxisAlignedPlane candidatePlane = splitCandidate.mSplitPlane;
+        const AxisAlignedPlane candidatePlane = splitCandidate.mSplitPlane;
         
         Intersectable::NewMail(3);
@@ -881 +856 @@
                 float t;
                 // classify ray
-                const int cf = 
-                        rayInf.ComputeRayIntersection(candidatePlane.mAxis, 
-                                                                                  candidatePlane.mPosition, t);
+                const int cf =  rayInf.ComputeRayIntersection(candidatePlane.mAxis, 
+                                                                                                          candidatePlane.mPosition, t);
 
                 UpdatePvsEntriesContribution(*ray, true, cf, fPvsSize, bPvsSize, oldPvsSize);
@@ -890 +864 @@
 #endif
         }
-        //cout << "pvs entries: " << fPvsSize << " " << bPvsSize << " " << oldPvsSize << endl;
 
         return (int)(fPvsSize + bPvsSize - oldPvsSize);
@@ -933 +906 @@
         
         if (tData.mDepth > mVspStats.maxDepth)
-        {       //Debug << "max depth increases to " << tData.mDepth << " at " << mVspStats.Leaves() << " leaves" << endl;
+        {       
                 mVspStats.maxDepth = tData.mDepth;
         }
@@ -996 +969 @@
         return interior;
 }
-
-