Changeset 729 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

Timestamp:

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

Author:

mattausch

Message:

added cost flexible render cost measurements

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp (modified) (4 diffs)

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;