Changeset 1744 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

11/13/06 21:25:40 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (15 diffs)
• BvHierarchy.h (modified) (2 diffs)
• Environment.cpp (modified) (1 diff)
• HierarchyManager.cpp (modified) (11 diffs)
• HierarchyManager.h (modified) (5 diffs)
• Pvs.h (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (3 diffs)
• VspTree.cpp (modified) (4 diffs)

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

@@ -294 +294 @@
         //mMemoryConst = (float)(sizeof(VspLeaf) + sizeof(VspViewCell));
         //mMemoryConst = (float)sizeof(BvhLeaf);
-mMemoryConst = (float)sizeof(ObjectContainer);
-        cout << "bvh memcost: " << mMemoryConst << endl;
+        mMemoryConst = (float)sizeof(ObjectContainer);
+
+        /*cout << "bvh memcost: " << mMemoryConst << endl;
         cout << "triangle: " << sizeof(TriangleIntersectable) << endl;
         cout << "triangle: " << sizeof(Intersectable) << endl;
@@ -301 +302 @@
         cout << "triangle: " << sizeof(float) << endl;
         cout << "triangle: " << sizeof(int) << endl;
-
+*/
     mUseBboxAreaForSah = true;
 
@@ -327 +328 @@
         Debug << "minimal rays for visibility: " << mMinRaysForVisibility << endl;
         Debug << "bvh mem const: " << mMemoryConst << endl;
-
+cout << "here10 " << mRenderCostDecreaseWeight << endl;
         Debug << endl;
 }
@@ -509 +510 @@
                 EvaluateLeafStats(tData);
         
-                const bool mStoreRays = true;
-                if (mStoreRays)
-                {
-                        BvhLeaf *leaf = dynamic_cast<BvhLeaf *>(currentNode);
-                //      CollectRays(leaf->mObjects, leaf->mVssRays);
-                }
-                
-                //////////////////////////////////////
-                
                 // this leaf is no candidate for splitting anymore
                 // => detach subdivision candidate
@@ -598 +590 @@
                 {
                         priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-                        if (mHierarchyManager->mConsiderMemory2)
+                        if (mHierarchyManager->mConsiderMemory)
                         {
                                 priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mMemoryConst);
@@ -605 +597 @@
                 else
                 {
-                        if (!mHierarchyManager->mConsiderMemory2)
+                        if (!mHierarchyManager->mConsiderMemory)
                         {
                                 priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
@@ -619 +611 @@
         }
 
+        //splitCandidate.SetOldCost(oldRenderCost);
         // compute global decrease in render cost
         splitCandidate.SetPriority(priority);
@@ -1356 +1349 @@
         
         VssRayContainer rays;
-        rays.reserve(tData.mNumRays);
+        // maximal 2 objects share the same ray
+        rays.reserve(tData.mNumRays * 2);
         CollectRays(tData.mNode->mObjects, rays);
 
-        const float prop = (float)mMaxTests / (float)tData.mNumRays;
+        const float prop = (float)mMaxTests / ((float)tData.mNumRays + Limits::Small);
 
         VssRay::NewMail();
 
+        //cout << "here7 " << tData.mNumRays << " " << rays.size() << endl;
+        //cout << "here5 prop: " << prop << " " << mMaxTests << " " << tData.mNumRays << endl;
         // only use a subset of the rays
         VssRayContainer::const_iterator rit, rit_end = rays.end();
 
+        int nRays = 0;
+
         for (rit = rays.begin(); rit != rit_end; ++ rit)
         {
-                if ((mMaxTests >= tData.mNumRays) || (Random(1.0f) < prop))
+                if ((mMaxTests >= (int)rays.size()) || (Random(1.0f) < prop))
                 {
                         (*rit)->Mail();
-                }
-        }
-        
+                        ++ nRays;
+                }
+        }
+        
+        //cout << "here99 " << nRays << " obj " << tData.mNode->mObjects.size() << endl;
         // collect and mark the view cells as belonging to front pvs
         ViewCellContainer viewCells;
         CollectViewCells(tData.mNode->mObjects, viewCells, true, true);
-                        
+        
         ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
@@ -1488 +1488 @@
                                 if (useVisibilityBasedHeuristics)
                                 {
-                                        //cout << "v rays: " << tData.mNumRays << " " << endl;
                                         ///////////
                                         //-- heuristics using objects weighted by view cells volume
@@ -1498 +1497 @@
                                 }
                                 else
-                                {       //cout << "e rays: " << tData.mNumRays << " ";
+                                {       
                                         //////////////////
                                         //-- view cells not constructed yet     => use surface area heuristic                   
@@ -1710 +1709 @@
 
 
-void BvHierarchy::CollectViewCells(const ObjectContainer &objects, 
-                                                                   ViewCellContainer &viewCells,
-                                                                   const bool setCounter,
-                                                                   const bool onlyMailedRays) const
+int BvHierarchy::CollectViewCells(const ObjectContainer &objects, 
+                                                                  ViewCellContainer &viewCells,
+                                                                  const bool setCounter,
+                                                                  const bool onlyMailedRays) const
 {
         ViewCell::NewMail();
         ObjectContainer::const_iterator oit, oit_end = objects.end();
 
+        int numRays = 0;
         // loop through all object and collect view cell pvs of this node
         for (oit = objects.begin(); oit != oit_end; ++ oit)
         {
                 // always use only mailed objects
-                CollectViewCells(*oit, viewCells, true, setCounter, onlyMailedRays);
-        }
-}
-
-
-void BvHierarchy::CollectViewCells(Intersectable *obj, 
-                                                                   ViewCellContainer &viewCells,
-                                                                   const bool useMailBoxing,
-                                                                   const bool setCounter,
-                                                                   const bool onlyMailedRays) const
+                numRays += CollectViewCells(*oit, viewCells, true, setCounter, onlyMailedRays);
+        }
+        //cout << "here4 " << numRays << " boj: " << objects.size() << " " << onlyMailedRays << endl;
+
+        return numRays;
+}
+
+
+int BvHierarchy::CollectViewCells(Intersectable *obj, 
+                                                                  ViewCellContainer &viewCells,
+                                                                  const bool useMailBoxing,
+                                                                  const bool setCounter,
+                                                                  const bool onlyMailedRays) const
 {
         VssRayContainer::const_iterator rit, rit_end = obj->GetOrCreateRays()->end();
+
+        int numRays = 0;
 
         for (rit = obj->GetOrCreateRays()->begin(); rit < rit_end; ++ rit)
@@ -1742 +1747 @@
                         continue;
 
-                ray->Mail();
+                //ray->Mail();
+                ++ numRays;
 
                 ViewCellContainer tmpViewCells;
@@ -1774 +1780 @@
                 }
         }
+
+        return numRays;
 }
 
@@ -1833 +1841 @@
         ViewCellContainer viewCells;
         ViewCell::NewMail();
-        CollectViewCells(node->mObjects, viewCells, true, false);
-
+        int numRays = CollectViewCells(node->mObjects, viewCells, true, false);
+
+        //cout << "here6 " << numRays << endl;
         if (0) cout << "collected " << (int)viewCells.size() << " dirty candidates" << endl;
         
@@ -2015 +2024 @@
 
         ViewCellContainer viewCells;
-        // here we have to account for all view cells that can 
+        
+        // we have to account for all view cells that can 
         // be seen from the objects
-        CollectViewCells(objects, viewCells, false, false);
+        int numRays = CollectViewCells(objects, viewCells, false, false);
 
         ViewCellContainer::const_iterator vit, vit_end = viewCells.end();

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

@@ -781 +781 @@
         /** Collect view cells which see this bvh leaf.
         */
-        void CollectViewCells(const ObjectContainer &objects, 
-                                                  ViewCellContainer &viewCells,
-                                                  const bool setCounter,
-                                                  const bool onlyMailedRays) const;
+        int CollectViewCells(const ObjectContainer &objects, 
+                                                 ViewCellContainer &viewCells,
+                                                 const bool setCounter,
+                                                 const bool onlyUnmailedRays) const;
 
         /** Counts the view cells of this object. note: only
@@ -797 +797 @@
         /** Collects view cells which see an object.
         */
-        void CollectViewCells(Intersectable *object, 
-                                                  ViewCellContainer &viewCells, 
-                                                  const bool useMailBoxing,
-                                                  const bool setCounter,
-                                                  const bool onlyMailedRays) const;
+        int CollectViewCells(Intersectable *object, 
+                                                 ViewCellContainer &viewCells, 
+                                                 const bool useMailBoxing,
+                                                 const bool setCounter,
+                                                 const bool onlyUnmailedRays) const;
 
         /** Evaluates increase in pvs size.

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

@@ -2542 +2542 @@
                                         optBool,
                                         "hierarchy_construction_consider_memory=",
-                                        "false");
-
-        RegisterOption("Hierarchy.Construction.considerMemory2",
-                                        optBool,
-                                        "hierarchy_construction_consider_memory2=",
-                                        "false");
+                                        "true");
 
         RegisterOption("Hierarchy.Construction.repairQueue",

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

@@ -91 +91 @@
                 << "#FullMem\n" << mFullMemory << endl
                 << "#RenderCostDecrease\n" << mRenderCostDecrease << endl
+                << "#Priority\n" << mPriority << endl
                 << "#FpsPerMb\n" << FpsPerMb() << endl
                 << endl;
@@ -142 +143 @@
         Environment::GetSingleton()->GetBoolValue(
                 "Hierarchy.Construction.considerMemory", mConsiderMemory);
-
-        Environment::GetSingleton()->GetBoolValue(
-                "Hierarchy.Construction.considerMemory2", mConsiderMemory2);
 
         Environment::GetSingleton()->GetFloatValue(
@@ -166 +164 @@
         Debug << "maximal allowed memory: " << mTermMaxMemory << endl;
         Debug << "consider memory: " << mConsiderMemory << endl;
-        Debug << "consider memory2: " << mConsiderMemory << endl;
         Debug << "min steps of same kind: " << mMinStepsOfSameType << endl;
         Debug << "max steps of same kind: " << mMaxStepsOfSameType << endl;
@@ -266 +263 @@
 {
         SubdivisionCandidate *splitCandidate = splitQueue.Top();
-
-        if (splitCandidate->IsDirty())
-                splitCandidate->EvalCandidate();
-
         splitQueue.Pop();
 
@@ -287 +280 @@
                 
         HierarchySubdivisionStats stats;
+
         stats.mNumSplits = mHierarchyStats.Leaves();
         stats.mTotalRenderCost = mHierarchyStats.mTotalCost;
@@ -295 +289 @@
         stats.mViewSpaceSplits = mVspTree->mVspStats.Leaves();
         stats.mObjectSpaceSplits = GetObjectSpaceSubdivisionLeaves();
-        
+        stats.mRenderCostDecrease = mHierarchyStats.mRenderCostDecrease;
+        stats.mPriority = mPriority;
+
         stats.Print(mSubdivisionStats);
 }
@@ -740 +736 @@
         const bool success = sc->Apply(splitQueue, terminationCriteriaMet);
 
+        if (sc->IsDirty())
+                cout << "*******************************error!" << endl;
+
         if (!success) // split was not taken
         {
+                cout << "x";
                 return false;
         }
 
+        //cout << "priority: " << sc->GetPriority() << " rc decr: " << sc->GetRenderCostDecrease() << " | ";
         ///////////////
         //-- split was successful => update stats and queue
@@ -750 +751 @@
     // cost ratio of cost decrease / totalCost
         const float costRatio = sc->GetRenderCostDecrease() / mHierarchyStats.mTotalCost;
-        //Debug << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
+        //cout << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
         
         if (costRatio < mTermMinGlobalCostRatio)
@@ -772 +773 @@
         mHierarchyStats.mMemory += (float)ObjectPvs::GetEntrySizeByte() * pvsEntriesIncr;
         mHierarchyStats.mRenderCostDecrease = sc->GetRenderCostDecrease();
+        
+        mPriority = sc->GetPriority();
 
         static float memoryCount = 0;
@@ -1391 +1394 @@
         {
                 SubdivisionCandidate *candidate = NextSubdivisionCandidate(splitQueue);
-                 // reevaluate local split plane and priority
+                
+                // reevaluate local split plane and priority
                 candidate->EvalCandidate(recomputeSplitPlane);
                 cout << ".";
@@ -1924 +1928 @@
         subStats.mViewSpaceSplits = 0;
         subStats.mObjectSpaceSplits = 0;
-        
+        subStats.mRenderCostDecrease = 0;
         subStats.Print(stats);
 

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

@@ -128 +128 @@
         int mObjectSpaceSplits;
 
+        float mPriority;
 
         float VspOspRatio() const { return (float)mViewSpaceSplits / (float)mObjectSpaceSplits; }
@@ -145 +146 @@
                 mViewSpaceSplits = 0;
                 mObjectSpaceSplits = 0;
+                mPriority = 0;
         }
 
@@ -287 +289 @@
         inline bool ConsiderMemory() const { return mConsiderMemory; }
         //inline float GetMemoryConst() const { return mMemoryConst; }
-
         
         void EvaluateSubdivision(const VssRayContainer &sampleRays,                                                                                      
@@ -625 +626 @@
         bool mConsiderMemory;
 
-        bool mConsiderMemory2;
-
         int mMaxRepairs;
 
@@ -633 +632 @@
         friend OspTree;
         friend BvHierarchy;
+
+        float mPriority;
+
         friend ViewCellsParseHandlers;
 

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

@@ -121 +121 @@
 
 
-/*template<typename T, typename S>
-class PvsIterator
-{
-        Next(PvsEntry<T, S>)
-private:
-        typename vector<PvsEntry<T, S> >::iterator mItCurrent;
-        typename vector<PvsEntry<T, S> >::iterator mItEnd;
-};*/
-
-
 template<typename T, typename S>
 class PvsIterator
@@ -147 +137 @@
         }
 
-        PvsEntry<T, S> Next()
+        const PvsEntry<T, S> &Next()
         {
                 return *(mItCurrent ++);

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

@@ -42 +42 @@
 // HACK
 const static bool SAMPLE_AFTER_SUBDIVISION = true;
-const static bool CLAMP_TO_BOX = false;
-//const static bool CLAMP_TO_BOX = true;
+//const static bool CLAMP_TO_BOX = false;
+const static bool CLAMP_TO_BOX = true;
 
 
@@ -119 +119 @@
 
         
-        ObjectPvs pvs1, pvs2, mergedPvs;
+        /*ObjectPvs pvs1, pvs2, mergedPvs;
 
         pvs1.AddSample((Intersectable *)1, 1);
@@ -172 +172 @@
                 cout << (int)entry.mObject << " " << entry.mData.mSumPdf << " x ";
         }
-
+*/
         // sampling type for view cells construction samples
         if (strcmp(buf, "object") == 0)

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

@@ -462 +462 @@
         Environment::GetSingleton()->GetIntValue("VspTree.maxTests", mMaxTests);
 
-        Environment::GetSingleton()->
-                GetFloatValue("VspTree.Construction.renderCostDecreaseWeight", mRenderCostDecreaseWeight);
+        Environment::GetSingleton()->GetFloatValue("VspTree.Construction.renderCostDecreaseWeight", mRenderCostDecreaseWeight);
         
         // if only the driving axis is used for axis aligned split
@@ -505 +504 @@
 
         Debug << "vsp mem const: " << mMemoryConst << endl;
-
+cout << "here11 " << mRenderCostDecreaseWeight << endl;
         Debug << endl;
 }
@@ -852 +851 @@
         {
                 priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-                if (mHierarchyManager->mConsiderMemory2)
+                if (mHierarchyManager->mConsiderMemory)
                 {
                         priority /= ((float)splitCandidate.GetPvsEntriesIncr() + mMemoryConst);
@@ -859 +858 @@
         else
         {
-                if (!mHierarchyManager->mConsiderMemory2)
+                if (!mHierarchyManager->mConsiderMemory)
                 {
                         priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;