Changeset 3267

Timestamp:

01/11/09 13:34:37 (15 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• Bvh.cpp (modified) (15 diffs)
• Bvh.h (modified) (1 diff)
• BvhConstructor.cpp (modified) (5 diffs)
• BvhConstructor.h (modified) (1 diff)
• BvhLoader.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (4 diffs)

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

@@ -504 +504 @@
         if (mDynamicGeometrySize)
         {
-                UpdateDynamicBranch(mDynamicRoot);
+                UpdateBoundingBoxes(mDynamicRoot);
                 UpdateDynamicBounds(state);
         }
@@ -874 +874 @@
         cout << "created tighter bounds for " << p << " percent of the nodes" << endl;
 
-        // recreate indices used for indirect mode rendering
+        // recreate indices used for indirect rendering mode
         if (mIndices) CreateIndices();
 }
@@ -956 +956 @@
         int numVirtualLeaves = 0;
         int numGeometry = 0;
-cout<<"here3 computing stats"<<endl;
+
         while (!nodeStack.empty()) 
         {
@@ -962 +962 @@
                 nodeStack.pop();
 
-                cout << "x";
-                if (node->IsLeaf() && !node->IsVirtualLeaf())
-                        cerr << "here34"<<endl;
-
                 if (node->IsVirtualLeaf()) 
                 {
@@ -971 +967 @@
                         numGeometry += node->CountPrimitives();
 
-                        cout << " l " << numGeometry;
                         BvhLeaf *leaf = static_cast<BvhLeaf *>(node);
 
@@ -980 +975 @@
                 else 
                 {
-                        cout << "i";
-
                         bvhStats.mInteriorSA += node->mBox.SurfaceArea();
                         bvhStats.mInteriorVol += node->mBox.GetVolume();
@@ -1090 +1083 @@
         // assign new virtual leaves based on specified #triangles per leaf
         std::stack<BvhNode *> nodeStack;
-        nodeStack.push(mRoot);
-
-        cout << "here9" << endl;
+        nodeStack.push(mStaticRoot);
+        nodeStack.push(mDynamicRoot);
+
         while (!nodeStack.empty()) 
         {
-                cout <<"u"<< endl;
                 BvhNode *node = nodeStack.top();
                 nodeStack.pop();
@@ -1116 +1108 @@
                                 (CountTriangles(node) <= numTriangles))
                         {
-                                cout << " l " << CountTriangles(node) << " " << node->mIsMaxDepthForVirtualLeaf << endl;
+                                //cout << " l " << CountTriangles(node) << " " << node->mIsMaxDepthForVirtualLeaf << endl;
                                 node->mIsVirtualLeaf = true;
                         }
@@ -1145 +1137 @@
 
         std::stack<BvhNode *> nodeStack;
-        nodeStack.push(mRoot);
-
-        cout << "here7 computing depth" << endl;
+
+        nodeStack.push(mStaticRoot);
+        nodeStack.push(mDynamicRoot);
+
         while (!nodeStack.empty()) 
         {
                 BvhNode *node = nodeStack.top();
                 nodeStack.pop();
-cout << "z";
+
                 if (node->IsLeaf()) 
                 {
@@ -1166 +1159 @@
                         if ((f->mFirst == b->mFirst) && (f->mLast == b->mLast))
                         {
-                                cout << "f: " << f->mFirst << " " << f->mLast << endl;
                                 // point reached where beyond there would be no further reduction 
                                 // as both subtrees contain the same objects => stop here
@@ -1180 +1172 @@
                 }
         }
-        cout << "here7" << endl;
 }
 
@@ -1205 +1196 @@
 
         BvhStats staticBvhStats;
-        ComputeBvhStats(mRoot, staticBvhStats);
+        ComputeBvhStats(mStaticRoot, staticBvhStats);
         cout << "\n============ Static BVH statistics =============" << endl;
 
@@ -1404 +1395 @@
 
 
-void Bvh::UpdateDynamicBranch(BvhNode *node)
+void Bvh::UpdateBoundingBoxes(BvhNode *node)
 {
         if (node->IsLeaf())
@@ -1419 +1410 @@
                 BvhNode *b = static_cast<BvhInterior *>(node)->GetBack();
 
-                UpdateDynamicBranch(f);
-                UpdateDynamicBranch(b);
+                UpdateBoundingBoxes(f);
+                UpdateBoundingBoxes(b);
 
                 node->mBox = f->mBox;
@@ -1452 +1443 @@
 }
 
-}
+
+
+
+}

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

@@ -590 +590 @@
         void CreateDynamicBranch();
 
-        void UpdateDynamicBranch(BvhNode *node);
+        void UpdateBoundingBoxes(BvhNode *node);
 
         inline bool TerminationCriteriaMet(BvhLeaf *leaf) const;

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

@@ -40 +40 @@
 
 int BvhConstructor::SortTriangles(BvhLeaf *leaf, 
-                                           int axis, 
-                                           float position
-                                           )
+                                                                  int axis, 
+                                                                  float position
+                                                                  )
 {
         int i = leaf->mFirst;
@@ -69 +69 @@
 
 
+void BvhConstructor::UpdateBoundingBoxes(BvhNode *node)
+{
+        if (node->IsLeaf())
+        {
+                int numEntities = node->CountPrimitives();
+                SceneEntity **entities = mEntities + node->mFirst;
+
+                node->mBox = SceneEntity::ComputeBoundingBox(entities, numEntities);
+                //cout << "box: " << node->mBox << endl;
+        }
+        else
+        {
+                BvhNode *f = static_cast<BvhInterior *>(node)->GetFront();
+                BvhNode *b = static_cast<BvhInterior *>(node)->GetBack();
+
+                UpdateBoundingBoxes(f);
+                UpdateBoundingBoxes(b);
+
+                node->mBox = f->mBox;
+                node->mBox.Include(b->mBox);
+        }
+}
+
+
 int BvhConstructor::SortTrianglesSpatialMedian(BvhLeaf *leaf, 
                                                                                            int axis)
@@ -84 +108 @@
         if (TerminationCriteriaMet(leaf))
         {
-                if (leaf->CountPrimitives() <= 0)
-                        cout << "leaf constructed:" << leaf->mBox << " " << leaf->mFirst << " " << leaf->mLast << endl;
+                //if (leaf->CountPrimitives() <= 0)
+                //cout << "leaf constructed:" << leaf->mBox << " " << leaf->mFirst << " " << leaf->mLast << endl;
                 return leaf;
         }
@@ -157 +181 @@
 {
         BvhNode *root;
-
         mNumNodes = 1;
 
@@ -168 +191 @@
         l->mArea = l->mBox.SurfaceArea();
         
-        cout << "constructing bvh"  << endl;
+        cout << "constructing bvh from "  << l->mFirst << " to " << l->mLast << endl;
 
         root = SubdivideLeaf(l, 0);
 
+        UpdateBoundingBoxes(root);
+
         numNodes = mNumNodes;
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/BvhConstructor.h

@@ -32 +32 @@
         inline bool TerminationCriteriaMet(BvhLeaf *leaf) const;
 
+        void UpdateBoundingBoxes(BvhNode *node);
+
 
         /////////////////

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

@@ -142 +142 @@
         Bvh *bvh = new Bvh(staticEntities, dynamicEntities, maxDepthForTestingChildren);
 
+        cout << "here8 " << (int)bvh->mStaticGeometrySize - 1 << endl;
         BvhConstructor bvhConstructor(bvh->mGeometry, 
                                           0,

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

@@ -77 +77 @@
 FrameBufferObject *fbo = NULL;
 /// the renderable scene geometry
-SceneEntityContainer sceneEntities;
+SceneEntityContainer staticObjects;
 /// the dynamic objects in the scene
 SceneEntityContainer dynamicObjects;
@@ -568 +568 @@
         //-- load the static scene geometry
 
-        LoadModel(filename + ".dem", sceneEntities);
+        LoadModel(filename + ".dem", staticObjects);
 
 
@@ -645 +645 @@
 
         BvhFactory bvhFactory;
-        //bvh = bvhFactory.Create(bvh_filename, sceneEntities, dynamicObjects, maxDepthForTestingChildren);
-        bvh = bvhFactory.Create(sceneEntities, dynamicObjects, maxDepthForTestingChildren);
+        //bvh = bvhFactory.Create(bvh_filename, staticObjects, dynamicObjects, maxDepthForTestingChildren);
+        bvh = bvhFactory.Create(staticObjects, dynamicObjects, maxDepthForTestingChildren);
 
         if (!bvh)
@@ -671 +671 @@
         //-- setup the skydome model
 
-        LoadModel("sky.dem", sceneEntities);
-        skyDome = sceneEntities.back();
+        LoadModel("sky.dem", staticObjects);
+        skyDome = staticObjects.back();
 
         /// the turbitity of the sky (from clear to hazy, use <3 for clear sky)