Changeset 409 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

Timestamp:

11/14/05 15:59:20 (19 years ago)

Author:

mattausch

Message:

worked on kd view space partitioning structure
worked on render simulation

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp (modified) (10 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -14 +14 @@
 #include "Plane3.h"
 
+int BspTree::sMaxPolyCandidates = 10;
+int BspTree::sMaxRayCandidates = 10;
+int BspTree::sSplitPlaneStrategy = BALANCED_POLYS; 
+int BspTree::sConstructionMethod = FROM_INPUT_VIEW_CELLS;
+
+
 int BspTree::sTermMaxPolygons = 10;
 int BspTree::sTermMinPvs = 20;
 int BspTree::sTermMaxDepth = 20;
 float BspTree::sTermMinArea = 0.001f;
-int BspTree::sMaxPolyCandidates = 10;
-int BspTree::sMaxRayCandidates = 10;
-int BspTree::sSplitPlaneStrategy = BALANCED_POLYS; 
-int BspTree::sConstructionMethod = FROM_INPUT_VIEW_CELLS;
 int BspTree::sTermMaxPolysForAxisAligned = 50;
 int BspTree::sTermMaxObjectsForAxisAligned = 50;
 int BspTree::sTermMaxRaysForAxisAligned = -1;
 int BspTree::sTermMaxRays = -1;
+float BspTree::sTermMaxRayContribution = 0.05f;
+float BspTree::sTermMaxAccRayLength = 50;
+
+
 int BspTree::sMinPvsDif = 10;
 int BspTree::sMinPvs = 10;
@@ -704 +710 @@
                  (data.mPvs <= sTermMinPvs) ||
                  (data.mArea <= sTermMinArea) ||
-                 (data.mDepth >= sTermMaxDepth));
+                 (data.mDepth >= sTermMaxDepth) ||
+                 (((float)data.mPvs / (float)data.mRays->size()) < sTermMaxRayContribution));
 }
 
@@ -863 +870 @@
                                                                                         coincident);
 
-        // split geometry
-        tData.mGeometry->SplitGeometry(*frontData.mGeometry, *backData.mGeometry, 
-                                                                   *this, interior->mPlane);
-        
-        // compute area
-        frontData.mArea = frontData.mGeometry->GetArea();
-        backData.mArea = backData.mGeometry->GetArea();
-
-        // compute pvs
+    // compute pvs
         frontData.mPvs = ComputePvsSize(*frontData.mRays);
         backData.mPvs = ComputePvsSize(*backData.mRays);
 
+        // split geometry and compute area
+        if (1)
+        {
+                tData.mGeometry->SplitGeometry(*frontData.mGeometry, 
+                                                                           *backData.mGeometry, 
+                                                                           *this, 
+                                                                           interior->mPlane);
+        
+                
+                frontData.mArea = frontData.mGeometry->GetArea();
+                backData.mArea = backData.mGeometry->GetArea();
+        }
+
+        // compute accumulated ray length
+        //frontData.mAccRayLength = AccumulatedRayLength(*frontData.mRays);
+        //backData.mAccRayLength = AccumulatedRayLength(*backData.mRays);
 
         //-- create front and back leaf
@@ -1502 +1517 @@
                            (pOverall * (float)pvs * 2);
 
-                // give penalty for unbalanced cell
-                if (((pFront * 0.2 + 0.00001) > pBack) || (pFront < (pBack * 0.2 + 0.00001)))
+                // give penalty to unbalanced split
+                if (((pFront * 0.2 + Limits::Small) > pBack) || (pFront < (pBack * 0.2 + Limits::Small)))
                         val += 0.5;
         }
@@ -1633 +1648 @@
         environment->GetIntValue("BspTree.Termination.maxPolygons", sTermMaxPolygons);
         environment->GetIntValue("BspTree.Termination.maxRays", sTermMaxRays);
-        environment->GetFloatValue("BspTree.Termination.minArea", sTermMinArea);
+        environment->GetFloatValue("BspTree.Termination.minArea", sTermMinArea);        
+        environment->GetFloatValue("BspTree.Termination.maxRayContribution", sTermMaxRayContribution);
+        environment->GetFloatValue("BspTree.Termination.maxAccRayLenght", sTermMaxAccRayLength);
 
         //-- termination criteria for axis aligned split
@@ -1743 +1760 @@
                 mStat.minDepth = data.mDepth;
 
-        // store minimal and maximal pvs
-        /*if (data.mPvs > mStat.pvs)mStat.pvs = data.mPvs;
-        if (data.mPvs < mStat.pvs)      mStat.pvs = data.mPvs;*/
-
-        // accumulate depth to compute average
+        // accumulate depth to compute average depth
         mStat.accumDepth += data.mDepth;
         
@@ -1757 +1770 @@
                   << "#polygons: " << (int)data.mPolygons->size() << " (max: " << sTermMaxPolygons << "), "
                   << "#rays: " << (int)data.mRays->size() << " (max: " << sTermMaxRays << "), " 
-                  << "#pvs: " << leaf->GetViewCell()->GetPvs().GetSize() << endl;
+                  << "#pvs: " << leaf->GetViewCell()->GetPvs().GetSize() << "=, "
+                  << "#avg ray contrib (pvs): " << (float)data.mPvs / (float)data.mRays->size() << endl;
 //#endif
 }
@@ -2028 +2042 @@
 {
         return mStat;
+}
+
+float BspTree::AccumulatedRayLength(BoundedRayContainer &rays) const
+{
+        float len = 0;
+
+        BoundedRayContainer::const_iterator it, it_end = rays.end();
+
+        for (it = rays.begin(); it != it_end; ++ it)
+        {
+                len += SqrDistance((*it)->mRay->Extrap((*it)->mMinT), 
+                                                   (*it)->mRay->Extrap((*it)->mMaxT));
+        }
+
+        return len;
 }
 
@@ -2077 +2106 @@
 
                                 DEL_PTR(bRay);
-
-                                ++ splits;
                         }
                         break;
@@ -2089 +2116 @@
                                 backRays.push_back(new BoundedRay(ray, bRay->mMinT, newT));
                                 frontRays.push_back(new BoundedRay(ray, newT, bRay->mMaxT));
-                                
                                 DEL_PTR(bRay);