Changeset 2198 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

Timestamp:

03/06/07 17:37:28 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp (modified) (30 diffs)

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

@@ -366 +366 @@
         ObjectContainer::const_iterator oit, oit_end = objects.end();
 
+        // warning: not exact number (there can be rays counted twice)
+        // otherwise we would have to traverse trough all rays
         for (oit = objects.begin(); oit != oit_end; ++ oit)
         {
@@ -373 +375 @@
         return nRays;
 }
+
                                                                         
 float BvHierarchy::GetViewSpaceVolume() const
@@ -384 +387 @@
                                                                                 BvhTraversalData &backData)
 { 
+        // fill view cells cache
         mNodeTimer.Entry();
+
+#if STORE_VIEWCELLS_WITH_BVH
+        AssociateViewCellsWithObjects(sc.mFrontObjects);
+        AssociateViewCellsWithObjects(sc.mBackObjects);
+#endif  
         const BvhTraversalData &tData = sc.mParentData;
         BvhLeaf *leaf = tData.mNode;
@@ -400 +409 @@
         // add the new nodes to the tree
         BvhInterior *node = new BvhInterior(parentBox, leaf->GetParent());
-        
+
 
         //////////////////
@@ -480 +489 @@
                 AssignSortedObjects(sc, frontData, backData);
         }
-        
+
+#if STORE_VIEWCELLS_WITH_BVH
+        ReleaseViewCells(sc.mFrontObjects);
+        ReleaseViewCells(sc.mBackObjects);
+#endif
+
         mNodeTimer.Exit();
 
@@ -615 +629 @@
                                                                                    bool computeSplitPlane)
 {
-        mEvalTimer.Entry();
+        mPlaneTimer.Entry();
+
+#if STORE_VIEWCELLS_WITH_BVH
+        // fill view cells cache
+        AssociateViewCellsWithObjects(*splitCandidate.mParentData.mSortedObjects[3]);
+#endif
+
         if (computeSplitPlane)
         {
@@ -640 +660 @@
                                                                                 previousMisses + 1 : previousMisses);
         }
-
+        mPlaneTimer.Exit();
+
+        mEvalTimer.Entry();
 
         const BvhTraversalData &tData = splitCandidate.mParentData;
@@ -705 +727 @@
         // compute global decrease in render cost
         splitCandidate.SetPriority(priority);
+
+#if STORE_VIEWCELLS_WITH_BVH
+        ReleaseViewCells(*splitCandidate.mParentData.mSortedObjects[3]);
+#endif
+
         mEvalTimer.Exit();
 }
@@ -710 +737 @@
 
 int BvHierarchy::EvalPvsEntriesIncr(BvhSubdivisionCandidate &splitCandidate, 
-                                                                        const float avgRayContri) const
+                                                                        const float avgRayContri) //const
 {
         const float oldPvsSize = (float)CountViewCells(splitCandidate.mParentData.mNode->mObjects);
@@ -991 +1018 @@
 
         SortableEntryContainer::reverse_iterator rcit = 
-                mSubdivisionCandidates->rbegin(), rcit_end = 
-                mSubdivisionCandidates->rend();
+                mSubdivisionCandidates->rbegin(), rcit_end = mSubdivisionCandidates->rend();
 
         vector<float>::reverse_iterator rbit = bordersRight.rbegin();
@@ -1406 +1432 @@
 void BvHierarchy::PrepareLocalSubdivisionCandidates(const BvhTraversalData &tData,
                                                                                                         const int axis)                                                                                 
-{
+{mSort2Timer.Entry();
         //-- insert object queries
         ObjectContainer *objects = mUseGlobalSorting ? 
@@ -1412 +1438 @@
 
         CreateLocalSubdivisionCandidates(*objects, &mSubdivisionCandidates, !mUseGlobalSorting, axis);
+                mSort2Timer.Exit();
 }
 
@@ -1472 +1499 @@
         ViewCellContainer viewCells;
 
-        const int numRays = CollectViewCells(tData.mNode->mObjects, viewCells, true, true);
+        const bool setCounter = true;
+        const bool onlyUnmailed = true;
+
+        const int numRays = CollectViewCells(tData.mNode->mObjects, 
+                                                                                 viewCells, 
+                                                                                 setCounter, 
+                                                                                 onlyUnmailed);
+
         //cout << "number of rays: " << numRays << endl;
 
@@ -1781 +1815 @@
 
 
-float BvHierarchy::EvalRenderCost(const ObjectContainer &objects) const
+float BvHierarchy::EvalRenderCost(const ObjectContainer &objects)// const
 {       
         ///////////////
@@ -1793 +1827 @@
         
         return objRenderCost * p;
-}
-
-
-float BvHierarchy::EvalProb(const ObjectContainer &objects) const
-{       
-        ///////////////
-        //-- render cost heuristics
-
-        const float viewSpaceVol = mViewCellsManager->GetViewSpaceBox().GetVolume();
-
-        // probability that view point lies in a view cell which sees this node
-        return EvalViewCellsVolume(objects) / viewSpaceVol;
 }
 
@@ -1890 +1912 @@
                                                                   ViewCellContainer &viewCells,
                                                                   const bool setCounter,
-                                                                  const bool onlyUnmailedRays) const
+                                                                  const bool onlyUnmailedRays)// const
 {
         ViewCell::NewMail();
+
         ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+        // use mailing to avoid dublicates
+        const bool useMailBoxing = true;
 
         int numRays = 0;
@@ -1899 +1925 @@
         for (oit = objects.begin(); oit != oit_end; ++ oit)
         {
-                // always use only mailed objects
-                numRays += CollectViewCells(*oit, viewCells, true, setCounter, onlyUnmailedRays);
+                // use mailing to avoid duplicates
+                numRays += CollectViewCells(*oit, viewCells, useMailBoxing, setCounter, onlyUnmailedRays);
         }
 
         return numRays;
+}
+
+
+#if STORE_VIEWCELLS_WITH_BVH
+
+
+void BvHierarchy::ReleaseViewCells(const ObjectContainer &objects)
+{
+        ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+        for (oit = objects.begin(); oit != oit_end; ++ oit)
+        {
+                (*oit)->DelViewCells();
+        }
+}
+
+
+void BvHierarchy::AssociateViewCellsWithObjects(const ObjectContainer &objects) const
+{
+        ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+        const bool useMailBoxing = true;
+        for (oit = objects.begin(); oit != oit_end; ++ oit)
+        {
+                ViewCell::NewMail();
+                // use mailing to avoid duplicates
+                AssociateViewCellsWithObject(*oit, useMailBoxing);
+        }
+}
+
+
+int BvHierarchy::AssociateViewCellsWithObject(Intersectable *obj, const bool useMailBoxing) const
+{
+        if (!obj->GetOrCreateViewCells()->empty())
+        {
+                cerr << "AssociateViewCellsWithObject: view cells cache not working" << endl;
+        }
+
+        ViewCellContainer *objViewCells = obj->GetOrCreateViewCells();
+        VssRayContainer *vssRays = obj->GetOrCreateRays();
+
+        VssRayContainer::const_iterator rit, rit_end = vssRays->end();
+
+        // fill cache
+        for (rit = vssRays->begin(); rit < rit_end; ++ rit)
+        {
+                VssRay *ray = (*rit);
+
+                //      if (onlyUnmailedRays && ray->Mailed())
+                //              continue;
+                mHierarchyManager->mVspTree->GetViewCells(*ray, *objViewCells);
+        }
+
+        return (int)vssRays->size();
+}
+
+
+
+int BvHierarchy::CountViewCells(Intersectable *obj) //const
+{
+        ViewCellContainer *viewCells = obj->GetOrCreateViewCells();
+
+        if (obj->GetOrCreateViewCells()->empty())
+        {
+                //cerr << "h";//CountViewCells: view cells empty, view cells cache not working" << endl;
+                return CountViewCellsFromRays(obj);
+        }
+        
+        int result = 0;
+
+        ViewCellContainer::const_iterator vit, vit_end = viewCells->end();
+        
+        for (vit = viewCells->begin(); vit != vit_end; ++ vit)
+        {
+                ViewCell *vc = *vit;
+
+                // store view cells
+                if (!vc->Mailed())
+                {
+                        vc->Mail();
+                        ++ result;
+                }
+        }
+
+        return result;
 }
 
@@ -1911 +2022 @@
                                                                   const bool useMailBoxing,
                                                                   const bool setCounter,
-                                                                  const bool onlyUnmailedRays) const
-{
+                                                                  const bool onlyUnmailedRays)// const
+{
+        if (obj->GetOrCreateViewCells()->empty())
+        {
+                //cerr << "g";//CollectViewCells: view cells empty, view cells cache not working" << endl;
+                return CollectViewCellsFromRays(obj, viewCells, useMailBoxing, setCounter, onlyUnmailedRays);
+        }
+
+        mCollectTimer.Entry();
+
+        ViewCellContainer *objViewCells = obj->GetOrCreateViewCells();
+
+        ///////////
+        //-- use view cells cache
+
+        // fastest way: just copy to the end
+        //if (!useMailBoxing)   viewCells.insert(viewCells.end(), objViewCells->begin(), objViewCells->end());
+
+        // loop through view cells
+        // matt: probably slow to insert  view cells one by one
+        ViewCellContainer::const_iterator vit, vit_end = objViewCells->end();
+
+        for (vit = objViewCells->begin(); vit != vit_end; ++ vit)
+        {
+                ViewCell *vc = *vit;
+
+                // store view cells
+                if (!useMailBoxing || !vc->Mailed())
+                {
+                        if (useMailBoxing) 
+                        {
+                                // view cell not mailed
+                                vc->Mail();
+                                
+                                if (setCounter)
+                                        vc->mCounter = 0;
+                                //viewCells.push_back(vc);
+                        }
+
+                        viewCells.push_back(vc);
+                }
+
+                if (setCounter)
+                        ++ vc->mCounter;
+        }
+
+        mCollectTimer.Exit();
+
+        return (int)objViewCells->size();
+}
+
+
+int BvHierarchy::CollectViewCellsFromRays(Intersectable *obj, 
+                                                                                  ViewCellContainer &viewCells,
+                                                                                  const bool useMailBoxing,
+                                                                                  const bool setCounter,
+                                                                                  const bool onlyUnmailedRays)
+{
+        mCollectTimer.Entry();
         VssRayContainer::const_iterator rit, rit_end = obj->GetOrCreateRays()->end();
 
@@ -1922 +2090 @@
 
                 if (onlyUnmailedRays && ray->Mailed())
-                {
                         continue;
-                }
-
+                
                 ++ numRays;
 
@@ -1945 +2111 @@
                                         vc->Mail();
                                         if (setCounter)
-                                        {
                                                 vc->mCounter = 0;
-                                        }
                                 }
 
@@ -1954 +2118 @@
                         
                         if (setCounter)
-                        {
                                 ++ vc->mCounter;
-                        }
-                }
-        }
-
+                }
+        }
+
+        mCollectTimer.Exit();
         return numRays;
 }
 
 
-int BvHierarchy::CountViewCells(Intersectable *obj) const
+int BvHierarchy::CountViewCellsFromRays(Intersectable *obj) //const
 {
         int result = 0;
@@ -1994 +2157 @@
 }
 
-
-int BvHierarchy::CountViewCells(const ObjectContainer &objects) const
+#else
+
+int BvHierarchy::CountViewCells(Intersectable *obj) //const
+{
+        int result = 0;
+        
+        VssRayContainer::const_iterator rit, rit_end = obj->GetOrCreateRays()->end();
+
+        for (rit = obj->GetOrCreateRays()->begin(); rit < rit_end; ++ rit)
+        {
+                VssRay *ray = (*rit);
+                ViewCellContainer tmpViewCells;
+        
+                mHierarchyManager->mVspTree->GetViewCells(*ray, tmpViewCells);
+                
+                ViewCellContainer::const_iterator vit, vit_end = tmpViewCells.end();
+                for (vit = tmpViewCells.begin(); vit != vit_end; ++ vit)
+                {
+                        ViewCell *vc = *vit;
+
+                        // store view cells
+                        if (!vc->Mailed())
+                        {
+                                vc->Mail();
+                                ++ result;
+                        }
+                }
+        }
+
+        return result;
+}
+
+
+int BvHierarchy::CollectViewCells(Intersectable *obj, 
+                                                                  ViewCellContainer &viewCells,
+                                                                  const bool useMailBoxing,
+                                                                  const bool setCounter,
+                                                                  const bool onlyUnmailedRays)
+{
+        mCollectTimer.Entry();
+        VssRayContainer::const_iterator rit, rit_end = obj->GetOrCreateRays()->end();
+
+        int numRays = 0;
+
+        for (rit = obj->GetOrCreateRays()->begin(); rit < rit_end; ++ rit)
+        {
+                VssRay *ray = (*rit);
+
+                if (onlyUnmailedRays && ray->Mailed())
+                        continue;
+                
+                ++ numRays;
+
+                ViewCellContainer tmpViewCells;
+                mHierarchyManager->mVspTree->GetViewCells(*ray, tmpViewCells);
+
+                // matt: probably slow to allocate memory for view cells every time
+                ViewCellContainer::const_iterator vit, vit_end = tmpViewCells.end();
+
+                for (vit = tmpViewCells.begin(); vit != vit_end; ++ vit)
+                {
+                        ViewCell *vc = *vit;
+
+                        // store view cells
+                        if (!useMailBoxing || !vc->Mailed())
+                        {
+                                if (useMailBoxing) // => view cell not mailed
+                                {
+                                        vc->Mail();
+                                        if (setCounter)
+                                                vc->mCounter = 0;
+                                }
+
+                                viewCells.push_back(vc);
+                        }
+                        
+                        if (setCounter)
+                                ++ vc->mCounter;
+                }
+        }
+
+        mCollectTimer.Exit();
+        return numRays;
+}
+#endif
+
+
+int BvHierarchy::CountViewCells(const ObjectContainer &objects)// const
 {
         int nViewCells = 0;
-        ViewCell::NewMail();
+
+        //ViewCell::NewMail();
         ObjectContainer::const_iterator oit, oit_end = objects.end();
 
@@ -2179 +2429 @@
 
 
-float BvHierarchy::EvalViewCellsVolume(const ObjectContainer &objects) const
+float BvHierarchy::EvalViewCellsVolume(const ObjectContainer &objects)// const
 {
         float vol = 0;
@@ -2257 +2507 @@
         //cout << "using " << nRays << " of " << (int)sampleRays.size() << " rays" << endl;
         
+#if STORE_VIEWCELLS_WITH_BVH
+        AssociateViewCellsWithObjects(objects);
+#endif
+
         // probability that volume is "seen" from the view cells
         const float prop = EvalViewCellsVolume(objects) / GetViewSpaceVolume();
@@ -2283 +2537 @@
         bvhLeaf->SetSubdivisionCandidate(oSubdivisionCandidate);
 
+#if STORE_VIEWCELLS_WITH_BVH
+        ReleaseViewCells(objects);
+#endif
+
         if (mApplyInitialPartition)
         {
@@ -2325 +2583 @@
                                                                                                 const ObjectContainer &objects)
 {
-        mSortTimer.Entry();
-
         const bool doSort = true;
 
@@ -2362 +2618 @@
         stable_sort(tData.mSortedObjects[3]->begin(), tData.mSortedObjects[3]->end(), smallerSize);
         //sort(tData.mSortedObjects[3]->begin(), tData.mSortedObjects[3]->end(), smallerSize);
-
-        mSortTimer.Exit();
 }
 
@@ -2412 +2666 @@
                                                 const ObjectContainer &objects)
 {
+
         // reset stats
         mBvhStats.Reset();
@@ -2424 +2679 @@
         mRoot = bvhleaf;
         
+#if STORE_VIEWCELLS_WITH_BVH
+        AssociateViewCellsWithObjects(objects);
+#endif
+
         //mTermMinProbability *= mVspTree->GetBoundingBox().GetVolume();
         // probability that volume is "seen" from the view cells
@@ -2438 +2697 @@
                 AssignInitialSortedObjectList(oData, objects);
         
-
+#if STORE_VIEWCELLS_WITH_BVH
+        ReleaseViewCells(objects);
+#endif
         ///////////////////
         //-- add first candidate for object space partition