Changeset 1905 for GTP/trunk

Timestamp:

12/17/06 04:10:08 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -1551 +1551 @@
         Intersectable::NewMail(3);
         KdLeaf::NewMail(3);
-        BvhLeaf::NewMail(3);
+        //BvhLeaf::NewMail(3);
 
         RayInfoContainer::const_iterator rit, rit_end = data.mRays->end();
@@ -1583 +1583 @@
         // probability that view point lies in back / front node
         float pOverall = data.mProbability;
-        float pFront = pFront = frontBox.GetVolume();
+        float pFront = frontBox.GetVolume();
         float pBack = pOverall - pFront;
 
@@ -1590 +1590 @@
         //-- evaluate render cost heuristics
 
-        const float lowerPvsLimit = (float)mViewCellsManager->GetMinPvsSize();
-        const float upperPvsLimit = (float)mViewCellsManager->GetMaxPvsSize();
-
-        const float penaltyOld = EvalPvsPenalty(totalPvs, lowerPvsLimit, upperPvsLimit);
-    const float penaltyFront = EvalPvsPenalty(pvsFront, lowerPvsLimit, upperPvsLimit);
-        const float penaltyBack = EvalPvsPenalty(pvsBack, lowerPvsLimit, upperPvsLimit);
+        const float penaltyOld = totalPvs;
+    const float penaltyFront = pvsFront;
+        const float penaltyBack = pvsBack;
                         
         const float oldRenderCost = pOverall * penaltyOld;
@@ -1759 +1756 @@
                         // already in front pvs => in both pvss
                         if (leaf->Mailed())
-                        {
                                 leaf->Mail(2);
-                        }
                         else
                                 leaf->Mail(1);