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

Timestamp:

06/17/08 03:47:02 (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

@@ -366 +366 @@
         // store near plane
         sNearPlane = Plane3(mCamera->GetDirection(), mCamera->GetPosition());
-//      Debug << "near: " << sNearPlane << " d " << mCamera->GetDirection() << " " << mCamera->GetPosition() << std::endl;
-//      for (int i = 0; i < 6; ++ i) Debug << "plane: " << sFrustum.mClipPlanes[i] << std::endl;
-}
-
-
-float Bvh::CalcDistance(BvhNode *node) const
-{
-        return node->GetBox().GetMinVisibleDistance(sNearPlane);
+}
+
+
+void Bvh::CalcDistance(BvhNode *node) const
+{
+        node->mDistance = node->GetBox().GetMinVisibleDistance(sNearPlane);
 }
 
@@ -872 +870 @@
         }
 
+        mNumVirtualNodes = 0;
+
         // assign new virtual leaves based on specified number of triangles per leaf
         std::stack<BvhNode *> nodeStack;
@@ -880 +880 @@
                 BvhNode *node = nodeStack.top();
                 nodeStack.pop();
+
+                ++ mNumVirtualNodes;
 
                 if (node->IsLeaf()) 
@@ -948 +950 @@
         const Vector3 u = box.Max();
 
-        ///////////
-        //-- render AABB as triangle strips
-
-        glVertex3f(l.x, l.y, u.z);
-        glVertex3f(u.x, l.y, u.z);
-        glVertex3f(l.x, u.y, u.z);
-        glVertex3f(u.x, u.y, u.z);
-        glVertex3f(l.x, u.y, l.z); 
-        glVertex3f(u.x, u.y, l.z);
-        glVertex3f(l.x, l.y, l.z); 
-        glVertex3f(u.x, l.y, l.z);
-
-        glPrimitiveRestartNV();
-
-        //-- render second half of AABB
-        glVertex3f(l.x, u.y, u.z); 
-        glVertex3f(l.x, u.y, l.z);
-        glVertex3f(l.x, l.y, u.z);
-        glVertex3f(l.x, l.y, l.z);
-        glVertex3f(u.x, l.y, u.z); 
-        glVertex3f(u.x, l.y, l.z);
-        glVertex3f(u.x, u.y, u.z); 
-        glVertex3f(u.x, u.y, l.z);
-}
-
-
-
-}
+        glBegin(GL_TRIANGLE_STRIP);
+        {
+                ///////////
+                //-- render AABB as triangle strips
+
+                glVertex3f(l.x, l.y, u.z);
+                glVertex3f(u.x, l.y, u.z);
+                glVertex3f(l.x, u.y, u.z);
+                glVertex3f(u.x, u.y, u.z);
+                glVertex3f(l.x, u.y, l.z); 
+                glVertex3f(u.x, u.y, l.z);
+                glVertex3f(l.x, l.y, l.z); 
+                glVertex3f(u.x, l.y, l.z);
+
+                glPrimitiveRestartNV();
+
+                //-- render second half of AABB
+                glVertex3f(l.x, u.y, u.z); 
+                glVertex3f(l.x, u.y, l.z);
+                glVertex3f(l.x, l.y, u.z);
+                glVertex3f(l.x, l.y, l.z);
+                glVertex3f(u.x, l.y, u.z); 
+                glVertex3f(u.x, l.y, l.z);
+                glVertex3f(u.x, u.y, u.z); 
+                glVertex3f(u.x, u.y, l.z);
+        }
+        glEnd();
+}
+
+}