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

Timestamp:

06/16/08 08:56:35 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -295 +295 @@
 {
         // do the test only if necessary
-        if (1)//node->mPlaneMask & (1 << i))
-        {//cout<<"plane "<< i << endl;
-                bool outs = true;
-                //-- test the n-vertex
-                for (int j = 0; j < 8; ++ j)
-                {
-                        if (sFrustum.mClipPlanes[i].Distance(node->mBox.GetVertex(j)) <= 0) outs = false;
-                }
-                if (outs) return 0;
-                //if ((node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 0], sFrustum.mClipPlanes[i]) > 0.0f))
-                        //&&    (node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 1], sFrustum.mClipPlanes[i]) > 0.0f))
-                {
-                        // outside
-                //      node->mPreferredPlane = i;
-                        //cout<<"f " << node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 0], sFrustum.mClipPlanes[i]) << " " << sFrustum.mClipPlanes[i] << endl;
-                //      return false;
-                }//else cout<<"ok " << node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 0], sFrustum.mClipPlanes[i]) << " " << sFrustum.mClipPlanes[i] << endl;
-
-                //-- test the p-vertex
-                if (node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 1], sFrustum.mClipPlanes[i]) <= 0.0f)
-                {
-                        // completely inside: children don't need to check against this plane no more
-                        node->mPlaneMask^= 1 << i;
-                }
-                else 
-                {
-                        bIntersect = true;
-                }
-        }
-
+        if (!(node->mPlaneMask & (1 << i)))
+                return true;
+                        
+        ////////
+        //-- test the n-vertex
+                
+        if ((node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 0], sFrustum.mClipPlanes[i]) > 0.0f))
+        {
+                // outside
+                node->mPreferredPlane = i;
+                return false;
+        }
+
+        ////////////
+        //-- test the p-vertex
+
+        if (node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 1], sFrustum.mClipPlanes[i]) <= 0.0f)
+        {
+                // completely inside: children don't need to check against this plane no more
+                node->mPlaneMask^= 1 << i;
+        }
+        else 
+        {
+                bIntersect = true;
+        }
+        
         return true;
 }
@@ -337 +333 @@
 
 
-        for (int i = 0; i < 6; ++ i)
-        {
-                if (!TestPlane(node, i, bIntersect)) return 0;
-        }
+        //for (int i = 0; i < 6; ++ i)
+        //      if (!TestPlane(node, i, bIntersect)) return 0;
+        
 
         ////////
         //-- apply frustum culling for the planes [mPreferredPlane - 5]
-/*
+
         for (int i = node->mPreferredPlane; i < 6; ++ i)
-        {
                 if (!TestPlane(node, i, bIntersect)) return 0;
-        }
-
+        
         //////////
         //-- do the view frustum culling for the planes [0 - m_iPreferredPlane)
 
         for (int i = 0; i < node->mPreferredPlane; ++ i)
-        {
                 if (!TestPlane(node, i, bIntersect)) return 0;
-        }
-*/
+        
         return bIntersect ? -1 : 1;
 }
@@ -373 +364 @@
         sFrustum.CalcNPVertexIndices(sClipPlaneAABBVertexIndices);
 
-        for (int i = 0; i<12; ++ i)
-//cout<<" x " << sClipPlaneAABBVertexIndices[i];
-//      cout<<"\n********\n";
-        // near plane
+        // 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;
@@ -392 +379 @@
 void Bvh::RenderBoundingBox(BvhNode *node)
 {
-        static BvhNodeContainer dummy(1);
+        RenderBoundingBoxImmediate(node->GetBox());
+        /**static BvhNodeContainer dummy(1);
         dummy[0] = node;
-        RenderBoundingBoxes(dummy);
+        RenderBoundingBoxes(dummy);*/
 }
 
@@ -870 +858 @@
 
 
-void Bvh::Dummy()
-{
-        for (int i = 0; i < mGeometrySize; ++ i)
-                Debug << mGeometry[i]->id << " " << mGeometry[i]->GetGeometry()->GetBoundingBox() << endl;
-
-        AxisAlignedBox3 boxl; boxl.Initialize();
-        AxisAlignedBox3 boxr; boxr.Initialize();
-
-
-        for (int i = 0; i <= 107; ++ i)
-                boxl.Include(mGeometry[i]->GetBoundingBox());
-
-        for (int i = 108; i <= 193; ++ i)
-                boxr.Include(mGeometry[i]->GetBoundingBox());
-
-        Debug << "dummy " << boxl << " " << boxr << endl;
-
-        queue<BvhNode *> tStack;
-        tStack.push(mRoot);
-
-        while (!tStack.empty())
-        {
-                BvhNode *node = tStack.front();//top();
-                tStack.pop();
-
-                AxisAlignedBox3 box;
-                box.Initialize();
-
-                int i = 0;
-                for (int i = node->mFirst; i <= node->mLast; ++ i)
-                {
-                        if ((mGeometry[i]->id < node->mFirst) || (mGeometry[i]->id > node->mLast))
-                                cout << "big error!! " << mGeometry[i]->id << endl;
-                        else cout << "ok"<<mGeometry[i]->id;
-                        box.Include(mGeometry[i]->GetBoundingBox());
-                }
-
-                Debug<< box << " " << node->GetBox() << " f " << node->mFirst << " l " << node->mLast << " id " << node->GetId() << " l " << node->IsLeaf() << endl;
-
-                //node->mBox = box;
-                if (!node->IsLeaf())
-                {
-                        BvhInterior *interior = static_cast<BvhInterior *>(node);
-
-                        tStack.push(interior->mFront);
-                        tStack.push(interior->mBack);
-                }
-        }
-}
-
-
 void Bvh::SetVirtualLeaves(int numTriangles) 
 {
@@ -1006 +943 @@
 
 
-}
+void Bvh::RenderBoundingBoxImmediate(const AxisAlignedBox3 &box)
+{
+        const Vector3 l = box.Min();
+        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);
+}
+
+
+
+}