Changeset 729 for GTP/trunk/Lib

Timestamp:

04/06/06 18:37:31 (19 years ago)

Author:

mattausch

Message:

added cost flexible render cost measurements

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ViewCell.cpp (modified) (4 diffs)
• ViewCell.h (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (1 diff)
• VspBspTree.cpp (modified) (9 diffs)
• VspBspTree.h (modified) (1 diff)

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

@@ -69 +69 @@
 }
 
-
+/// Fast computation of merged pvs size
 int ComputeMergedPvsSize(const ObjectPvs &pvs1, const ObjectPvs &pvs2)
 {
+        // add first pvs
         int pvs = pvs1.GetSize();
 
-        // compute new pvs size
         ObjectPvsMap::const_iterator it, it_end =  pvs1.mEntries.end();
 
         Intersectable::NewMail();
 
+        // mail all objects in first pvs
         for (it = pvs1.mEntries.begin(); it != it_end; ++ it)
         {
@@ -86 +87 @@
         it_end = pvs2.mEntries.end();
 
+        // look if they are in second pvs
         for (it = pvs2.mEntries.begin(); it != it_end; ++ it)
         {
@@ -94 +96 @@
 
         return pvs;
+}
+
+// computet render cost of merge
+float ViewCellsTree::ComputeMergedPvsCost(const ObjectPvs &pvs1, const ObjectPvs &pvs2) const
+{
+        float renderCost = 0;
+
+        // compute new pvs size
+        ObjectPvsMap::const_iterator it, it_end =  pvs1.mEntries.end();
+
+        Intersectable::NewMail();
+
+        // first mail all objects in first pvs
+        for (it = pvs1.mEntries.begin(); it != it_end; ++ it)
+        {
+                Intersectable *obj = (*it).first;
+
+                obj->Mail();
+                renderCost += mViewCellsManager->EvalRenderCost(obj);
+        }
+
+        it_end = pvs2.mEntries.end();
+
+        
+        for (it = pvs2.mEntries.begin(); it != it_end; ++ it)
+        {
+                Intersectable *obj = (*it).first;
+
+                // test if object already considered    
+                if (!obj->Mailed())
+                {
+                        renderCost += mViewCellsManager->EvalRenderCost(obj);
+                }
+        }
+
+        return renderCost;
 }
 
@@ -1212 +1250 @@
 {
         //-- compute pvs difference
-        const int newPvs = 
+        const float newPvs = 
+#if 0
                 ComputeMergedPvsSize(mc.mLeftViewCell->GetPvs(), 
                                                          mc.mRightViewCell->GetPvs());
-                        
-        const float newPenalty = 
-                EvalPvsPenalty(newPvs,
-                                           mViewCellsManager->GetMinPvsSize(),
-                                           mViewCellsManager->GetMaxPvsSize());
+#else
+                ComputeMergedPvsCost(mc.mLeftViewCell->GetPvs(), 
+                                                         mc.mRightViewCell->GetPvs());
+#endif
+
+        const float newPenalty = EvalPvsPenalty(newPvs,
+                                                                                        mViewCellsManager->GetMinPvsSize(),
+                                                                                        mViewCellsManager->GetMaxPvsSize());
 
         ViewCell *vc1 = mc.mLeftViewCell;

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

@@ -320 +320 @@
         */
         void UpdateViewCellsStats(ViewCell *vc, ViewCellsStatistics &vcStat);
-        
+
 
         /** Get costs resulting from each merge step. */
         void GetCostFunction(vector<float> &costFunction);
   
-
         /** Returns optimal set of view cells for a given number of view cells.
         */
@@ -396 +395 @@
 
         //////////////////////////////////////////////////////////////
-        //                 merge options                            //
+        //                 merge related stuff                      //
         //////////////////////////////////////////////////////////////
-        
+
+        /** Computes render cost of the merged pvs.
+        */
+        float ComputeMergedPvsCost(const ObjectPvs &pvs1, const ObjectPvs &pvs2) const;
 
         /** Returns cost of this leaf according to current heuristics.

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

@@ -565 +565 @@
                                 ++ smallerCost;
                 }
-                
+                // note: can remove already found view cells
+                //swap(neighborhood[bestViewCellIdx], neighborhood.back());
+                //neighborhood.pop_back();
+        
+
                 outstream << "#RenderCost: " << currentRenderCost << endl;
                 outstream << "#ViewCells: " << smallerCost << endl;             

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

@@ -1707 +1707 @@
                                                                                  const VspBspTraversalData &data) const
 {
-        int pvsFront = 0;
-        int pvsBack = 0;
-        int totalPvs = 0;
+        float pvsFront = 0;
+        float pvsBack = 0;
+        float totalPvs = 0;
 
         // probability that view point lies in back / front node
@@ -1750 +1750 @@
                 pBack = pOverall - pFront;
 
+                // something is wrong with the volume
                 if ((pFront < 0.0) || (pBack < 0.0))
                 {
@@ -1797 +1798 @@
         float cost = 0;
 
-        int totalPvs = 0;
-        int pvsFront = 0;
-        int pvsBack = 0;
+        float totalPvs = 0;
+        float pvsFront = 0;
+        float pvsBack = 0;
         
         // probability that view point lies in back / front node
@@ -1855 +1856 @@
                 pBack = pOverall - pFront;
                 
-                // precision issues possible for unbalanced split => don't take this split!
+                // HACK: precision issues possible for unbalanced split => don't take this split!
                 if (1 && 
                         (!splitSuccessFull || (pFront <= 0) || (pBack <= 0) || 
@@ -1999 +2000 @@
                                                                                    float &pBack) const
 {
-        int pvsTotal = 0;
-        int pvsFront = 0;
-        int pvsBack = 0;
+        float pvsTotal = 0;
+        float pvsFront = 0;
+        float pvsBack = 0;
         
         // create unique ids for pvs heuristics
@@ -2072 +2073 @@
 void VspBspTree::AddObjToPvs(Intersectable *obj,
                                                          const int cf,
-                                                         int &frontPvs,
-                                                         int &backPvs,
-                                                         int &totalPvs) const
+                                                         float &frontPvs,
+                                                         float &backPvs,
+                                                         float &totalPvs) const
 {
         if (!obj)
@@ -2084 +2085 @@
                 (obj->mMailbox != sFrontAndBackId))
         {
-                ++ totalPvs;
+                totalPvs += mViewCellsManager->EvalRenderCost(obj);
         }
 
@@ -2096 +2097 @@
                         (obj->mMailbox != sFrontAndBackId))
                 {
-                        ++ frontPvs;
+                        frontPvs += mViewCellsManager->EvalRenderCost(obj);
                 
                         if (obj->mMailbox == sBackId)
@@ -2110 +2111 @@
                         (obj->mMailbox != sFrontAndBackId))
                 {
-                        ++ backPvs;
+                        backPvs += mViewCellsManager->EvalRenderCost(obj);;
                 
                         if (obj->mMailbox == sFrontId)

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

@@ -587 +587 @@
         void AddObjToPvs(Intersectable *obj, 
                                          const int cf, 
-                                         int &frontPvs, 
-                                         int &backPvs, 
-                                         int &totalPvs) const;
+                                         float &frontPvs, 
+                                         float &backPvs, 
+                                         float &totalPvs) const;
         
         /** Computes PVS size induced by the rays.