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

Timestamp:

11/09/05 01:54:05 (19 years ago)

Author:

mattausch

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -253 +253 @@
 }
 
-void BspLeaf::GenerateViewCell(const BoundedRayContainer &rays, 
-                                                           int &sampleContributions,
-                                                           int &contributingSamples)
+void BspLeaf::AddToPvs(const BoundedRayContainer &rays, 
+                                           int &sampleContributions,
+                                           int &contributingSamples)
 {
         sampleContributions = 0;
         contributingSamples = 0;
-
-        mViewCell = dynamic_cast<BspViewCell *>(ViewCell::Generate());
-        mViewCell->mBspLeaves.push_back(this);
 
     BoundedRayContainer::const_iterator it, it_end = rays.end();
@@ -273 +270 @@
                 if (!ray->intersections.empty())
                 {       
-            contribution += mViewCell->GetPvs().AddSample(ray->intersections[0].mObject);
-                }
-
-                contribution += mViewCell->GetPvs().AddSample(ray->sourceObject.mObject);
+            //contribution += mViewCell->GetPvs().AddSample(ray->intersections[0].mObject);
+                }
+
+                //contribution += mViewCell->GetPvs().AddSample(ray->sourceObject.mObject);
 
                 if (contribution > 0)
@@ -294 +291 @@
 /****************************************************************/
 
-BspTree::BspTree(ViewCell *viewCell): 
+BspTree::BspTree(BspViewCell *viewCell): 
 mRootCell(viewCell), mRoot(NULL), mGenerateViewCells(false),
 mStorePiercingRays(true)
@@ -707 +704 @@
                 BspLeaf *leaf = dynamic_cast<BspLeaf *>(tData.mNode);
         
+                BspViewCell *viewCell;
+
                 // generate new view cell for each leaf
                 if (mGenerateViewCells)
                 {
-                        int conSamp, sampCon;
-                        leaf->GenerateViewCell(*tData.mRays, conSamp, sampCon);
+                        viewCell = dynamic_cast<BspViewCell *>(ViewCell::Generate());
+                }
+                else
+                {
+                        // add view cell to leaf
+                        viewCell = dynamic_cast<BspViewCell *>(tData.mViewCell);
+                }
+
+                leaf->SetViewCell(viewCell);
+                viewCell->mBspLeaves.push_back(leaf);
+
+                //-- add pvs
+                if (viewCell != mRootCell)
+                {
+                        int conSamp = 0, sampCon = 0;
+                        leaf->AddToPvs(*tData.mRays, conSamp, sampCon);
                         
                         mStat.contributingSamples += conSamp;
                         mStat.sampleContributions += sampCon;
-                }
-                else
-                {
-                        // add view cell to leaf
-                        leaf->SetViewCell(dynamic_cast<BspViewCell *>(tData.mViewCell));
-                        leaf->mViewCell->mBspLeaves.push_back(leaf);
                 }
 
@@ -1334 +1341 @@
 
                 if (1) // use front and back cell areas to approximate volume
-                {
-                        //-- compute area
-                
+                {       
                         // construct child geometry with regard to the candidate split plane
                         frontData.mCell = cell.ConstructChild(*this, candidatePlane, true);
                         backData.mCell = cell.ConstructChild(*this, candidatePlane, false);
 
-                        frontData.mArea = frontData.mCell->GetArea();
-                        backData.mArea = backData.mCell->GetArea();
-
-                        pFront = frontData.mArea;
-                        pBack = backData.mArea;
+                        pFront = frontData.mArea = frontData.mCell->GetArea();
+                        pBack = backData.mArea = backData.mCell->GetArea();
 
                         pOverall = area;
@@ -1409 +1411 @@
 
         if ((sSplitPlaneStrategy & PVS) && area && pvs)
-                val += sPvsFactor * (frontData.mPvs * pFront + (backData.mPvs * pBack)) /       (pOverall * (float)pvs * 2);
-
-        Debug << "pvs: " << pvs << " totalArea: " << area 
+                val += sPvsFactor * (frontData.mPvs * pFront + (backData.mPvs * pBack)) /
+                           (pOverall * (float)pvs * 2);
+
+        Debug << "totalpvs: " << pvs << " ptotal: " << pOverall
                   << " frontpvs: " << frontData.mPvs << " pFront: " << pFront 
                   << " backpvs: " << backData.mPvs << " pBack: " << pBack 
@@ -2486 +2489 @@
         if (!planePoly)
         {
-                Debug << "returning 'same' geometry " << mPolys.size();
                 //geometry is not changed at all, hence just copy polygons
                 PolygonContainer::const_iterator it, it_end = mPolys.end();
+
                 for (it = mPolys.begin(); it != it_end; ++ it)
                         childCell->mPolys.push_back(new Polygon3((*it)->mVertices));
@@ -2513 +2516 @@
                                                 
                                         poly->Split(splitPlane, *frontPoly, *backPoly, splitPts);
+
                                         DEL_PTR(poly);
 
@@ -2554 +2558 @@
         childCell->mSides.push_back(side);
 
-        Debug << "returning new geometry " << mPolys.size();
-
+        Debug << "returning new geometry " << mPolys.size() << " CHILD: " << childCell->mPolys.size() << endl;
+
+        Debug << "old area " << this->GetArea() << " new: " << childCell->GetArea() << endl;
         return childCell;
 }