Changeset 1909

Timestamp:

12/17/06 16:11:12 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (1 diff)
• VspTree.cpp (modified) (8 diffs)

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

@@ -656 +656 @@
                 const float avgRayContri = 
                         AvgRayContribution(pvs, splitCandidate.mParentData.mNumRays);
-
-                //Debug << "bvh avgRayContri: " << avgRayContri << " #pvs: " << pvs << " #rays: " << splitCandidate.mParentData.mNumRays << endl;
-                //cout << "bvh avgRayContri: " << avgRayContri << endl;
 
                 // high avg ray contri, the result is influenced by undersampling

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

@@ -863 +863 @@
         {
                 const int pvs = EvalPvsEntriesSize(*splitCandidate.mParentData.mRays);
-                const float avgRayContri = (float)pvs / ((float)splitCandidate.mParentData.mRays->size() + Limits::Small);
-
-                //Debug << "vsp avgRayContri: " << avgRayContri << " #pvs: " << pvs << " #rays: " << splitCandidate.mParentData.mRays->size() << endl;
-                //cout << "vsp avgRayContri: " << avgRayContri << endl;
+                const float avgRayContri = (float)pvs / 
+                        ((float)splitCandidate.mParentData.mRays->size() + Limits::Small);
 
                 // high avg ray contri very, the result is influenced by undersampling
@@ -977 +975 @@
 
 #if WORK_WITH_VIEWCELLS
-                // remove "parent" view cell from pvs of all objects (traverse trough rays)
+                // remove "parent" view cell from pvs of all objects (traverse through rays)
                 RemoveParentViewCellReferences(tData.mNode->GetViewCell());
 #endif
@@ -1200 +1198 @@
         }
 
+        //////
         //-- separately handle objects which are in several kd leaves
 
@@ -1396 +1395 @@
         //-- compute cost
 
-        const float lowerPvsLimit = (float)mViewCellsManager->GetMinPvsSize();
-        const float upperPvsLimit = (float)mViewCellsManager->GetMaxPvsSize();
-
         const float pOverall = sizeBox;
         const float pBack = position - minBox;
         const float pFront = maxBox - position;
 
-        const float penaltyOld = EvalPvsPenalty(pvsCost, lowerPvsLimit, upperPvsLimit);
-    const float penaltyFront = EvalPvsPenalty(pvsFront, lowerPvsLimit, upperPvsLimit);
-        const float penaltyBack = EvalPvsPenalty(pvsBack, lowerPvsLimit, upperPvsLimit);
+        const float penaltyOld = pvsCost;
+    const float penaltyFront = pvsFront;
+        const float penaltyBack = pvsBack;
         
         const float oldRenderCost = penaltyOld * pOverall + Limits::Small;
@@ -1486 +1482 @@
                         {
                                 //-- place split plane using heuristics
-
                                 nCostRatio[axis] =
                                         EvalLocalCostHeuristics(tData,
@@ -1497 +1492 @@
                         {
                                 //-- split plane position is spatial median                             
-                                
                                 nPosition[axis] = (box.Min()[axis] + box.Max()[axis]) * 0.5f;
                                 nCostRatio[axis] = EvalLocalSplitCost(tData,
@@ -1575 +1569 @@
         AxisAlignedBox3 backBox;
 
-        data.mBoundingBox.Split(candidatePlane.mAxis, candidatePlane.mPosition, frontBox, backBox);
+        data.mBoundingBox.Split(candidatePlane.mAxis, 
+                                                        candidatePlane.mPosition, 
+                                                        frontBox, 
+                                                        backBox);
 
         // probability that view point lies in back / front node
@@ -1609 +1606 @@
         return renderCostDecrease;
 }
-