Changeset 3069 for GTP/trunk

Timestamp:

10/24/08 17:04:15 (16 years ago)

Author:

mattausch

Message:

completely changing dynamic stuff

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• Bvh.cpp (modified) (1 diff)
• BvhLoader.cpp (modified) (1 diff)

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

@@ -1269 +1269 @@
 void Bvh::UpdateDynamicBranch()
 {
+        // the bvh has two main branches
+        // a static branch (the old root), and adynamic branch 
+        // we create a 'dynamic' leaf which basically is a container
+        // for all dynamic objects underneath
+
+        // the bounding boxes of the dynamic tree must be updated
+        // once each frame in order to be able to incorporate
+        // the movements of the objects within
+
         // delete old branch
-        if (!mDynamicRoot->IsLeaf())
-        {
-                cout << "deleting old branch" << endl;
-
-                DEL_PTR(mDynamicRoot);
-
-                mDynamicRoot = new BvhLeaf(mRoot);
-                mDynamicRoot->mBox = mRoot->mBox;
-
-                mDynamicRoot->mFirst = 0;
-                mDynamicRoot->mLast = 0;
-                mDynamicRoot->mArea = mDynamicRoot->mBox.SurfaceArea();
-        }
-
+        cout << "deleting old branch" << endl;
+
+        DEL_PTR(mDynamicRoot);
+
+        mDynamicRoot = new BvhLeaf(mRoot);
+        mDynamicRoot->mBox = mRoot->mBox;
+
+        mDynamicRoot->mFirst = 0;
+        mDynamicRoot->mLast = (int)mDynamicEntities.size() - 1;
+        mDynamicRoot->mArea = mDynamicRoot->mBox.SurfaceArea();
+        
         cout << "updating dynamic branch" << endl;
 

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

@@ -77 +77 @@
 
         bvh->mRoot = root;
-
-#if 0
-
         //bvh->mRoot = bvh->mStaticRoot;
         bvh->mNumNodes = 1;
-
-#else
-        // we are setting a new root node 
-        // and adds one level of indirection to the bvh 
-        // It allows us to use dynamic objects
-
-        // the new bvh has two main branches
-        // a static branch (the old root), and adynamic branch 
-        // we create a 'dynamic' leaf which basically is a container
-        // for all dynamic objects underneath
-
-        // the bounding boxes of the dynamic tree must be updated
-        // once each frame in order to be able to incorporate
-        // the movements of the objects within
-
-        // create new root
-        /*BvhInterior *newRoot = new BvhInterior(NULL);
-        bvh->mRoot = newRoot;
-
-        // the separation is a purely logical one
-        // the bounding boxes of the child nodes are 
-        // identical to those of the root node
-
-        newRoot->mBox = bvh->mStaticRoot->mBox;
-        newRoot->mArea = newRoot->mBox.SurfaceArea();
-
-        newRoot->mFirst = bvh->mStaticRoot->mFirst;
-        newRoot->mLast = bvh->mStaticRoot->mLast;
-
-        // add static root on left subtree
-        newRoot->mFront = bvh->mStaticRoot;
-        bvh->mStaticRoot->mParent = newRoot;
-        */
-        // create and add dynamic root
-        BvhLeaf *dynamicRoot = new BvhLeaf(NULL);
-        
-        dynamicRoot->mFirst = 0;
-        dynamicRoot->mLast = 0;
-
-        //dynamicRoot->mBox = bvh->mStaticRoot->mBox;
-        dynamicRoot->mBox = bvh->mRoot->mBox;
-        dynamicRoot->mArea = dynamicRoot->mBox.SurfaceArea();
-
-        bvh->mDynamicRoot = dynamicRoot;
-        //newRoot->mBack = dynamicRoot;
-
-        bvh->mNumNodes = 1;
-#endif
 
         tQueue.push(bvh->mRoot);