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

Timestamp:

11/15/06 16:07:29 (18 years ago)

Author:

mattausch

Message:

bvhnode is now derived from Intersectable

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 float EvalBvhNodeContribution(BvhIntersectable *bvhobj)
+static float EvalBvhNodeContribution(BvhNode *bvhObj)
 {
-        BvhLeaf *leaf = bvhobj->GetItem();
-        BvhNode *node = leaf->GetActiveNode();
+        BvhNode *node;
+
+        // hack for choosing which node to account for
+        if (bvhObj->IsLeaf())
+                node = dynamic_cast<BvhLeaf *>(bvhObj)->GetActiveNode();
+        else
+                node = bvhObj;
 
         // early exit
-        if (node == leaf)       
-        {
+        if (node->IsLeaf())     
+        {       
+                BvhLeaf *leaf = dynamic_cast<BvhLeaf *>(node);
                 // objects already accounted for
                 if (leaf->Mailed())
@@ -112 +118 @@
                         if (node->IsLeaf())
                         {
-                                leaf = dynamic_cast<BvhLeaf *>(node);
+                                BvhLeaf *leaf = dynamic_cast<BvhLeaf *>(node);
 
                                 // add #objects exclusivly in this node
@@ -156 +162 @@
                         case Intersectable::BVH_INTERSECTABLE:
                                 {
-                                        BvhIntersectable *bvhObj = dynamic_cast<BvhIntersectable *>(obj);
+                                        BvhNode *bvhObj = dynamic_cast<BvhNode *>(obj);
                                         pvs += EvalBvhNodeContribution(bvhObj);
                                         break;