Changeset 3065 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Bvh.cpp

Timestamp:

10/24/08 12:29:30 (16 years ago)

Author:

mattausch

Message:

found bug with near plane intersection: q? why did it work with vbo rendering? (probably because of tighter bounds ...)

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Bvh.cpp (modified) (27 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Bvh.cpp

@@ -27 +27 @@
 #endif
 
+#define INVALID_TEST ((unsigned int)-1)
+
+using namespace std;
 
 namespace CHCDemoEngine
 {
-
-#define INVALID_TEST ((unsigned int)-1)
-
-using namespace std;
-
 
 int BvhNode::sCurrentState = 0;
@@ -76 +74 @@
 
 static Plane3 sNearPlane;
+static float sNear;
 static Frustum sFrustum;
 
@@ -147 +146 @@
 
 
-/***********************************************************/
-/*                class Bvh implementation                 */
-/***********************************************************/
+/**********************************************************/
+/*                class Bvh implementation                */
+/**********************************************************/
 
 
@@ -183 +182 @@
 
         if (mRoot) delete mRoot;
-
         // delete vbo
         glDeleteBuffersARB(1, &mVboId);
@@ -191 +189 @@
 void Bvh::Init()
 {
-        mStaticRoot = NULL;
+        //mStaticRoot = NULL;
         mDynamicRoot = NULL;
         mRoot = NULL;
@@ -202 +200 @@
         
         // nodes are tested using the subnodes from 3 levels below
-        mMaxDepthForTestingChildren = 3;
+        mMaxDepthForTestingChildren = 0;//3;
         //mMaxDepthForTestingChildren = 4;
 
@@ -311 +309 @@
                 tStack.pop();
 
-                // found depth => take this node
+                // found node in specified depth => take this node
                 if ((d == depth) || (node->IsLeaf()))
                 {
@@ -338 +336 @@
         // do the test only if necessary
         if (!(node->mPlaneMask[BvhNode::sCurrentState] & (1 << i)))
+        {
                 return true;
-                        
+        }
+
+
         ////////
         //-- test the n-vertex
@@ -375 +376 @@
 
         ////////
-        //-- apply frustum culling for the planes [mPreferredPlane - 5]
+        //-- apply frustum culling for the planes with index mPreferredPlane to 6
 
         for (int i = node->mPreferredPlane[BvhNode::sCurrentState]; i < 6; ++ i)
@@ -382 +383 @@
 
         //////////
-        //-- do the view frustum culling for the planes [0 - m_iPreferredPlane)
+        //-- apply frustum culling for the planes with index 0 to mPreferredPlane
 
         for (int i = 0; i < node->mPreferredPlane[BvhNode::sCurrentState]; ++ i)
@@ -413 +414 @@
         // store near plane
         sNearPlane = Plane3(cam->GetDirection(), cam->GetPosition());
+        sNear = cam->GetNear();
 
         // rebuild dynamic part of the hierarchy
@@ -424 +426 @@
 void Bvh::UpdateDistance(BvhNode *node) const
 {
-        // use distance to center rather than the distance to the near plane because
-        // otherwise problems with big object penetrating the near plane 
+        // q: should we use distance to center rather than the distance to the near plane?
+        
+        // because otherwise problems with big object penetrating the near plane 
         // (e.g., big objects in the distance which are then always visible)
         // especially annoying is this problem when using the frustum 
         // fitting on the visible objects for shadow mapping
-
-        //node->mDistance = node->GetBox()GetMinDistance(sNearPlane);
+        // on the other hand, distance to near plane can also be used 
+        // for near plane intersection
         node->mDistance = sNearPlane.Distance(node->GetBox().Center());
+        //node->mDistance = node->GetBox().GetMinDistance(sNearPlane);
 }
 
@@ -458 +462 @@
 void Bvh::RenderBounds(BvhNode *node, RenderState *state, bool useTightBounds)
 {
-        // if not using tight bounds, rendering boxes in immediate mode
-        // is preferable to vertex arrays (less setup time)
-        if (!useTightBounds)
-        {
-                RenderBoundingBoxImmediate(node->GetBox());
-        }
-        else
-        {
-                // hack: use dummy wrapper in order to use function
-                static BvhNodeContainer dummy(1);
-                dummy[0] = node;
-                RenderBounds(dummy, state, useTightBounds);
-        }
+        // hack: use dummy contayiner as wrapper in order to use multibox function
+        static BvhNodeContainer dummy(1);
+        dummy[0] = node;
+        RenderBounds(dummy, state, useTightBounds);
 }
 
@@ -490 +485 @@
                         RenderBoundingBoxImmediate((*nit)->GetBox());
                 }
-cout<<"y";
+
                 renderedBoxes = (int)nodes.size();
         }
         else
-        {cout<<"x";
+        {
                 renderedBoxes = PrepareBoundsWithDrawArrays(nodes);
                 RenderBoundsWithDrawArrays(renderedBoxes, state);
@@ -529 +524 @@
         {
                 BvhNode *node = *nit;
-
         const int numIndices = node->mNumTestNodes * sNumIndicesPerBox;
                 
@@ -569 +563 @@
         // collect bvh nodes
         BvhNodeContainer nodes;
-        CollectNodes(mStaticRoot, nodes);
+        CollectNodes(mRoot, nodes);
 
         cout << "creating new indices" << endl;
@@ -587 +581 @@
         }
 
-
         cout << "creating global indices buffer" << endl;
 
@@ -607 +600 @@
                 // resize array
                 node->mIndicesPtr = mCurrentIndicesPtr;
-
                 int numIndices = 0;
 
-                // the bounding box of the test nodes are rendered instead of the root node
+                // the bounding boxes of the test nodes are rendered instead of the node itself
                 // => store their indices
                 for (int i = 0; i < node->mNumTestNodes; ++ i, numIndices += sNumIndicesPerBox)
@@ -657 +649 @@
 
         nodes.reserve(GetNumStaticNodes());
-        CollectNodes(mStaticRoot, nodes);
+        CollectNodes(mRoot, nodes);
 
         const unsigned int bufferSize = 8 * (int)nodes.size();
@@ -717 +709 @@
         // collect all nodes
         BvhNodeContainer nodes;
-        CollectNodes(mStaticRoot, nodes);
+        CollectNodes(mRoot, nodes);
 
         cout << "recomputing bounds, children will be tested in depth " << mMaxDepthForTestingChildren << endl;
@@ -930 +922 @@
         // first invalidate old virtual leaves
         BvhNodeContainer leaves;
-        CollectVirtualLeaves(mStaticRoot, leaves);
+        CollectVirtualLeaves(mRoot, leaves);
 
         BvhNodeContainer::const_iterator bit, bit_end = leaves.end();
@@ -998 +990 @@
 
         std::stack<BvhNode *> nodeStack;
-        nodeStack.push(mStaticRoot);
+        nodeStack.push(mRoot);
 
         while (!nodeStack.empty()) 
@@ -1039 +1031 @@
         const Vector3 u = box.Max();
 
+        ///////////
+        //-- render AABB as triangle strips
+
         glBegin(GL_TRIANGLE_STRIP);
-        {
-                ///////////
-                //-- render AABB as triangle strips
-
-                // render first half of AABB
-                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);
-        }
+
+        // render first half of AABB
+        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();
 }
-
-
 
 
@@ -1123 +1113 @@
                                                          bool useTightBounds)
 {
-        glDisable(GL_TEXTURE_2D);
-        glDisable(GL_LIGHTING);
         glColor3f(1, 1, 1);
 
         // hack: for deferred shading we have to define a material
         static Technique boxMat;
+        boxMat.SetLightingEnabled(false);
+
         boxMat.SetEmmisive(RgbaColor(1.0f, 1.0f, 1.0f, 1.0f));
 
@@ -1135 +1125 @@
         if (!useTightBounds)
         {
-                RenderBoxForViz(node->GetBox());
+                //RenderBoxForViz(node->GetBox());
+                glPolygonMode(GL_FRONT, GL_LINE);
+                RenderBoundingBoxImmediate(node->GetBox());
+                glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
         }
         else
@@ -1144 +1137 @@
                 }
         }
-
-        glEnable(GL_LIGHTING);
-        glEnable(GL_TEXTURE_2D);
 }
 
@@ -1297 +1287 @@
 
 
-}
+bool Bvh::IntersectsNearPlane(BvhNode *node) const
+{ 
+        float distanceToNearPlane = node->GetBox().GetMinDistance(sNearPlane);
+        // we stored the near plane distance => we can use it also here
+        //float distanceToNearPlane = node->GetDistance();
+        
+        return distanceToNearPlane < sNear;
+}
+
+
+}