Changeset 1291 for GTP/trunk

Timestamp:

08/28/06 18:42:33 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• EvalStats/EvalStats.cpp (modified) (4 diffs)
• src/BvHierarchy.cpp (modified) (5 diffs)
• src/BvHierarchy.h (modified) (1 diff)
• src/HierarchyManager.cpp (modified) (2 diffs)
• src/OspTree.cpp (modified) (8 diffs)
• src/Preprocessor.cpp (modified) (6 diffs)
• src/Pvs.cpp (modified) (2 diffs)
• src/ViewCellBsp.cpp (modified) (2 diffs)
• src/ViewCellBsp.h (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (4 diffs)
• src/VspBspTree.cpp (modified) (1 diff)
• src/VspTree.cpp (modified) (37 diffs)
• src/VspTree.h (modified) (10 diffs)

GTP/trunk/Lib/Vis/Preprocessing/EvalStats/EvalStats.cpp

@@ -13 +13 @@
 using namespace std;
 
+
+
 /** This is a small function which takes two log files and computes the
         difference in percent of the weighted render cost.
 */
-
-
 struct RenderStats 
 {
@@ -105 +105 @@
 
         statsOut << "#ViewCells\n" << index + 1 << endl
-                         //<< "#TotalRenderCostGain\n" << 100.0f - costRatio * 100.0f << endl
-                         //<< "#AvgRenderCostGain\n" << 100.0f - avgCostRatio * 100.0f << endl << endl;
                          << "#TotalRenderCostRatio\n" << costRatio << endl
                          << "#AvgRenderCostRatio\n" << avgCostRatio << endl << endl;
@@ -149 +147 @@
                 float val;
 
-                // soecial cases
+                // special cases
                 if (j == 0)
                 {
@@ -178 +176 @@
                 }
 
-                // lower bound
-                //int j = max (0, i - 1);
-                //cout << "i: " << i << " j: " << j << endl;
                 float ratio = (i && val) ? (float)i / val : 1;
 
-                //cout << "ratio: " << ratio << endl;
                 outstream << "#Pass\n" << i << endl;
                 outstream << "#RenderCost\n" << renderCost << endl;

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

@@ -25 +25 @@
 
 static float debugVol = 0;
+
 int BvhNode::sMailId = 2147483647;
+int BvhNode::sReservedMailboxes = 1;
+
+
 BvHierarchy *BvHierarchy::BvhSubdivisionCandidate::sBvHierarchy = NULL;
+
 
 
@@ -530 +535 @@
                 Intersectable *obj = *oit;
                 AxisAlignedBox3 box = obj->GetBox();
+
                 const float objMid = (box.Max(axis) + box.Min(axis)) * 0.5;
+
                 // object mailed => belongs to back objects
                 if (objMid < midPoint) 
@@ -599 +606 @@
                 const int nObjectsRight = nTotalObjects - nObjectsLeft;
 
-                // view cells that see both child nodes
-                //const float volLeftAndRight = totalVol - volLeft - volRight;
-
                 // the heuristics
             const float sum = volLeft * (float)nObjectsLeft + 
                                                   volRight * (float)nObjectsRight;
-                //                                volLeftAndRight * (float)nTotalObjects;
 
                 if (sum < newRenderCost)
@@ -811 +814 @@
                 {
                         if (mUseCostHeuristics)
-                        {
+                        {cout << "a";
                                 //-- partition objects using heuristics
                                 nCostRatio[axis] =
@@ -821 +824 @@
                         }
                         else
-                        {
+                        {cout << "b";
                                 nCostRatio[axis] =
                                         EvalLocalObjectPartition(

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

@@ -159 +159 @@
 
 
+        /////////////////////////////////////
         //-- mailing options
-
+        
+        static void NewMail(const int reserve = 1) {
+                sMailId += sReservedMailboxes;
+                sReservedMailboxes = reserve;
+        }
+        
         void Mail() { mMailbox = sMailId; }
-        static void NewMail() { ++ sMailId; }
         bool Mailed() const { return mMailbox == sMailId; }
+
+        void Mail(const int mailbox) { mMailbox = sMailId + mailbox; }
+        bool Mailed(const int mailbox) const { return mMailbox == sMailId + mailbox; }
+
+        int IncMail() { return ++ mMailbox - sMailId; }
 
         static int sMailId;
         int mMailbox;
+        static int sReservedMailboxes;
 
         ///////////////////////////////////

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

@@ -279 +279 @@
                 const float costRatio = splitCandidate->GetRenderCostDecrease() / mTotalCost;
 
-                Debug << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
+                //Debug << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
                 if (costRatio < mTermMinGlobalCostRatio)
                         ++ mGlobalCostMisses;
@@ -685 +685 @@
 }
 
-}
+
+
+}

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

@@ -1264 +1264 @@
 
 
-#if 0
-
 float OspTree::EvalRenderCostDecrease(const AxisAlignedPlane &candidatePlane,
                                                                           const OspTraversalData &tData,
@@ -1274 +1272 @@
 
         // probability that view point lies in back / front node
-        float pOverall = 0;//data.mProbability; // todo matt§: value ok?
-        float pFront = 0;
-        float pBack = 0;
-        float pFrontAndBack = 0;
-
-        const float viewSpaceVol = mVspTree->GetBoundingBox().GetVolume();
-
-        Intersectable::NewMail(3);
-        
-        KdLeaf *leaf = tData.mNode;
-        const int totalPvs = (int)leaf->mObjects.size();
-        
-        RayInfoContainer frontRays, backRays;
-        ClassifyRays(*tData.mRays, leaf, candidatePlane, frontRays, backRays);
-
-        ViewCellContainer touchedViewCells;
-        
-        // sum up volume seen from the objects of left and right children
-        // => the volume is the weight for the render cost equation
-        ViewCell::NewMail(3);
-
-        RayInfoContainer::const_iterator rit, rit_end = tData.mRays->end();
-
-        for (rit = tData.mRays->begin(); rit < rit_end; ++ rit)
-        {
-                VssRay *ray = (*rit).mRay;
-
-                // add volume to volumes of left and / or right children
-                // if one of the ray end points is inside
-                const int classification = ClassifyRay(ray, leaf, candidatePlane);
-
-                ViewCellContainer viewCells;
-                mVspTree->GetViewCells(*ray, viewCells);
-                        
-                ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
-
-                // traverse through view cells and classify them according
-                // to them being seen from to back / front / front and back node
-                for (vit = viewCells.begin(); vit != vit_end; ++ vit)
-                {
-                        ViewCell *vc = *vit;
-
-                        // if not previously mailed
-                        if (!vc->Mailed() && !vc->Mailed(1) && !vc->Mailed(2))
-                        {
-                                touchedViewCells.push_back(vc);
-                        }
-
-                        // classify / mail the view cell
-                        MailViewCell(vc, classification);       
-                }
-        }
-
-        // evaluate view cells volume contribution 
-        // with respect to the mail box classification
-        ViewCellContainer::const_iterator vit, vit_end = touchedViewCells.end();
-
-        for (vit = touchedViewCells.begin(); vit != vit_end; ++ vit)
-        {
-                AddViewCellVolumeContri(*vit, pFront, pBack, pFrontAndBack);
-        }
-
-        //////////////////////////////////////////////
-        //
-        // evaluate contribution of objects which are part of other kd nodes
-        // which are seen by the same view cell
-        // These contributions cannot be reduced by splitting, because
-        // the object would still be part of the pvs
-
-        float additionalFrontRenderCost = 0;
-        float additionalBackRenderCost = 0;
-        
-        MailablePvsData::NewMail();
-
-        for (rit = tData.mRays->begin(); rit != tData.mRays->end(); ++ rit)
-        {
-                VssRay *ray = (*rit).mRay;
-
-                ViewCellContainer viewCells;
-                mVspTree->GetViewCells(*ray, viewCells);
-
-                ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
-
-                // traverse through view cells
-                for (vit = viewCells.begin(); vit != vit_end; ++ vit)
-                {
-                        ViewCell *viewCell = *vit;
-
-                        // for a view cell:
-                        // if object is also in the kd pvs entries from other kd leaves,
-                        // render cost cannot be reduced for this view cell
-                        // => the render cost was falsly reduced, add them again
-
-                        if (ray->mTerminationObject)
-                        {       
-                                Intersectable *obj = ray->mTerminationObject;
-                                
-                                const bool renderCostWrong = 
-                                        ViewCellHasMultipleReferences(obj, viewCell, true);
-                        
-                                // if there is already an entry of this object in the view cell pvs 
-                                if (renderCostWrong)
-                                {
-                                        // view cell was counted only for front or back => correct tjos
-                                        if (viewCell->Mailed(1) && obj->Mailed())
-                                        {
-                                                additionalFrontRenderCost += viewCell->GetVolume();
-                                        }
-                                        else if (viewCell->Mailed() && obj->Mailed(1))
-                                        {
-                                                additionalBackRenderCost += viewCell->GetVolume();
-                                        }
-                                }
-                        }
-        
-                        if (ray->mOriginObject)
-                        {
-                                Intersectable *obj = ray->mOriginObject;
-
-                                const bool renderCostWrong = 
-                                        ViewCellHasMultipleReferences(obj, viewCell, true);
-                                // if there is already an entry of this object in the view cell pvs 
-                                if (renderCostWrong)
-                                {
-                                        if (viewCell->Mailed(1) && obj->Mailed())
-                                        {
-                                                additionalFrontRenderCost += viewCell->GetVolume();
-                                        }
-                                        else if (viewCell->Mailed() && obj->Mailed(1))
-                                        {
-                                                additionalBackRenderCost += viewCell->GetVolume();
-                                        }
-                                }
-                        }
-                }
-        }
-
-        /////////////////////////////
-
-
-        // these are non-overlapping sets
-        pOverall = pFront + pBack + pFrontAndBack;
-
-
-        //-- pvs rendering heuristics
-
-        const float oldRenderCost = pOverall * totalPvs;
-        
-        // sum up the terms: 
-        // the view cells seeing
-        // a) the left node are weighted by the #left node objects
-        // b) the right node are weighted by the #right node objects
-        // c) both nodes are weighted by the #parent node objects
-        const float newRenderCost = pvsFront * pFront + pvsBack * pBack + totalPvs * pFrontAndBack
-                + additionalFrontRenderCost + additionalBackRenderCost;
-
-        // normalize volume with view space volume
-        const float renderCostDecrease = (oldRenderCost - newRenderCost) / viewSpaceVol;
-
-        Debug << "\n(((( eval render cost decrease ))))" << endl
-                  << "back pvs: " << pvsBack << " front pvs " << pvsFront << " total pvs: " << totalPvs << endl 
-                  << "back p: " << pBack / viewSpaceVol << " front p " << pFront / viewSpaceVol 
-                  << " front and back p " << pFrontAndBack / viewSpaceVol << " p: " << tData.mProbability / viewSpaceVol << endl
-                  << "old rc: " << oldRenderCost / viewSpaceVol << " new rc: " << newRenderCost / viewSpaceVol << endl
-                  << "render cost decrease: " << renderCostDecrease << endl
-                  << "additional front " << additionalFrontRenderCost / viewSpaceVol 
-                  << " additional back " << additionalBackRenderCost  / viewSpaceVol << endl;
-
-        if (oldRenderCost < newRenderCost * 0.99)
-                Debug <<"error!!"<<endl;
-
-        //if ((((pOverall - tData.mProbability) / viewSpaceVol) > 0.00001))
-        //      Debug << "ERROR!!"<<endl;
-
-        normalizedOldRenderCost = oldRenderCost / viewSpaceVol;
-
-                
-        return renderCostDecrease;
-}
-
-#else
-
-float OspTree::EvalRenderCostDecrease(const AxisAlignedPlane &candidatePlane,
-                                                                          const OspTraversalData &tData,
-                                                                          float &normalizedOldRenderCost) const
-{
-        float pvsFront = 0;
-        float pvsBack = 0;
-
-        // probability that view point lies in back / front node
-        float pOverall = 0;//data.mProbability; // todo matt§: value ok?
+        float pOverall = 0;
         float pFront = 0;
         float pBack = 0;
@@ -1504 +1312 @@
         }
 
-        
         ViewCellContainer touchedViewCells;
 
@@ -1603 +1410 @@
 
         /////////////////////////////
-
-
-        // these are non-overlapping sets
-        pOverall = pFront + pBack + pFrontAndBack;
-
-
         //-- pvs rendering heuristics
 
-        const float oldRenderCost = rc;//pOverall * totalPvs;
+        const float oldRenderCost = rc;
         
         // sum up the terms: 
@@ -1618 +1419 @@
         // b) the right node are weighted by the #right node objects
         // c) both nodes are weighted by the #parent node objects
-        const float newRenderCost = newRc//pvsFront * pFront + pvsBack * pBack + totalPvs * pFrontAndBack
-;//             + additionalFrontRenderCost + additionalBackRenderCost;
+        const float newRenderCost = newRc;
+
 
         // normalize volume with view space volume
         const float renderCostDecrease = (oldRenderCost - newRenderCost) / viewSpaceVol;
 
-        Debug << "\n(((( eval render cost decrease ))))" << endl
-                  << "back pvs: " << pvsBack << " front pvs " << pvsFront << " total pvs: " << totalPvs << endl 
-                  << "back p: " << pBack / viewSpaceVol << " front p " << pFront / viewSpaceVol 
-                  << " front and back p " << pFrontAndBack / viewSpaceVol << " p: " << tData.mProbability / viewSpaceVol << endl
+        Debug << "\nrender cost decrease: " << endl
                   << "old rc: " << oldRenderCost / viewSpaceVol << " new rc: " << newRenderCost / viewSpaceVol << endl
                   << "render cost decrease: " << renderCostDecrease << endl;
-                  //<< "additional front " << additionalFrontRenderCost / viewSpaceVol 
-                  //<< " additional back " << additionalBackRenderCost  / viewSpaceVol << endl;
-
-        if (oldRenderCost < newRenderCost * 0.99)
-                Debug <<"error!!"<<endl;
-
-        //if ((((pOverall - tData.mProbability) / viewSpaceVol) > 0.00001))
-        //      Debug << "ERROR!!"<<endl;
 
         normalizedOldRenderCost = oldRenderCost / viewSpaceVol;
@@ -1644 +1434 @@
         return renderCostDecrease;
 }
-#endif
 
 
@@ -2234 +2023 @@
         MailablePvsData::NewMail();
         
-        /*RayInfoContainer::const_iterator rit, rit_end = rays.end();
-
-        for (rit = rays.begin(); rit < rit_end; ++ rit)
-        {
-                VssRay *ray = (*rit).mRay;
-
-                ViewCellContainer viewCells;
-                mVspTree->GetViewCells(*ray, viewCells);
-
-                ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
-
-                // traverse through view cells and classify them according
-                // to them being seen from to back / front / front and back node
-                for (vit = viewCells.begin(); vit != vit_end; ++ vit)
-                {
-                        ViewCell *vc = *vit;
-
-                        Intersectable *obj = ray->mTerminationObject;
-                        if (obj)
-                        {
-                                float contri;
-                                AddViewCellToObjectPvs(obj, vc, contri, true);
-                        }
-
-                        obj = ray->mOriginObject;
-                        if (obj)
-                        {
-                                float contri;
-                                AddViewCellToObjectPvs(obj, vc, contri, true);
-                        }
-                }
-        }*/
-        
         ViewCellContainer touchedViewCells;
         CollectTouchedViewCells(rays, touchedViewCells);
@@ -2297 +2053 @@
 {
         MailablePvsData::NewMail();
-
-        /*RayInfoContainer::const_iterator rit, rit_end = rays.end();
-        for (rit = rays.begin(); rit < rit_end; ++ rit)
-        {
-                VssRay *ray = (*rit).mRay;
-
-                // test if intersection point with one of the objects is inside this node
-                ViewCellContainer viewCells;
-                mVspTree->GetViewCells(*ray, viewCells);
-
-                ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
-
-                // traverse through view cells and classify them according
-                // to them being seen from to back / front / front and back node
-                for (vit = viewCells.begin(); vit != vit_end; ++ vit)
-                {
-                        ViewCell *vc = *vit;
-                        Intersectable *obj = ray->mTerminationObject;
-
-                        if (obj)
-                        {
-                                MailablePvsData *vdata = obj->mViewCellPvs.Find(vc);
-
-                                if (vdata && !vdata->Mailed())
-                                {
-                                        vdata->Mail();
-                                        obj->mViewCellPvs.RemoveSample(vc, 1);
-                                }
-                        }
-
-                        obj = ray->mOriginObject;
-
-                        if (obj)
-                        {
-                                MailablePvsData *vdata = obj->mViewCellPvs.Find(vc);
-
-                                if (vdata && !vdata->Mailed())
-                                {
-                                        vdata->Mail();
-                                        obj->mViewCellPvs.RemoveSample(vc, 1);
-                                }
-                        }
-                }
-        }*/
 
         ViewCellContainer touchedViewCells;

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

@@ -41 +41 @@
         int n = 200;
 
-        if (0){
-        // form grid of boxes
-        for (int i = 0; i < n; ++ i)
-        {
-                for (int j = 0; j < n; ++ j)
+        if (0)
+        {
+                // form grid of boxes
+                for (int i = 0; i < n; ++ i)
                 {
-                        const Vector3 scale2((float)j * 0.8f / n + 0.1f,  0.05f, (float)i * 0.8f  / (float)n + 0.1f);
-                
-                        const Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
-                
-                        const Vector3 boxSize = sceneBox.Size() * Vector3(0.0025f, 0.01f, 0.0025f);
-                        AxisAlignedBox3 box(pt2, pt2 + boxSize);
+                        for (int j = 0; j < n; ++ j)
+                        {
+                                const Vector3 scale2((float)j * 0.8f / n + 0.1f,  0.05f, (float)i * 0.8f  / (float)n + 0.1f);
+
+                                const Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
+
+                                const Vector3 boxSize = sceneBox.Size() * Vector3(0.0025f, 0.01f, 0.0025f);
+                                AxisAlignedBox3 box(pt2, pt2 + boxSize);
+                                Mesh *mesh = CreateMeshFromBox(box);
+
+                                mesh->Preprocess();
+
+                                MeshInstance *mi = new MeshInstance(mesh);
+                                scene->mRoot->mGeometry.push_back(mi);
+                        }
+                }
+
+                for (int i = 0; i < n; ++ i)
+                {
+                        for (int j = 0; j < n; ++ j)
+                        {
+                                const Vector3 scale2(0.15f, (float)j * 0.8f / n + 0.1f, (float)i * 0.8f  / (float)n + 0.1f);
+
+                                Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
+
+                                Vector3 boxSize = sceneBox.Size() * Vector3(0.0025f, 0.01f, 0.0025f);
+                                AxisAlignedBox3 box(pt2, pt2 + boxSize);
+                                Mesh *mesh = CreateMeshFromBox(box);
+
+                                mesh->Preprocess();
+
+                                MeshInstance *mi = new MeshInstance(mesh);
+                                scene->mRoot->mGeometry.push_back(mi);
+                        }
+                }
+
+                for (int i = 0; i < n; ++ i)
+                {
+                        const Vector3 scale2(2, 0.2f, (float)i * 0.8f  / (float)n + 0.1f);
+
+                        Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
+
+                        //Vector3 boxSize = sceneBox.Size() * Vector3(0.0025, 0.01, 0.0025);
+                        Vector3 boxSize = sceneBox.Size() * Vector3(0.005f, 0.02f, 0.005f);
+
+                        AxisAlignedBox3 box(pt2 + 0.1f, pt2 + boxSize);
                         Mesh *mesh = CreateMeshFromBox(box);
 
                         mesh->Preprocess();
-                
+
                         MeshInstance *mi = new MeshInstance(mesh);
                         scene->mRoot->mGeometry.push_back(mi);
                 }
-        }
-
-        for (int i = 0; i < n; ++ i)
-        {
-                for (int j = 0; j < n; ++ j)
-                {
-                        const Vector3 scale2(0.15f, (float)j * 0.8f / n + 0.1f, (float)i * 0.8f  / (float)n + 0.1f);
-                
-                        Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
-                
-                        Vector3 boxSize = sceneBox.Size() * Vector3(0.0025f, 0.01f, 0.0025f);
-                        AxisAlignedBox3 box(pt2, pt2 + boxSize);
-                        Mesh *mesh = CreateMeshFromBox(box);
-
-                        mesh->Preprocess();
-                
-                        MeshInstance *mi = new MeshInstance(mesh);
-                        scene->mRoot->mGeometry.push_back(mi);
-                }
-        }
-
-        for (int i = 0; i < n; ++ i)
-        {
-                const Vector3 scale2(2, 0.2f, (float)i * 0.8f  / (float)n + 0.1f);
-                
-                Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
-                
-                //Vector3 boxSize = sceneBox.Size() * Vector3(0.0025, 0.01, 0.0025);
-                Vector3 boxSize = sceneBox.Size() * Vector3(0.005f, 0.02f, 0.005f);
-
-                AxisAlignedBox3 box(pt2 + 0.1f, pt2 + boxSize);
-                Mesh *mesh = CreateMeshFromBox(box);
-
-                mesh->Preprocess();
-                
-                MeshInstance *mi = new MeshInstance(mesh);
-                scene->mRoot->mGeometry.push_back(mi);
-        }
-        
-        scene->mRoot->UpdateBox();
-        }
-                
+
+                scene->mRoot->UpdateBox();
+        }
+
         if (1)
         {
@@ -111 +112 @@
                 Plane3 cuttingPlane(Vector3(1, 0, 0), pt);
                 Mesh *planeMesh = new Mesh();
-                
+
                 Polygon3 *poly = sceneBox.CrossSection(cuttingPlane);
                 IncludePolyInMesh(*poly, *planeMesh);
-                
+
                 planeMesh->Preprocess();
-                
+
                 MeshInstance *planeMi = new MeshInstance(planeMesh);
                 scene->mRoot->mGeometry.push_back(planeMi);
@@ -145 +146 @@
         Environment::GetSingleton()->GetBoolValue("Preprocessor.detectEmptyViewSpace", mDetectEmptyViewSpace);
         Environment::GetSingleton()->GetBoolValue("Preprocessor.exportVisibility", mExportVisibility );
-//#if GTP_INTERNAL // choose other ray cast method
         Environment::GetSingleton()->GetIntValue("Preprocessor.rayCastMethod", mRayCastMethod);
-//#endif
+
         char buffer[256];
         Environment::GetSingleton()->GetStringValue("Preprocessor.visibilityFile",  buffer);
@@ -163 +163 @@
 Preprocessor::~Preprocessor()
 {
-  cout << "cleaning up" << endl;
-
-  cout << "Deleting view cells manager ... \n";
-  DEL_PTR(mViewCellsManager);
-  cout << "done.\n";
-
-  cout << "Deleting bsp tree ... \n";
-  DEL_PTR(mBspTree);
-  cout << "done.\n";
-
-  cout << "Deleting kd tree...\n";
-  DEL_PTR(mKdTree);
-  cout << "done.\n";
- 
-  cout << "Deleting vsp tree...\n";
-  DEL_PTR(mVspTree);
-  cout << "done.\n";
-
-  cout << "Deleting hierarchy manager...\n";
-  DEL_PTR(mHierarchyManager);
-  cout << "done.\n";
-
-  cout << "Deleting vspbsp tree...\n";
-  DEL_PTR(mVspBspTree);
-  cout << "done.\n";
-
-   cout << "Deleting scene graph...\n";
-  DEL_PTR(mSceneGraph);
-  cout << "done.\n";
-
-  DEL_PTR(mRenderSimulator);
-  DEL_PTR(renderer);
+        cout << "cleaning up" << endl;
+
+        cout << "Deleting view cells manager ... \n";
+        DEL_PTR(mViewCellsManager);
+        cout << "done.\n";
+
+        cout << "Deleting bsp tree ... \n";
+        DEL_PTR(mBspTree);
+        cout << "done.\n";
+
+        cout << "Deleting kd tree...\n";
+        DEL_PTR(mKdTree);
+        cout << "done.\n";
+
+        cout << "Deleting vsp tree...\n";
+        DEL_PTR(mVspTree);
+        cout << "done.\n";
+
+        cout << "Deleting hierarchy manager...\n";
+        DEL_PTR(mHierarchyManager);
+        cout << "done.\n";
+
+        cout << "Deleting vspbsp tree...\n";
+        DEL_PTR(mVspBspTree);
+        cout << "done.\n";
+
+        cout << "Deleting scene graph...\n";
+        DEL_PTR(mSceneGraph);
+        cout << "done.\n";
+
+        DEL_PTR(mRenderSimulator);
+        DEL_PTR(renderer);
 }
 
@@ -461 +461 @@
         if (strcmp(name, "osp") == 0)
         {
+                Debug << "hierarchy manager: osp" << endl;
                 // HACK for testing if per kd evaluation works!!
                 const bool ishack = true;
@@ -470 +471 @@
         else if (strcmp(name, "bvh") == 0)
         {
+                Debug << "hierarchy manager: bvh" << endl;
                 hierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::BV_BASED_OBJ_SUBDIV);
+        }
+        else // only view space partition
+        {
+                Debug << "hierarchy manager: obj" << endl;
+                hierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::NO_OBJ_SUBDIV);
         }
 

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

@@ -86 +86 @@
         if (node->IsLeaf())     
         {
-                if (!node->Mailed())
-                {
-                        node->Mail();
-                        return (int)(((BvhLeaf *)node)->mObjects.size());
-                }
-                else
-                {
+                // objects already accounted for
+                if (node->Mailed())
                         return 0;
-                }
+
+                node->Mail();
+
+                return (int)(((BvhLeaf *)node)->mObjects.size());
         }                        
 
@@ -156 +154 @@
                                         KdIntersectable *kdObj = dynamic_cast<KdIntersectable *>(obj);
                                         pvs += CountNewObjectsInKdNode(kdObj);  
+                                        cout << "z";
                                         break;
                                 }
                         case Intersectable::BVH_INTERSECTABLE:
                                 {
+                                        cout << "x";
                                         BvhIntersectable *bvhObj = dynamic_cast<BvhIntersectable *>(obj);
                                         pvs += CountNewObjectsInBvhNode(bvhObj);
                                         break;
                                 }
-                        default:
+                        default:cout << "y";
                                 ++ pvs;
                                 break;

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

@@ -2061 +2061 @@
         float mint = 0.0f, maxt = 1.0f;
 
-        Intersectable::NewMail();
-        ViewCell::NewMail();
+        //ViewCell::NewMail();
 
         Vector3 entp = origin;
@@ -2131 +2130 @@
                                 viewcells.push_back(leaf->mViewCell);
                                 leaf->mViewCell->Mail();
-                                hits++;
+                                ++ hits;
                         }
                 

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.h

@@ -618 +618 @@
         int     _CastRay(Ray &ray);
 
-
         int     CastLineSegment(const Vector3 &origin,
                                                 const Vector3 &termination,

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

@@ -1788 +1788 @@
         Vector3 termination = hray.Extrap(tmax);
 
+        ViewCell::NewMail();
+
         // traverse the view space subdivision
         CastLineSegment(origin, termination, viewcells);
@@ -1807 +1809 @@
                         // if ray not outside of view space
                         float contribution;
-                        if (ray.mTerminationObject) {
-                          if (viewcell->GetPvs().GetSampleContribution(ray.mTerminationObject,
-                                                                                                                   ray.mPdf,
-                                                                                                                   contribution))
-                          {
-                                ++ ray.mPvsContribution;
-                                  ray.mRelativePvsContribution += contribution;
-                          }
+
+                        if (ray.mTerminationObject) 
+                        {
+                                cout << "f";
+                                if (viewcell->GetPvs().GetSampleContribution(ray.mTerminationObject,
+                                        ray.mPdf,
+                                        contribution))
+                                {
+                                        ++ ray.mPvsContribution;
+                                        ray.mRelativePvsContribution += contribution;
+                                }
                         }
+                        
+#if SAMPLE_ORIGIN_OBJECTS
+
                         // for directional sampling it is important to count only contributions
                         // made in one direction!!!
                         // the other contributions of this sample will be counted for the oposite ray!
-#if SAMPLE_ORIGIN_OBJECTS
+
                         if (ray.mOriginObject && 
                                 viewcell->GetPvs().GetSampleContribution(ray.mOriginObject,
@@ -3486 +3494 @@
 
 
-
 /**************************************************************************/
 /*                   VspBspViewCellsManager implementation                */
@@ -5506 +5513 @@
         Vector3 termination = hray.Extrap(tmax);
 
+        ViewCell::NewMail();
+
         // traverse the view space subdivision
         CastLineSegment(origin, termination, viewcells);
 
         if (storeViewCells)
-        {       // copy viewcells memory efficiently
+        {       
+                // copy viewcells memory efficiently
                 ray.mViewCells.reserve(viewcells.size());
                 ray.mViewCells = viewcells;

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

@@ -3410 +3410 @@
         float mint = 0.0f, maxt = 1.0f;
 
-        Intersectable::NewMail();
-        ViewCell::NewMail();
+        //ViewCell::NewMail();
 
         Vector3 entp = origin;

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

@@ -730 +730 @@
         
         // compute locally best split plane
-        const float ratio = SelectSplitPlane(
-                splitCandidate.mParentData, 
-                splitCandidate.mSplitPlane, 
-                frontProb, 
-                backProb);
+        const float ratio = SelectSplitPlane(splitCandidate.mParentData, 
+                                                                                 splitCandidate.mSplitPlane, 
+                                                                                 frontProb, 
+                                                                                 backProb);
 
         const bool success = ratio < mTermMaxCostRatio;
 
+        // max cost threshold violated?
+        splitCandidate.mMaxCostMisses = 
+                success ? splitCandidate.mParentData.mMaxCostMisses : splitCandidate.mParentData.mMaxCostMisses + 1;
+        
         float oldRenderCost;
 
@@ -758 +761 @@
         
         splitCandidate.SetPriority(priority);
-
-        // max cost threshold violated?
-        splitCandidate.mMaxCostMisses = 
-                success ? splitCandidate.mParentData.mMaxCostMisses : splitCandidate.mParentData.mMaxCostMisses + 1;
-        //Debug << "p: " << tData.mNode << " depth: " << tData.mDepth << endl;
 }
 
@@ -907 +905 @@
         }
 }
-
-
 
 
@@ -992 +988 @@
         mLocalSubdivisionCandidates->reserve(requestedSize);
 
-
         float pos;
-
         RayInfoContainer::const_iterator rit, rit_end = rays.end();
 
@@ -1017 +1011 @@
 
 
-int VspTree::GetPvsContribution(Intersectable *object) const
-{
-    int pvsContri = 0;
-
-        KdPvsMap::const_iterator kit, kit_end = object->mKdPvs.mEntries.end();
-
-        Intersectable::NewMail();
-
-        // Search kd leaves this object is attached to
-        for (kit = object->mKdPvs.mEntries.begin(); kit != kit_end; ++ kit)
-        {
-                KdNode *l = (*kit).first;
-
-                // new object found during sweep 
-                // => increase pvs contribution of this kd node
-                if (!l->Mailed())
-                {
-                        l->Mail();
-                        ++ pvsContri;
-                }
-        }
-
-        return pvsContri;
-}
-
-
-int VspTree::PrepareHeuristics(const VssRay &ray, const bool isTermination)
-{
-        int pvsSize = 0;
-        
-        Intersectable *obj;
-        Vector3 pt;
-        KdNode *node;
-
-        ray.GetSampleData(isTermination, pt, &obj, &node);
-
-        if (!obj)
-                return 0;
-
-        switch (mHierarchyManager->GetObjectSpaceSubdivisonType())
-        {
-        case HierarchyManager::NO_OBJ_SUBDIV:
-                {
-                        if (!obj->Mailed())
-                        {
-                                obj->Mail();
-                                obj->mCounter = 1;
-
-                                ++ pvsSize;
-                        }
-                        else
-                        {
-                                ++ obj->mCounter;
-                        }
-                        break;
-                }
-        case HierarchyManager::KD_BASED_OBJ_SUBDIV:
-                {
-                        KdLeaf *leaf = mHierarchyManager->mOspTree->GetLeaf(pt, node);
-                        pvsSize += PrepareHeuristics(leaf);     
-                        break;
-                }
-        case HierarchyManager::BV_BASED_OBJ_SUBDIV:
-                {
-                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
-
-                        if (!leaf->Mailed())
-                        {
-                                leaf->Mail();
-                                leaf->mCounter = 1;
-
-                                pvsSize += (int)leaf->mObjects.size();
-                        }
-                        else
-                        {
-                                ++ leaf->mCounter;
-                        }
-                        break;
-                }
-        default:
-                break;
-        }
-
-        return pvsSize;
-}
-
-
 int VspTree::PrepareHeuristics(KdLeaf *leaf)
 {       
@@ -1112 +1019 @@
                 leaf->Mail();
                 leaf->mCounter = 1;
-
                 // add objects without the objects which are in several kd leaves
                 pvsSize += (int)(leaf->mObjects.size() - leaf->mMultipleObjects.size());
-                //Debug << "adding " << (int)leaf->mObjects.size() << " " << leaf->mMultipleObjects.size() << endl;
         }
         else
@@ -1123 +1028 @@
 
         //-- the objects belonging to several leaves must be handled seperately
-
         ObjectContainer::const_iterator oit, oit_end = leaf->mMultipleObjects.end();
 
@@ -1151 +1055 @@
         Intersectable::NewMail();
         KdNode::NewMail();
+        BvhNode::NewMail();
 
         int pvsSize = 0;
@@ -1226 +1131 @@
 
 
-int VspTree::EvalMinEventContribution(const VssRay &ray, 
-                                                                          const bool isTermination) const
-{
-        Intersectable *obj;
-        Vector3 pt;
-        KdNode *node;
-
-        ray.GetSampleData(isTermination, pt, &obj, &node);
-
-        if (!obj) return 0;
-
-        int pvs = 0;
-
-        switch (mHierarchyManager->GetObjectSpaceSubdivisonType())
-        {
-        case HierarchyManager::NO_OBJ_SUBDIV:
-                {
-                        if (!obj->Mailed())
-                        {
-                                obj->Mail();
-                                ++ pvs;
-                        }
-
-                        break;
-                }
-        case HierarchyManager::KD_BASED_OBJ_SUBDIV:
-                {
-                        KdLeaf *leaf = mHierarchyManager->mOspTree->GetLeaf(pt, node);
-                        // add contributions of the kd nodes
-                        pvs += EvalMinEventContribution(leaf);
-                                        
-                        break;
-                }
-        case HierarchyManager::BV_BASED_OBJ_SUBDIV:
-                {
-                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
-
-                        if (!leaf->Mailed())
-                        {
-                                leaf->Mail();
-                                pvs += (int)leaf->mObjects.size();
-                        }
-                        break;
-                }
-        default:
-                break;
-        }
-        return pvs;
-}
-
-
-int VspTree::EvalMaxEventContribution(const VssRay &ray, 
-                                                                          const bool isTermination) const
-{
-        Intersectable *obj;
-        Vector3 pt;
-        KdNode *node;
-
-        ray.GetSampleData(isTermination, pt, &obj, &node);
-
-        if (!obj) return 0;
-
-        int pvs = 0;
-
-        switch (mHierarchyManager->GetObjectSpaceSubdivisonType())
-        {
-        case HierarchyManager::NO_OBJ_SUBDIV:
-                {
-                        if (-- obj->mCounter == 0)
-                                ++ pvs;
-                        break;
-                }
-        case HierarchyManager::KD_BASED_OBJ_SUBDIV:
-                {
-                        KdLeaf *leaf = mHierarchyManager->mOspTree->GetLeaf(pt, node);
-
-                        // add contributions of the kd nodes
-                        pvs += EvalMaxEventContribution(leaf);
-                        break;
-                }
-        case HierarchyManager::BV_BASED_OBJ_SUBDIV:
-                {
-                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
-
-                        if (-- leaf->mCounter == 0)
-                                pvs += (int)leaf->mObjects.size();
-                        break;
-                }
-        default:
-                break;
-        }
-
-        return pvs;
-}
-
-
-void VspTree::EvalHeuristicsContribution(const SortableEntry &ci,
-                                                                                 int &pvsLeft,
-                                                                                 int &pvsRight) const
+void VspTree::EvalHeuristics(const SortableEntry &ci,
+                                                         int &pvsLeft,
+                                                         int &pvsRight) const
 {
         VssRay *ray = ci.ray;
 
+        // eval changes in pvs causes by min event 
         if (ci.type == SortableEntry::ERayMin)
         {
@@ -1333 +1143 @@
                 pvsLeft += EvalMinEventContribution(*ray, false);
         }
-        else
+        else // eval changes in pvs causes by max event 
         {
                 pvsRight -= EvalMaxEventContribution(*ray, true);
@@ -1358 +1168 @@
         }
 
-        int pvsSize = tData.mPvs;
-
         const float minBox = box.Min(axis);
         const float maxBox = box.Max(axis);
@@ -1371 +1179 @@
 
         // prepare the sweep
-        // (note: returns pvs size, so there would be no need 
-        // to give pvs size as argument)
-        pvsSize = PrepareHeuristics(usedRays);
+        // note: returns pvs size => no need t give pvs size as function parameter
+        const int pvsSize = PrepareHeuristics(usedRays);
 
         // go through the lists, count the number of objects left and right
@@ -1398 +1205 @@
         Intersectable::NewMail();
         KdLeaf::NewMail();
-
+        BvhLeaf::NewMail();
 
         //-- traverse through visibility events
@@ -1406 +1213 @@
         for (ci = mLocalSubdivisionCandidates->begin(); ci != ci_end; ++ ci)
         {
-                EvalHeuristicsContribution(*ci, pvsl, pvsr);
+                // compute changes to front and back pvs
+                EvalHeuristics(*ci, pvsl, pvsr);
 
                 // Note: sufficient to compare size of bounding boxes of front and back side?
                 if (((*ci).value >= minBand) && ((*ci).value <= maxBand))
                 {
-
                         float currentPos;
                         
@@ -1421 +1228 @@
 
                         sum = pvsl * ((*ci).value - minBox) + pvsr * (maxBox - (*ci).value);
-                        //Debug  << "pos=" << (*ci).value << "\t newpos=" << currentPos << "\t pvs=(" <<  pvsl << "," << pvsr << ")" << "\t cost= " << sum << endl;
+                        
 
                         if (sum < minSum)
@@ -1460 +1267 @@
         const float volRatio = tData.mBoundingBox.GetVolume() / (sizeBox * mBoundingBox.GetVolume());
 
-/*      
-//if (axis != 1)
-        //Debug << "axis=" << axis << " costRatio=" << ratio << " pos=" << position << " t=" << (position - minBox) / (maxBox - minBox)
-        //      <<"\t pb=(" << pvsBack << ")\t pf=(" << pvsFront << ")" << endl;
-
-Debug << "\n§§§§ eval local cost §§§§" << endl
+        Debug << "\n§§§§ eval local cost §§§§" << endl
                   << "back pvs: " << penaltyBack << " front pvs: " << penaltyFront << " total pvs: " << penaltyOld << endl 
                   << "back p: " << pBack * volRatio << " front p " << pFront * volRatio << " p: " << pOverall * volRatio << endl
                   << "old rc: " << oldRenderCost * volRatio << " new rc: " << newRenderCost * volRatio << endl
                   << "render cost decrease: " << oldRenderCost * volRatio - newRenderCost * volRatio << endl;
-*/
+
         return ratio;
 }
@@ -1494 +1296 @@
     const bool useSpecialAxis = 
                 mOnlyDrivingAxis || mCirculatingAxis;
-        //Debug << "data: " << tData.mBoundingBox << " pvs " << tData.mPvs << endl;
+        
         if (mCirculatingAxis)
         {
@@ -1546 +1348 @@
         }
 
-
         //-- assign values of best split
-        
         plane.mAxis = bestAxis;
         plane.mPosition = nPosition[bestAxis]; // split plane position
@@ -1555 +1355 @@
         pBack = nProbBack[bestAxis];
 
-        //Debug << "val: " << nCostRatio[bestAxis] << " axis: " << bestAxis << endl;
         return nCostRatio[bestAxis];
 }
@@ -1578 +1377 @@
         Intersectable::NewMail(3);
         KdLeaf::NewMail(3);
+        BvhLeaf::NewMail(3);
 
         RayInfoContainer::const_iterator rit, rit_end = data.mRays->end();
@@ -1588 +1388 @@
                 VssRay *ray = rayInf.mRay;
 
+                // classify ray
                 const int cf = 
                         rayInf.ComputeRayIntersection(candidatePlane.mAxis, 
                                                                                   candidatePlane.mPosition, t);
 
-                switch (mHierarchyManager->GetObjectSpaceSubdivisonType())
-                {
-                case HierarchyManager::NO_OBJ_SUBDIV:
-                {
-                        // find front and back pvs for origing and termination object
-                        UpdateObjPvsContri(ray->mTerminationObject, cf, pvsFront, pvsBack, totalPvs);
-                        UpdateObjPvsContri(ray->mOriginObject, cf, pvsFront, pvsBack, totalPvs);
-
-                        break;
-                }
-                case HierarchyManager::KD_BASED_OBJ_SUBDIV:
-                {
-                        break;
-                }
-                case HierarchyManager::BV_BASED_OBJ_SUBDIV:
-                {
-                        BvhLeaf *tLeaf = mHierarchyManager->mBvHierarchy->GetLeaf(ray->mTerminationObject);
-                        BvhLeaf *oLeaf = mHierarchyManager->mBvHierarchy->GetLeaf(ray->mOriginObject);
-
-                        UpdateBvhLeafPvsContri(tLeaf, cf, pvsFront, pvsBack, totalPvs);
-                        UpdateBvhLeafPvsContri(oLeaf, cf, pvsFront, pvsBack, totalPvs);
-                        
-                        break;
-                }
-        default:
-                break;
-        }
-
-/*
-                if (!mUseKdPvsForHeuristics)
-                {
-                        
-                }
-                else
-                {
-                        if (ray->mTerminationObject)
-                        {
-                                KdLeaf *leaf = mHierarchyManager->mOspTree->GetLeaf(ray->mTermination, ray->mTerminationNode);
-                                UpdateKdLeafPvsContri(leaf, cf, pvsFront, pvsBack, totalPvs);
-                        }
-
-                        if (ray->mOriginObject)
-                        {
-                                KdLeaf *leaf = mHierarchyManager->mOspTree->GetLeaf(ray->mOrigin, ray->mOriginNode);
-                                UpdateKdLeafPvsContri(leaf, cf, pvsFront, pvsBack, totalPvs);
-                        }
-                }
-*/
+                // evaluate contribution of ray endpoint to front and back pvs
+                // with respect to the classification
+                UpdateContributionsToPvs(*ray, true, cf, pvsFront, pvsBack, totalPvs);
+                UpdateContributionsToPvs(*ray, false, cf, pvsFront, pvsBack, totalPvs);
         }
 
@@ -1649 +1406 @@
 
         pFront = frontBox.GetVolume();
-        pBack = pOverall - pFront;
-                
+        pBack = pOverall - pFront;      
 
         //-- pvs rendering heuristics
+
         const int lowerPvsLimit = mViewCellsManager->GetMinPvsSize();
         const int upperPvsLimit = mViewCellsManager->GetMaxPvsSize();
 
         //-- only render cost heuristics or combined with standard deviation
+
         const float penaltyOld = EvalPvsPenalty((int)totalPvs, lowerPvsLimit, upperPvsLimit);
     const float penaltyFront = EvalPvsPenalty((int)pvsFront, lowerPvsLimit, upperPvsLimit);
@@ -1667 +1425 @@
 
         const float renderCostDecrease = (oldRenderCost - newRenderCost) / viewSpaceVol;
-        /*
+        
         Debug << "\n==== eval render cost decrease ===" << endl
                   << "back pvs: " << pvsBack << " front pvs " << pvsFront << " total pvs: " << totalPvs << endl 
@@ -1673 +1431 @@
                   << "old rc: " << normalizedOldRenderCost << " new rc: " << newRenderCost / viewSpaceVol << endl
                   << "render cost decrease: " << renderCostDecrease << endl;
-*/
+
         return renderCostDecrease;
 }
+
 
 
@@ -1699 +1458 @@
         for(rit = data.mRays->begin(); rit != rit_end; ++ rit)
         {
+                VssRay *ray = (*rit).mRay;
+
                 // determine the side of this ray with respect to the plane
                 float t;
                 const int side = (*rit).ComputeRayIntersection(axis, position, t);
         
-                UpdateObjPvsContri((*rit).mRay->mTerminationObject, side, pvsFront, pvsBack, pvsTotal);
-                UpdateObjPvsContri((*rit).mRay->mOriginObject, side, pvsFront, pvsBack, pvsTotal);
-        }
+                UpdateContributionsToPvs(*ray, true, side, pvsFront, pvsBack, pvsTotal);
+                UpdateContributionsToPvs(*ray, false, side, pvsFront, pvsBack, pvsTotal);
+        }
+
 
         //-- evaluate cost heuristics
 
-        float pOverall;
-        
-        pOverall = data.mProbability;
+        float pOverall = data.mProbability;
 
         // we use spatial mid split => simplified computation
@@ -1728 +1488 @@
 
 
-void VspTree::UpdateObjPvsContri(Intersectable *obj,
-                                                                 const int cf,
-                                                                 float &frontPvs,
-                                                                 float &backPvs,
-                                                                 float &totalPvs) const
+void VspTree::UpdateContributionsToPvs(Intersectable *obj,
+                                                                           const int cf,
+                                                                           float &frontPvs,
+                                                                           float &backPvs,
+                                                                           float &totalPvs) const
 {
         if (!obj) return;
@@ -1779 +1539 @@
 
 
-void VspTree::UpdateBvhLeafPvsContri(BvhLeaf *leaf,
-                                                                         const int cf,
-                                                                         float &frontPvs,
-                                                                         float &backPvs,
-                                                                         float &totalPvs) const
+void VspTree::UpdateContributionsToPvs(BvhLeaf *leaf,
+                                                                           const int cf,
+                                                                           float &frontPvs,
+                                                                           float &backPvs,
+                                                                           float &totalPvs) const
 {
         if (!leaf) return;
-/*
+
         const int renderCost = (int)leaf->mObjects.size();
 
@@ -1825 +1585 @@
                                 leaf->Mail(1);
                 }
-        }*/
-}
-
-
-
-void VspTree::UpdateKdLeafPvsContri(KdLeaf *leaf,
-                                                                        const int cf,
-                                                                        float &frontPvs,
-                                                                        float &backPvs,
-                                                                        float &totalPvs) const
+        }
+}
+
+
+
+void VspTree::UpdateContributionsToPvs(KdLeaf *leaf,
+                                                                           const int cf,
+                                                                           float &frontPvs,
+                                                                           float &backPvs,
+                                                                           float &totalPvs) const
 {
         if (!leaf) return;
@@ -1847 +1607 @@
         }
 
-        // compute contribution of yet unclassified objects
+        // recursivly update contributions of yet unclassified objects
         ObjectContainer::const_iterator oit, oit_end = leaf->mMultipleObjects.end();
 
         for (oit = leaf->mMultipleObjects.begin(); oit != oit_end; ++ oit)
         {       
-                UpdateObjPvsContri(*oit, cf, frontPvs, backPvs, totalPvs);
+                UpdateContributionsToPvs(*oit, cf, frontPvs, backPvs, totalPvs);
     }   
         
@@ -2296 +2056 @@
 
 
-void VspTree::CollectPvs(const RayInfoContainer &rays, 
-                                                 ObjectContainer &objects) const
-{
-        RayInfoContainer::const_iterator rit, rit_end = rays.end();
-
-        Intersectable::NewMail();
-
-        for (rit = rays.begin(); rit != rays.end(); ++ rit)
-        {
-                VssRay *ray = (*rit).mRay;
-
-                Intersectable *object;
-                object = ray->mOriginObject;
-
-        if (object)
-                {
-                        if (!object->Mailed())
-                        {
-                                object->Mail();
-                                objects.push_back(object);
-                        }
-                }
-
-                object = ray->mTerminationObject;
-
-                if (object)
-                {
-                        if (!object->Mailed())
-                        {
-                                object->Mail();
-                                objects.push_back(object);
-                        }
-                }
-        }
-}
-
-
-int VspTree::EvalPvsContribution(const VssRay &ray, const bool isTermination) const
-{       
-        Intersectable *obj; 
-        Vector3 pt;
-        KdNode *node;
-
-        ray.GetSampleData(isTermination, pt, &obj, &node);
-
-        if (!obj) return 0;
-
-        int pvs = 0;
-
-        switch(mHierarchyManager->GetObjectSpaceSubdivisonType())
-        {
-        case HierarchyManager::NO_OBJ_SUBDIV:
-                {
-                        if (!obj->Mailed())
-                        {
-                                obj->Mail();
-                                ++ pvs;
-                        }
-
-                        break;
-                }
-        case HierarchyManager::KD_BASED_OBJ_SUBDIV:
-                {
-                        KdLeaf *leaf = mHierarchyManager->mOspTree->GetLeaf(pt, node);
-
-                        if (!leaf->Mailed())
-                        {
-                                leaf->Mail();
-                                pvs += (int)(leaf->mObjects.size() - leaf->mMultipleObjects.size());
-                                
-                                ObjectContainer::const_iterator oit, oit_end = leaf->mMultipleObjects.end();
-                                for (oit = leaf->mMultipleObjects.begin(); oit != oit_end; ++ oit)
-                                {
-                                        Intersectable *obj = *oit;
-
-                                        if (!obj->Mailed())
-                                        {
-                                                obj->Mail();
-                                                ++ pvs;
-                                        }
-                                }
-                        }
-
-                        break;
-                }
-        case HierarchyManager::BV_BASED_OBJ_SUBDIV:
-                {
-                        BvhLeaf *bvhleaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
-
-                        if (!bvhleaf->Mailed())
-                        {
-                                bvhleaf->Mail();
-                                pvs += (int)bvhleaf->mObjects.size();
-                        }
-
-                        break;
-                }
-        default:
-                break;
-        }
-
-        return pvs;
-}
-
-
 int VspTree::EvalPvsSize(const RayInfoContainer &rays) const
 {
@@ -2414 +2069 @@
         {
                 VssRay *ray = (*rit).mRay;
-                pvsSize += EvalPvsContribution(*ray, true);
-                pvsSize += EvalPvsContribution(*ray, false);
+
+                pvsSize += EvalContributionToPvs(*ray, true);
+                pvsSize += EvalContributionToPvs(*ray, false);
         }
         
@@ -2430 +2086 @@
 int VspTree::CastLineSegment(const Vector3 &origin,
                                                          const Vector3 &termination,
-                             ViewCellContainer &viewcells)
+                             ViewCellContainer &viewcells,
+                                                         const bool useMailboxing)
 {
         int hits = 0;
@@ -2438 +2095 @@
 
         stack<LineTraversalData> tStack;
-
-        //Intersectable::NewMail();
-        //ViewCell::NewMail();
 
         Vector3 entp = origin;
@@ -2503 +2157 @@
                         ViewCell *vc = leaf->GetViewCell();
 
-                        // don't have to mail because each view cell belongs to exactly one leaf
-                        //if (!vc->Mailed())
-                        //{
-                        //      vc->Mail();
+                        // don't have to mail if each view cell belongs to exactly one leaf
+                        if (!useMailboxing || !vc->Mailed())
+                        {
+                                if (useMailboxing)
+                                        vc->Mail();
+
                                 viewcells.push_back(vc);
                                 ++ hits;
-                        //}
+                        }
 #if 0
                         leaf->mRays.push_back(RayInfo(new VssRay(origin, termination, NULL, NULL, 0)));
@@ -2932 +2588 @@
 void VspTree::GetViewCells(const VssRay &ray, ViewCellContainer &viewCells)
 {
-#if 1 
-        // use view cells manager to compute view cells
-        VssRay vcRay(ray);
-
-        mViewCellsManager->ComputeSampleContribution(vcRay, false, true);
-        viewCells = vcRay.mViewCells;
-#else
         static Ray hray;
         hray.Init(ray);
@@ -2950 +2599 @@
         const Vector3 termination = hray.Extrap(tmax);
 
-        // if no precomputation of view cells
-        CastLineSegment(origin, termination, viewCells);
-#endif
+        // view cells were not precomputed
+        // don't mail because we need mailboxing for something else
+        CastLineSegment(origin, termination, viewCells, false);
 }
 
@@ -3052 +2701 @@
 }
 
-}
+
+int VspTree::EvalMaxEventContribution(const VssRay &ray, 
+                                                                          const bool isTermination) const
+{
+        Intersectable *obj;
+        Vector3 pt;
+        KdNode *node;
+
+        ray.GetSampleData(isTermination, pt, &obj, &node);
+
+        if (!obj) 
+                return 0;
+
+        int pvs = 0;
+
+        switch ( mHierarchyManager->GetObjectSpaceSubdivisonType())
+        {
+        case HierarchyManager::NO_OBJ_SUBDIV:
+                {
+                        if (-- obj->mCounter == 0)
+                                ++ pvs;
+                        break;
+                }
+        case HierarchyManager::KD_BASED_OBJ_SUBDIV:
+                {
+                        KdLeaf *leaf = mHierarchyManager->mOspTree->GetLeaf(pt, node);
+
+                        // add contributions of the kd nodes
+                        pvs += EvalMaxEventContribution(leaf);
+                        break;
+                }
+        case HierarchyManager::BV_BASED_OBJ_SUBDIV:
+                {
+                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+
+                        if (-- leaf->mCounter == 0)
+                                pvs += (int)leaf->mObjects.size();
+                        break;
+                }
+        default:
+                break;
+        }
+
+        return pvs;
+}
+
+
+int VspTree::PrepareHeuristics(const VssRay &ray, const bool isTermination)
+{
+        int pvsSize = 0;
+        
+        Intersectable *obj;
+        Vector3 pt;
+        KdNode *node;
+
+        ray.GetSampleData(isTermination, pt, &obj, &node);
+
+        if (!obj)
+                return 0;
+
+        switch (mHierarchyManager->GetObjectSpaceSubdivisonType())
+        {
+        case HierarchyManager::NO_OBJ_SUBDIV:
+                {
+                        if (!obj->Mailed())
+                        {
+                                obj->Mail();
+                                obj->mCounter = 0;
+
+                                ++ pvsSize;
+                        }
+
+                        ++ obj->mCounter;       
+                        break;
+                }
+        case HierarchyManager::KD_BASED_OBJ_SUBDIV:
+                {
+                        KdLeaf *leaf = mHierarchyManager->mOspTree->GetLeaf(pt, node);
+                        pvsSize += PrepareHeuristics(leaf);     
+                        break;
+                }
+        case HierarchyManager::BV_BASED_OBJ_SUBDIV:
+                {
+                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+
+                        if (!leaf->Mailed())
+                        {
+                                leaf->Mail();
+                                leaf->mCounter = 0;
+
+                                pvsSize += (int)leaf->mObjects.size();
+                        }
+
+                        ++ leaf->mCounter;      
+                        break;
+                }
+        default:
+                break;
+        }
+
+        return pvsSize;
+}
+
+
+int VspTree::EvalMinEventContribution(const VssRay &ray, 
+                                                                          const bool isTermination) const
+{
+        Intersectable *obj;
+        Vector3 pt;
+        KdNode *node;
+
+        ray.GetSampleData(isTermination, pt, &obj, &node);
+
+        if (!obj) return 0;
+
+        int pvs = 0;
+
+        switch (mHierarchyManager->GetObjectSpaceSubdivisonType())
+        {
+        case HierarchyManager::NO_OBJ_SUBDIV:
+                {
+                        if (!obj->Mailed())
+                        {
+                                obj->Mail();
+                                ++ pvs;
+                        }
+                        break;
+                }
+        case HierarchyManager::KD_BASED_OBJ_SUBDIV:
+                {
+                        KdLeaf *leaf = mHierarchyManager->mOspTree->GetLeaf(pt, node);
+                        // add contributions of the kd nodes
+                        pvs += EvalMinEventContribution(leaf);                          
+                        break;
+                }
+        case HierarchyManager::BV_BASED_OBJ_SUBDIV:
+                {
+                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+
+                        if (!leaf->Mailed())
+                        {
+                                leaf->Mail();
+                                pvs += (int)leaf->mObjects.size();
+                        }
+                        break;
+                }
+        default:
+                break;
+        }
+
+        return pvs;
+}
+
+
+void VspTree::UpdateContributionsToPvs(const VssRay &ray,
+                                                                           const bool isTermination,
+                                                                           const int cf,
+                                                                           float &frontPvs,
+                                                                           float &backPvs,
+                                                                           float &totalPvs) const
+{
+        Intersectable *obj;
+        Vector3 pt;
+        KdNode *node;
+
+        ray.GetSampleData(isTermination, pt, &obj, &node);
+
+        if (!obj) return;
+
+        switch (mHierarchyManager->GetObjectSpaceSubdivisonType())
+        {
+                case HierarchyManager::NO_OBJ_SUBDIV:
+                {
+                        // find front and back pvs for origing and termination object
+                        UpdateContributionsToPvs(obj, cf, frontPvs, backPvs, totalPvs);
+                        break;
+                }
+                case HierarchyManager::KD_BASED_OBJ_SUBDIV:
+                {
+                        KdLeaf *leaf = mHierarchyManager->mOspTree->GetLeaf(pt, node);
+                        UpdateContributionsToPvs(leaf, cf, frontPvs, backPvs, totalPvs);
+                        break;
+                }
+                case HierarchyManager::BV_BASED_OBJ_SUBDIV:
+                {
+                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+                        UpdateContributionsToPvs(leaf, cf, frontPvs, backPvs, totalPvs);
+                        break;
+                }
+        }
+}
+
+
+int VspTree::EvalContributionToPvs(const VssRay &ray, 
+                                                                   const bool isTermination) const
+{       
+        Intersectable *obj; 
+        Vector3 pt;
+        KdNode *node;
+
+        ray.GetSampleData(isTermination, pt, &obj, &node);
+
+        if (!obj) 
+                return 0;
+
+        int pvs = 0;
+
+        switch(mHierarchyManager->GetObjectSpaceSubdivisonType())
+        {
+        case HierarchyManager::NO_OBJ_SUBDIV:
+                {
+                        if (!obj->Mailed())
+                        {
+                                obj->Mail();
+                                ++ pvs;
+                        }
+                        break;
+                }
+        case HierarchyManager::KD_BASED_OBJ_SUBDIV:
+                {
+                        KdLeaf *leaf = mHierarchyManager->mOspTree->GetLeaf(pt, node);
+
+                        pvs += EvalContributionToPvs(leaf);
+                        break;
+                }
+        case HierarchyManager::BV_BASED_OBJ_SUBDIV:
+                {
+                        BvhLeaf *bvhleaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+
+                        if (!bvhleaf->Mailed())
+                        {
+                                bvhleaf->Mail();
+                                pvs += (int)bvhleaf->mObjects.size();
+                        }
+                        break;
+                }
+        default:
+                break;
+        }
+
+        return pvs;
+}
+
+
+int VspTree::EvalContributionToPvs(KdLeaf *leaf) const
+{
+        if (leaf->Mailed()) // leaf already mailed
+                return 0;
+
+        leaf->Mail();
+
+        int pvs = 0;
+        pvs += (int)(leaf->mObjects.size() - leaf->mMultipleObjects.size());
+
+        ObjectContainer::const_iterator oit, oit_end = leaf->mMultipleObjects.end();
+
+        for (oit = leaf->mMultipleObjects.begin(); oit != oit_end; ++ oit)
+        {
+                Intersectable *obj = *oit;
+
+                if (!obj->Mailed())
+                {
+                        obj->Mail();
+                        ++ pvs;
+                }
+        }
+
+        return pvs;
+}
+
+}

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

@@ -548 +548 @@
     int CastLineSegment(const Vector3 &origin,
                                                 const Vector3 &termination,
-                                                ViewCellContainer &viewcells);
+                                                ViewCellContainer &viewcells,
+                                                const bool useMailboxing = true);
 
                 
@@ -618 +619 @@
         void GetViewCells(const VssRay &ray, ViewCellContainer &viewCells);
 
-
+        /** Returns view cells tree.
+        */
         ViewCellsTree *GetViewCellsTree() const { return mViewCellsTree; }
 
+        /** Sets the view cells tree.
+        */
         void SetViewCellsTree(ViewCellsTree *vt) { mViewCellsTree = vt; }
 
@@ -763 +767 @@
         int EvalPvsSize(const RayInfoContainer &rays) const;
 
-        /** Computes pvs increase with respect to the previous pvs for heuristics.
-        */
-        int GetPvsIncr(Intersectable *object, const KdPvsMap &activeNodes);
-
-        /** Returns absolute pvs contribution of this object.
-        */
-        int GetPvsContribution(Intersectable *object) const;
-
         /** Computes best cost for axis aligned planes.
         */
@@ -778 +774 @@
                                                                   float &position);
 
+
+
+        //////////////////////////////////////////
+        // Helper function for computing heuristics
+
         /** Evaluates the contribution to left and right pvs at a visibility event ve.
                 @param ve the visibility event
@@ -783 +784 @@
                 @param rightPvs updates the right pvs
         */
-        void EvalHeuristicsContribution(
-                const SortableEntry &ve, 
-                int &pvsLeft, 
-                int &pvsRight) const;
-
-        /** Evaluates contribution of the ray to the left and right pvs.
+        void EvalHeuristics(const SortableEntry &ve, int &pvsLeft, int &pvsRight) const;
+
+        /** Evaluates contribution of min event to pvs
         */
         int EvalMinEventContribution(
                 const VssRay &ray, const bool isTermination) const;
 
+        /** Evaluates contribution of max event to pvs
+        */
         int EvalMaxEventContribution(
                 const VssRay &ray, const bool isTermination) const;
 
+        /** Evaluates contribution of kd leaf when encountering a min event
+        */
         int EvalMinEventContribution(KdLeaf *leaf) const;
+        /**  Evaluates contribution of kd leaf when encountering a max event
+        */
         int EvalMaxEventContribution(KdLeaf *leaf) const;
 
         /** Prepares objects for the heuristics.
-                @returns pvs size of the ray container
+                @returns pvs size as seen by the rays.
         */
         int PrepareHeuristics(const RayInfoContainer &rays);
+        
+        /** Prepare a single ray for heuristics.
+        */
         int PrepareHeuristics(const VssRay &ray, const bool isTermination);
+        /** Prepare a single kd leaf for heuristics.
+        */
         int PrepareHeuristics(KdLeaf *leaf);
+
+        /////////////////////////////////////////////////////////////////////////////
+
 
         /** Subdivides the rays into front and back rays according to the split plane.
@@ -831 +843 @@
         
         */
-        void UpdateObjPvsContri(
+        void UpdateContributionsToPvs(
+                const VssRay &ray,
+                const bool isTermination,
+                const int cf,
+                float &frontPvs,
+                float &backPvs,
+                float &totalPvs) const;
+
+        /** Evaluates the contribution for objects.
+        */
+        void UpdateContributionsToPvs(
                 Intersectable *obj, 
                 const int cf, 
@@ -838 +860 @@
                 float &totalPvs) const;
 
-        void UpdateBvhLeafPvsContri(
+        /** Evaluates the contribution for bounding volume leaves.
+        */
+        void UpdateContributionsToPvs(
                 BvhLeaf *leaf,
                 const int cf,
@@ -845 +869 @@
                 float &totalPvs) const;
 
-        
-        /** See UpdateObjPvsContri. 
-        */
-        void UpdateKdLeafPvsContri(KdLeaf *leaf,
+        /** Evaluates the contribution for kd leaves.
+        */
+        void UpdateContributionsToPvs(
+                KdLeaf *leaf,
                 const int cf,
                 float &frontPvs,
@@ -854 +878 @@
                 float &totalPvs) const;
 
-        /** Collects pvs from rays.
-        */
-        void CollectPvs(const RayInfoContainer &rays,
-                                        ObjectContainer &objects) const;
-
         /** Returns true if tree can be terminated.
         */
@@ -916 +935 @@
                 RayInfoContainer &rays);
 
-        /** Add pvs contribution of this ray.
-        */
-        int EvalPvsContribution(const VssRay &ray, const bool isTermination) const;
+        /** Evaluates pvs contribution of this ray.
+        */
+        int EvalContributionToPvs(const VssRay &ray, const bool isTermination) const;
+
+        /** Evaluates pvs contribution of a kd node.
+        */
+        int EvalContributionToPvs(KdLeaf *leaf) const;
+
 
 protected: