Changeset 1707 for GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.cpp

Timestamp:

11/01/06 23:20:53 (18 years ago)

Author:

mattausch

Message:

worked on full render cost evaluation
warning: some change sin render cost evaluation for pvs which could have bugs

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.cpp (modified) (3 diffs)

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

@@ -79 +79 @@
         We eliminate already accounted bvh nodes and objects using mailboxing. 
 */
-static int EvalBvhNodeContribution(BvhIntersectable *bvhobj)
+static float EvalBvhNodeContribution(BvhIntersectable *bvhobj)
 {
-        BvhNode *node= bvhobj->GetItem();
+        BvhLeaf *leaf = bvhobj->GetItem();
+        BvhNode *node = leaf->GetActiveNode();
 
         // early exit
-        if (node->IsLeaf())     
+        if (node == leaf)       
         {
                 // objects already accounted for
-                if (node->Mailed())
+                if (leaf->Mailed())
                         return 0;
 
-                node->Mail();
-                BvhLeaf *leaf = dynamic_cast<BvhLeaf *>(node);
-                return (int)leaf->mObjects.size();
+                leaf->Mail();
+                return BvHierarchy::EvalAbsCost(leaf->mObjects);
         }                        
 
         // compute leaf pvs
-        int pvs = 0;
+        float pvs = 0;
         stack<BvhNode *> tStack;
-        tStack.push(bvhobj->GetItem());
+        tStack.push(node);
 
         while (!tStack.empty())
         {
-                BvhNode *node = tStack.top();
+                node = tStack.top();
                 tStack.pop();
 
@@ -112 +112 @@
                         if (node->IsLeaf())
                         {
-                                BvhLeaf *leaf = dynamic_cast<BvhLeaf *>(node);
+                                leaf = dynamic_cast<BvhLeaf *>(node);
 
                                 // add #objects exclusivly in this node
@@ -132 +132 @@
 
 
-int ObjectPvs::CountObjectsInPvs() const
+float ObjectPvs::EvalPvsCost() const
 {
-        int pvs = 0;
+        float pvs = 0;
 
         Intersectable::NewMail();