Changeset 1758 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.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/HierarchyManager.cpp (modified) (6 diffs)

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

@@ -1451 +1451 @@
                 {
                         BvhLeaf *leaf = mBvHierarchy->GetLeaf(obj);
-                        BvhIntersectable *bvhObj = mBvHierarchy->GetOrCreateBvhIntersectable(leaf);
                         
-                        return vc->AddPvsSample(bvhObj, pdf, contribution);
+                        return vc->AddPvsSample(leaf, pdf, contribution);
                 }
         default:
@@ -1522 +1521 @@
                                                                                                   const Vector3 &point) const
 {
-  
-  if (!obj)
-        return NULL;
-  
-  switch (mObjectSpaceSubdivisionType)
+
+        if (!obj)
+                return NULL;
+
+        switch (mObjectSpaceSubdivisionType)
         {
         case HierarchyManager::KD_BASED_OBJ_SUBDIV:
-          {
-                KdLeaf *leaf = mOspTree->GetLeaf(point, NULL);
-                return mOspTree->GetOrCreateKdIntersectable(leaf);
-          }
+                {
+                        KdLeaf *leaf = mOspTree->GetLeaf(point, NULL);
+                        return mOspTree->GetOrCreateKdIntersectable(leaf);
+                }
         case HierarchyManager::BV_BASED_OBJ_SUBDIV:
-          {
-                BvhLeaf *leaf = mBvHierarchy->GetLeaf(obj);
-                return mBvHierarchy->GetOrCreateBvhIntersectable(leaf);
-          }
+                {
+                        BvhLeaf *leaf = mBvHierarchy->GetLeaf(obj);
+                        return leaf;
+                }
         default:
-          return obj;
+                return obj;
         }
 }
@@ -1546 +1545 @@
                                                                                                   const bool isTermination) const
 {
-  Intersectable *obj = NULL;
+        Intersectable *obj = NULL;
         Vector3 pt;
         KdNode *node;
 
         ray.GetSampleData(isTermination, pt, &obj, &node);
-        
+
         if (!obj)
-          return NULL;
+                return NULL;
 
         switch (mObjectSpaceSubdivisionType)
@@ -1559 +1558 @@
         case HierarchyManager::KD_BASED_OBJ_SUBDIV:
                 {
-                  KdLeaf *leaf = mOspTree->GetLeaf(pt, node);
+                        KdLeaf *leaf = mOspTree->GetLeaf(pt, node);
                         return mOspTree->GetOrCreateKdIntersectable(leaf);
                 }
@@ -1565 +1564 @@
                 {
                         BvhLeaf *leaf = mBvHierarchy->GetLeaf(obj);
-                        return mBvHierarchy->GetOrCreateBvhIntersectable(leaf);
+                        return leaf;
                 }
         default:
-          break;
+                break;
         }
         return obj;
@@ -1839 +1838 @@
                 ObjectPvsEntry entry = pit.Next();
 
-                BvhIntersectable *intersect = dynamic_cast<BvhIntersectable *>(entry.mObject);
-
-                BvhLeaf *leaf = intersect->GetItem();
-                BvhNode *activeNode = leaf->GetActiveNode();
+                BvhNode *activeNode;
+                BvhNode *intersect = dynamic_cast<BvhNode *>(entry.mObject);
+
+                // hack for choosing which node to account for
+                if (intersect->IsLeaf())
+                        activeNode = dynamic_cast<BvhLeaf *>(intersect)->GetActiveNode();
+                else
+                        activeNode = intersect;
 
                 if (!activeNode->Mailed())