Changeset 2756 for GTP/trunk/App/Demos/Vis/CHC_revisited/Bvh.cpp

Timestamp:

06/13/08 18:06:32 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/Bvh.cpp (modified) (4 diffs)

GTP/trunk/App/Demos/Vis/CHC_revisited/Bvh.cpp

@@ -10 +10 @@
 #include "glInterface.h"
 #include "Triangle3.h"
-
+#include "SceneEntity.h"
+#include "Geometry.h"
 
 namespace CHCDemo
@@ -557 +558 @@
 
 
-/*
 void Bvh::ComputeIds()
 {
-        // collect all nodes, also the nodes from local bvh
-        // warning: root nodes local bvh are not in there, as they 
-        // are equivalent geometry bvh leaves
+        // collect all nodes
         BvhNodeContainer nodes;
-        CollectAllNodes(mRoot, nodes);
+        CollectNodes(mRoot, nodes);
 
         // assign ids to all nodes of the "regular" hierarchy
         int i = 0;
-        HierarchyNodeContainer::const_iterator lit, lit_end = nodes.end();
+        BvhNodeContainer::const_iterator lit, lit_end = nodes.end();
 
         for (lit = nodes.begin(); lit != lit_end; ++ lit, ++ i)
@@ -575 +573 @@
         }
 }
-*/
+
 
 void Bvh::PrepareVertices()
@@ -819 +817 @@
 
         for (int i = node->mFirst; i <= node->mLast; ++ i)
-        {
                 numTriangles += mGeometry[i]->GetGeometry()->CountTriangles();
-        }
-
+        
         return numTriangles;
 }
 
 
-float Bvh::GetGeometryArea(BvhNode *node) const
+float Bvh::GetArea(BvhNode *node) const
 {
         return node->mArea;