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

Timestamp:

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

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Bvh.cpp (modified) (15 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 @@
 }
 
-}
+
+
+
+}