Changeset 1548 for GTP/trunk/Lib

Timestamp:

10/02/06 08:38:25 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (5 diffs)
• BvHierarchy.h (modified) (4 diffs)
• HierarchyManager.cpp (modified) (6 diffs)
• HierarchyManager.h (modified) (2 diffs)
• RssTree.cpp (modified) (3 diffs)
• ViewCellsManager.cpp (modified) (3 diffs)

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

@@ -1663 +1663 @@
         mBvhStats.Reset();
         mBvhStats.Start();
-
         mBvhStats.nodes = 1;
                 
@@ -1669 +1668 @@
         BvhSubdivisionCandidate::sBvHierarchy = this;
         
+        // create new root
+        CreateRoot(objects);
+
         // compute bounding box from objects
-        // note: we assume that root was already created
         mBoundingBox = mRoot->GetBoundingBox();
-        BvhLeaf *bvhleaf = dynamic_cast<BvhLeaf *>(mRoot);
+        BvhLeaf *bvhLeaf = dynamic_cast<BvhLeaf *>(mRoot);
 
         // multiply termination criterium for comparison,
@@ -1693 +1694 @@
 
         // create bvh traversal data
-        BvhTraversalData oData(bvhleaf, 0, prop, nRays);
+        BvhTraversalData oData(bvhLeaf, 0, prop, nRays);
 
         // create sorted object lists for the first data
@@ -1709 +1710 @@
 
         EvalSubdivisionCandidate(*oSubdivisionCandidate);
-        bvhleaf->SetSubdivisionCandidate(oSubdivisionCandidate);
+        bvhLeaf->SetSubdivisionCandidate(oSubdivisionCandidate);
 
         const float viewSpaceVol = mHierarchyManager->GetViewSpaceBox().GetVolume();
@@ -1784 +1785 @@
 
 
+SubdivisionCandidate *BvHierarchy::Reset(const VssRayContainer &sampleRays, 
+                                                                                 const ObjectContainer &objects)
+{
+        // reset stats
+        mBvhStats.Reset();
+        mBvhStats.Start();
+        mBvhStats.nodes = 1;
+
+        // reset root
+        DEL_PTR(mRoot);
+        CreateRoot(objects);
+        
+#if PROBABILIY_IS_BV_VOLUME
+        mTermMinProbability *= mBoundingBox.GetVolume();
+        // probability that bounding volume is seen
+        const float prop = GetBoundingBox().GetVolume();
+#else
+        mTermMinProbability *= mVspTree->GetBoundingBox().GetVolume();
+        // probability that volume is "seen" from the view cells
+        const float prop = EvalViewCellsVolume(objects);
+#endif
+
+        const int nRays = CountRays(objects);
+        BvhLeaf *bvhLeaf = dynamic_cast<BvhLeaf *>(mRoot);
+
+        // create bvh traversal data
+        BvhTraversalData oData(bvhLeaf, 0, prop, nRays);
+
+        ///////////////////
+        //-- add first candidate for object space partition     
+
+        BvhSubdivisionCandidate *oSubdivisionCandidate = 
+                new BvhSubdivisionCandidate(oData);
+
+        EvalSubdivisionCandidate(*oSubdivisionCandidate);
+        bvhLeaf->SetSubdivisionCandidate(oSubdivisionCandidate);
+
+        const float viewSpaceVol = mHierarchyManager->GetViewSpaceBox().GetVolume();
+        mTotalCost = (float)objects.size() * prop / viewSpaceVol;
+
+        PrintSubdivisionStats(*oSubdivisionCandidate);
+
+        return oSubdivisionCandidate;
+}
+
+
 void BvhStatistics::Print(ostream &app) const
 {

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

@@ -646 +646 @@
         float GetMemUsage() const;
 
-        /** Creates new root of hierarchy.
-        */
-        void CreateRoot(const ObjectContainer &objects);
-
+        /** Associates the objects with their bvh leaves.
+        */
         static void AssociateObjectsWithLeaf(BvhLeaf *leaf);
 
@@ -655 +653 @@
         /////////////////////////////
         // Helper functions for local cost heuristics
-
         
         /** Prepare split candidates for cost heuristics using axis aligned splits.
@@ -769 +766 @@
                 const ObjectContainer &objects);
 
+        /** Resets bv hierarchy. E.g. deletes root and resets stats.
+        */
+        SubdivisionCandidate *Reset(
+                const VssRayContainer &rays, 
+                const ObjectContainer &objects);
+
         /** Evaluates volume of view cells that see the objects.
         */
@@ -783 +786 @@
                 BvhTraversalData &frontData,
                 BvhTraversalData &backData);
-
+        
+        /** Creates new root of hierarchy.
+        */
+        void CreateRoot(const ObjectContainer &objects);
 
 protected:

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

@@ -317 +317 @@
 #endif
 
+        mObjectSpaceSubdivisionType = mSavedObjectSpaceSubdivisionType;
+        mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
+
         mHierarchyStats.Stop();
         mVspTree->mVspStats.Stop();
         FinishObjectSpaceSubdivision(objects);
-
-        mObjectSpaceSubdivisionType = mSavedObjectSpaceSubdivisionType;
-        mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
 }
 
@@ -330 +330 @@
 {
         cout << "\nstarting view space hierarchy construction ... " << endl;
-
-        mHierarchyStats.mGlobalCostMisses = 0; // hack: reset global cost misses
+         // hack: reset global cost misses
+        mHierarchyStats.mGlobalCostMisses = 0;
 
         RayInfoContainer *viewSpaceRays = new RayInfoContainer();
@@ -367 +367 @@
 
         cout << "preparing bv hierarchy construction ... " << endl;
-                mBvHierarchy->CreateRoot(objects);
-
+        
         // compute first candidate
         SubdivisionCandidate *sc =
@@ -377 +376 @@
 
     mTQueue.Push(sc);
-        cout << "finished bv hierarchy preparation in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
+        cout << "finished bv hierarchy preparation in " 
+                 << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 }
 
@@ -605 +605 @@
 
 
-void HierarchyManager::ResetObjectSpaceSubdivision(const ObjectContainer &objects)
-{
-        Debug << "old bv hierarchy:\n " << mBvHierarchy->mBvhStats << endl;
-        cout << "\nresetting bv hierarchy" << endl;
-        mHierarchyStats.nodes -= mBvHierarchy->mBvhStats.nodes;
-        
-        DEL_PTR(mBvHierarchy);
-        mBvHierarchy = new BvHierarchy();
-        mBvHierarchy->mHierarchyManager = this;
+void HierarchyManager::ResetObjectSpaceSubdivision(const VssRayContainer &sampleRays, 
+                                                                                                   const ObjectContainer &objects)
+{
+        switch (mObjectSpaceSubdivisionType)
+        {
+        case BV_BASED_OBJ_SUBDIV:
+        Debug << "old bv hierarchy:\n " << mBvHierarchy->mBvhStats << endl;
+                cout << "\nresetting bv hierarchy" << endl;
+                mHierarchyStats.nodes -= mBvHierarchy->mBvhStats.nodes;
+#if 0   
+                DEL_PTR(mBvHierarchy);
+                mBvHierarchy = new BvHierarchy();
+                mBvHierarchy->mHierarchyManager = this;
+
+                PrepareObjectSpaceSubdivision(sampleRays, objects);
+#else
+                mBvHierarchy->Reset(sampleRays, objects);
+#endif
+                break;
+        case KD_BASED_OBJ_SUBDIV:
+                // TODO
+                break;
+        default:
+                break;
+        }
 }
 
@@ -646 +662 @@
         RunConstruction(false);
 
-        /////////////////
-    // now do view space subdivison on the sah bvh nodes
         mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
-        PrepareViewSpaceSubdivision(sampleRays, objects);
-        
-        // process view space candidates
-        RunConstruction(false);
-        
-        // again run object space subdivision on the view cells
-        ResetObjectSpaceSubdivision(objects);
-        PrepareObjectSpaceSubdivision(sampleRays, objects);
-
-        // process object space candidates
-        RunConstruction(false);
+
+        const int limit = 2;
+        for (int i = 0; i < limit; ++ i)
+        {
+        // again run object space subdivision on the view cells
+                ResetObjectSpaceSubdivision(sampleRays, objects);
+        
+                // process object space candidates
+                RunConstruction(false);
+
+                 /////////////////
+                // now do view space subdivison using the current object space partition
+//              ResetViewSpaceSubdivision(sampleRays, objects);
+        
+                // process view space candidates
+                RunConstruction(false);
+        
+                cout << "íteration " << i << " of " << limit << " finished" << endl;
+        }
         
         cout << "\nfinished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;

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

@@ -316 +316 @@
                 AxisAlignedBox3 *forcedViewSpace);
 
+        /** Use iteration to construct the object space hierarchy.
+        */
         void ConstructMultiLevel(
                 const VssRayContainer &sampleRays,
@@ -321 +323 @@
                 AxisAlignedBox3 *forcedViewSpace);
 
-        void ResetObjectSpaceSubdivision(const ObjectContainer &objects);
+        /** Reset the object space subdivision. 
+                E.g., deletes hierarchy and resets stats.
+                so construction can be restarted.
+        */
+        void ResetObjectSpaceSubdivision(
+                const VssRayContainer &rays, 
+                const ObjectContainer &objects);
 
 protected:

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

@@ -640 +640 @@
           float sum = info.raysBack*(info.position - minBox) + info.raysFront*(maxBox - info.position);
           float newCost = ct_div_ci + sum/sizeBox;
-          float oldCost = info.rays;
+          float oldCost = (float)info.rays;
           info.costRatio = newCost/oldCost;
           break;
@@ -668 +668 @@
                 info.viewCellsFront*(maxBox - info.position);
           float newCost = ct_div_ci + sum/sizeBox;
-          float oldCost = info.viewCells;
+          float oldCost = (float)info.viewCells;
           info.costRatio = newCost/oldCost;
           break;
         }
         case 3: {
-          float newCost = info.raysBack*info.pvsBack  + info.raysFront*info.pvsFront;
+          float newCost = (float)(info.raysBack*info.pvsBack  + info.raysFront*info.pvsFront);
           float oldCost = (float)leaf->rays.size()*pvsSize;
           info.costRatio = newCost/oldCost;
@@ -695 +695 @@
         case 2: {
           float newCost = (info.pvsBack  + info.pvsFront)*0.5f;
-          float oldCost = pvsSize;
+          float oldCost = (float)pvsSize;
           info.costRatio = newCost/oldCost;
           break;
         }
         case 3: {
-          float newCost = abs(info.raysBack  - info.raysFront);
+          float newCost = (float)abs(info.raysBack  - info.raysFront);
           float oldCost = (float)leaf->rays.size();
           info.costRatio = newCost/oldCost;

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

@@ -2689 +2689 @@
         }
 
-if (mUsePredefinedViewCells) return 0;
         //////////////////
         //-- merge leaves of the view cell hierarchy    
@@ -3197 +3196 @@
         mBspTree->CollectLeaves(leaves);
         vector<BspLeaf *>::const_iterator lit, lit_end = leaves.end();
-        
+        ViewCell::NewMail();
+
         for (lit = leaves.begin(); lit != lit_end; ++ lit)
         {
@@ -3203 +3203 @@
                 ViewCell *vc = leaf->GetViewCell();
 
-                vc->SetMergeCost(0.0f);
-                vcRoot->SetupChildLink(vc);
-        
-                volume += vc->GetVolume();
-                volume += vc->GetVolume();      
-
-                vcRoot->SetVolume(volume);
+                if (!vc->Mailed())
+                {
+                        vc->Mail();
+                        vc->SetMergeCost(0.0f);
+                        vcRoot->SetupChildLink(vc);
+
+                        volume += vc->GetVolume();
+                        volume += vc->GetVolume();      
+                        vcRoot->SetVolume(volume);
+                }
         }