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

Timestamp:

10/27/08 03:26:48 (16 years ago)

Author:

mattausch

Message:

included vbo support for dynamic objects

File:

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

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

@@ -207 +207 @@
 Bvh::~Bvh() 
 {
-        if (mVertices) delete [] mVertices; 
-        if (mIndices) delete [] mIndices;
-        if (mTestIndices) delete [] mTestIndices;
-        if (mGeometry) delete [] mGeometry;
+        DEL_ARRAY_PTR(mVertices);
+        DEL_ARRAY_PTR(mIndices);
+        DEL_ARRAY_PTR(mTestIndices);
+        DEL_ARRAY_PTR(mGeometry);
 
         if (mRoot) delete mRoot;
@@ -220 +220 @@
 void Bvh::Init()
 {
-        //mStaticRoot = NULL;
+        mStaticRoot = NULL;
         mDynamicRoot = NULL;
         mRoot = NULL;
@@ -435 +435 @@
 
 
-void Bvh::InitFrame(Camera *cam)
+void Bvh::InitFrame(Camera *cam, RenderState *state)
 {
         // = 0011 1111 which means that at the beginning, all six planes have to frustum culled
@@ -452 +452 @@
         {
                 UpdateDynamicBranch(mDynamicRoot);
+                UpdateDynamicBounds(state);
         }
 }
@@ -532 +533 @@
         ///////////////////
         //-- for the first time we come here => create vbo and indices
-/*
+
         if (!mIndices)
         {       
@@ -544 +545 @@
                 PrepareVertices();
         }
-*/
+
         ///////////////
 
         int numNodes = 0;
-/*
+
         BvhNodeContainer::const_iterator nit, nit_end = nodes.end();
 
@@ -563 +564 @@
                 numNodes += node->mNumTestNodes;
         }
-*/
+
         return numNodes;
 }
@@ -660 +661 @@
         // collect all nodes
         BvhNodeContainer nodes;
-        CollectNodes(mRoot, nodes);
-
-        // assign ids to all nodes of the "regular" hierarchy
+        //CollectNodes(mRoot, nodes);
+        // first collect dynamic nodes so we make sure that they are in the beginning
+        CollectNodes(mDynamicRoot, nodes);
+        // then collect static nodes
+        CollectNodes(mStaticRoot, nodes);
+        // also add root
+        nodes.push_back(mRoot);
+
+        // assign ids to all nodes of the hierarchy
         int i = 0;
         BvhNodeContainer::const_iterator lit, lit_end = nodes.end();
@@ -679 +686 @@
 
         nodes.reserve(GetNumNodes());
-        CollectNodes(mRoot, nodes);
+        // first collect dynamic nodes so we make sure that they are in the beginning
+        CollectNodes(mDynamicRoot, nodes);
+        // then collect static nodes
+        CollectNodes(mStaticRoot, nodes);
+        // also add root
+        nodes.push_back(mRoot);
 
         const unsigned int bufferSize = 8 * (int)nodes.size();
@@ -704 +716 @@
                             bufferSize * sizeof(Vector3), 
                             mVertices, 
-                                        GL_STATIC_DRAW_ARB);
+                                        //GL_STATIC_DRAW_ARB);
+                                        GL_DYNAMIC_DRAW_ARB);
 
         glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
 
         // data handled by graphics driver from now on
-        DEL_PTR(mVertices);
+        DEL_ARRAY_PTR(mVertices);
 
         cout << "******** created vbos for tighter bounds *********" << endl;
+}
+
+
+void Bvh::UpdateDynamicBounds(RenderState *state)
+{
+        // vbos not created yet
+        if (mVboId == -1) return;
+
+        // collect all nodes
+        static BvhNodeContainer nodes;
+        nodes.clear();
+        //nodes.reserve(GetNumNodes());
+        CollectNodes(mDynamicRoot, nodes);
+
+        const unsigned int bufferSize = 8 * (int)nodes.size();
+        
+        if (!mVertices) mVertices = new Vector3[bufferSize];
+        
+        int i = 0;
+        
+        // store bounding box vertices
+        BvhNodeContainer::const_iterator lit, lit_end = nodes.end();
+
+        for (lit = nodes.begin(); lit != lit_end; ++ lit, i += 8)
+        {
+                BvhNode *node = *lit;
+
+                for (int j = 0; j < 8; ++ j)
+                        (static_cast<Vector3 *>(mVertices))[node->GetId() * 8 + j] = node->GetBox().GetVertex(j);
+        }
+        
+        if (state->GetCurrentVboId() != mVboId)
+        {
+                glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
+                // set the vertex pointer to the vertex buffer
+                glVertexPointer(3, GL_FLOAT, 0, (char *)NULL);  
+
+                state->SetCurrentVboId(mVboId);
+        }
+
+        glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0,
+                                           bufferSize * sizeof(Vector3), 
+                                           mVertices);
+
+        glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
 }
 
@@ -1061 +1119 @@
         CreateRoot();
 
-        ComputeIds();
         ComputeMaxDepthForVirtualLeaves();
         // set virtual leaves for specified number of triangles
@@ -1067 +1124 @@
         /// for each node compute the number of leaves under this node
         UpdateNumLeaves(mRoot);
+        // compute new ids
+        ComputeIds();
         // specify bounds for occlusion tests
         RecomputeBounds();
+
+        mBox = mRoot->GetBox();
 
         // compute and print stats
@@ -1267 +1328 @@
         if (TerminationCriteriaMet(leaf))
         {
-                leaf->mIsVirtualLeaf = true;
-                leaf->mIsMaxDepthForVirtualLeaf = true;
                 //cout << "leaf constructed:" << leaf->mBox << " " << leaf->mFirst << " " << leaf->mLast << endl;
                 return leaf;
@@ -1412 +1471 @@
         // create new root
         mRoot = new BvhInterior(NULL);
-        
+
         // the separation is a purely logical one
         // the bounding boxes of the child nodes are