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

Timestamp:

01/11/09 02:43:59 (15 years ago)

Author:

mattausch

Message:

worked on bvh constructor

File:

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

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

@@ -266 +266 @@
 
         mVboId = -1;
-        // bound the maximal depth of the dynamic branch
-        mMaxDepthForDynamicBranch = 1;
+        // bounds the maximal depth of the dynamic branch
+        mMaxDepthForDynamicBranch = 10;
 }
 
@@ -1357 +1357 @@
     while (1)
         {
-                while (mGeometry[i]->GetWorldCenter()[axis] < position) ++ i;
-                //while ((j > 0) && (position < mGeometry[j]->GetWorldCenter()[axis])) -- j;
-                while (position < mGeometry[j]->GetWorldCenter()[axis]) -- j;
+                //while (mGeometry[i]->GetWorldCenter()[axis] < position) ++ i;
+                //while (position < mGeometry[j]->GetWorldCenter()[axis]) -- j;
+
+                while ((i < leaf->mLast) && (mGeometry[i]->GetWorldCenter()[axis] < position)) ++ i;
+                while ((j > leaf->mFirst) && (position < mGeometry[j]->GetWorldCenter()[axis])) -- j;
 
                 // sorting finished
@@ -1391 +1393 @@
         if (TerminationCriteriaMet(leaf))
         {
-                //cout << "leaf constructed:" << leaf->mBox << " " << leaf->mFirst << " " << leaf->mLast << endl;
+                if (leaf->CountPrimitives() == 0)
+                        cout << "error: leaf constructed:" << leaf->mBox << " " << leaf->mFirst << " " << leaf->mLast << endl;
+                
                 return leaf;
         }
@@ -1409 +1413 @@
         pos = leaf->mBox.Center()[axis];
         
+        //if ((split >= leaf->mLast) || (split < leaf->mFirst))
         if (split == leaf->mLast)
         {
                 // no split could be achieved => just halve number of objects
-                split = (leaf->mLast - leaf->mFirst) / 2;
-                cerr << "no reduction " << leaf->CountPrimitives() << " " << leaf->mFirst << " " << leaf->mLast << endl;
+                split = (leaf->mLast + leaf->mFirst) / 2;
+                cerr << "no reduction " << leaf->CountPrimitives() << " " << leaf->mFirst << " " << leaf->mLast << " " << split << endl;
         }
 
@@ -1436 +1441 @@
         front->mDepth = leaf->mDepth + 1;
 
+        if (leaf->mFirst > leaf->mLast)
+                cerr << "erorr!!! " << leaf->CountPrimitives() << " " << leaf->mFirst << " " << leaf->mLast << " " << split << endl;
+
         leaf->mLast = split;
         leaf->mDepth = front->mDepth;
@@ -1455 +1463 @@
         const bool criteriaMet = 
                 (leaf->mDepth > mMaxDepthForDynamicBranch) ||
-                (leaf->CountPrimitives() == 1);
+                (leaf->CountPrimitives() <= 1);
 
         return criteriaMet;
@@ -1501 +1509 @@
         -- mNumNodes;
 
-#if 0
+#if 1
         BvhConstructor bvhConstructor(mGeometry, (int)mStaticGeometrySize, (int)mGeometrySize - 1);
 
@@ -1510 +1518 @@
 
 #else
+
         BvhLeaf *l = new BvhLeaf(mRoot);
         mDynamicRoot = l;