Changeset 752 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp

Timestamp:

04/20/06 13:25:41 (18 years ago)

Author:

mattausch

Message:

after rendering workshop submissioin
x3dparser can use def - use constructs
implemented improved evaluation (samples are only stored in leaves, only propagate pvs size)

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp (modified) (18 diffs)

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

@@ -472 +472 @@
         
         mSubdivisionStats 
-                        << "#ViewCells\n1\n" <<  endl
-                        << "#RenderCostDecrease\n0\n" << endl 
+                        << "#ViewCells\n1" <<  endl
+                        << "#RenderCostDecrease\n0" << endl 
                         << "#TotalRenderCost\n" << mTotalCost << endl
                         << "#AvgRenderCost\n" << mTotalPvsSize << endl;
@@ -578 +578 @@
                         << "#ViewCells\n1\n" <<  endl
                         << "#RenderCostDecrease\n0\n" << endl 
-                        << "#dummy\n0\n" << endl
+                        << "#SplitCandidateCost\n0\n" << endl
                         << "#TotalRenderCost\n" << mTotalCost << endl
                         << "#AvgRenderCost\n" << mTotalPvsSize << endl;
@@ -773 +773 @@
                 AddToPvs(leaf, *tData.mRays, sampCon, conSamp);
 
+                // update single pvs parameter
+                viewCell->mPvsSize = viewCell->GetPvs().GetSize(); 
+                viewCell->mPvsSizeValid = true;
+
+
                 mBspStats.contributingSamples += conSamp;
                 mBspStats.sampleContributions +=(int) sampCon;
@@ -869 +874 @@
                                         << "#ViewCells\n" << mBspStats.Leaves() << endl
                                         << "#RenderCostDecrease\n" << -costDecr << endl
-                                        << "#dummy\n" << splitCandidate.GetCost() << endl
+                                        << "#SplitCandidateCost\n" << splitCandidate.GetCost() << endl
                                         << "#TotalRenderCost\n" << mTotalCost << endl
                                         << "#AvgRenderCost\n" << (float)mTotalPvsSize / (float)mBspStats.Leaves() << endl;
@@ -902 +907 @@
                 float sampCon = 0.0f;
                 AddToPvs(leaf, *tData.mRays, sampCon, conSamp);
+
+                viewCell->mPvsSize = viewCell->GetPvs().GetSize();
+                viewCell->mPvsSizeValid = true;
 
                 mBspStats.contributingSamples += conSamp;
@@ -1763 +1771 @@
                 if ((pFront < 0.0) || (pBack < 0.0))
                 {
-                        Debug << "vol f " << pFront << " b " << pBack << " p " << pOverall << endl;
-                        Debug << "real vol f " << pFront << " b " << geomBack.GetVolume() << " p " << pOverall << endl;
-                        Debug << "polys f " << geomFront.Size() << " b " << geomBack.Size() << " data " << data.mGeometry->Size() << endl;
-                }
-
-                // clamp because of possible precision issues
-                if (0)
-                {
-                        if (pFront < 0) pFront = 0;
-                        if (pBack < 0) pBack = 0;
+                        Debug << "ERROR in volume:\n"
+                                  << "volume f :" << pFront << " b: " << pBack << " p: " << pOverall 
+                                  << ", real volume f: " << pFront << " b: " << geomBack.GetVolume()
+                                  << ", #polygons f: " << geomFront.Size() << " b: " << geomBack.Size() << " p: " << data.mGeometry->Size() << endl;
                 }
         }
@@ -1795 +1797 @@
 
         //Debug << "decrease: " << oldRenderCost - newRenderCost << endl;
-        return (oldRenderCost - newRenderCost) / mBox.GetVolume();
+        const float renderCostDecrease = (oldRenderCost - newRenderCost) / mBox.GetVolume();
+        
+
+#if 1
+        // take render cost of node into account
+        const float normalizedOldRenderCost = oldRenderCost / mBox.GetVolume();
+        //Debug << "rendercostdecr: " << 0.99f * renderCostDecrease << " old render cost: " << 0.01f * normalizedOldRenderCost << endl;
+        //return 0.5f * renderCostDecrease + 0.5f * normalizedOldRenderCost;
+        return 0.99f * renderCostDecrease + 0.01f * normalizedOldRenderCost;
+#else
+        return renderCostDecrease;
+#endif
 }
 
@@ -1871 +1884 @@
                         !geomFront.Valid() || !geomBack.Valid()))
                 {
-                        Debug << "error f: " << pFront << " b: " << pBack << endl;
+                        //Debug << "error f: " << pFront << " b: " << pBack << endl;
+                        // high penalty for this split
                         return 99999.9f;
                 }
@@ -1887 +1901 @@
 
         // only render cost heuristics or combined with standard deviation
-        const float penaltyOld = EvalPvsPenalty(totalPvs, lowerPvsLimit, upperPvsLimit);
-    const float penaltyFront = EvalPvsPenalty(pvsFront, lowerPvsLimit, upperPvsLimit);
-        const float penaltyBack = EvalPvsPenalty(pvsBack, lowerPvsLimit, upperPvsLimit);
+        const float penaltyOld = EvalPvsPenalty((int)totalPvs, lowerPvsLimit, upperPvsLimit);
+    const float penaltyFront = EvalPvsPenalty((int)pvsFront, lowerPvsLimit, upperPvsLimit);
+        const float penaltyBack = EvalPvsPenalty((int)pvsBack, lowerPvsLimit, upperPvsLimit);
                         
         const float oldRenderCost = pOverall * penaltyOld;
@@ -2762 +2776 @@
         BspNodeGeometry nodeGeom;
         ConstructGeometry(n, nodeGeom);
-        
+        const float eps = 0.01f;
+
         // split planes from the root to this node
         // needed to verify that we found neighbor leaf
@@ -2799 +2814 @@
                                                         Polygon3::ClassifyPlane(geom->GetPolys(),
                                                                                                         halfSpaces[i],
-                                                                                                        mEpsilon);
+                                                                                                        eps);
 
                                                 if (cf == Polygon3::FRONT_SIDE)
@@ -2818 +2833 @@
                                                         Polygon3::ClassifyPlane(geom->GetPolys(),
                                                                                                         poly->GetSupportingPlane(),
-                                                                                                        mEpsilon);
+                                                                                                        eps);
 
                                                 if (cf == Polygon3::FRONT_SIDE)
@@ -2839 +2854 @@
                         const int cf = Polygon3::ClassifyPlane(nodeGeom.GetPolys(),
                                                                                                    interior->GetPlane(),
-                                                                                                   mEpsilon);
+                                                                                                   eps);
                         
                         BspNode *front = interior->GetFront();
@@ -2852 +2867 @@
                                                                 mBox,
                                                                 //0.0000001f);
-                                                                mEpsilon);
+                                                                eps);
                 
                         if (cf == Polygon3::BACK_SIDE)
@@ -2891 +2906 @@
         ConstructGeometry(n, nodeGeom);
         
+        float eps = 0.01f;
         // split planes from the root to this node
         // needed to verify that we found neighbor leaf
@@ -2932 +2948 @@
                         const int cf = Polygon3::ClassifyPlane(nodeGeom.GetPolys(),
                                                                                                    interior->GetPlane(),
-                                                                                                   mEpsilon);
+                                                                                                   eps);
                         
                         BspNode *front = interior->GetFront();
@@ -2945 +2961 @@
                                                                 mBox,
                                                                 //0.0000001f);
-                                                                mEpsilon);
+                                                                eps);
                 
                         if (cf == Polygon3::BACK_SIDE)
@@ -3164 +3180 @@
 
         float t;
-        const float thresh = 1e-6f; // matt: change this
+        const float thresh = 1e-6f; // matt: change this to adjustable value
         
         while (1)