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

Timestamp:

09/02/08 15:29:20 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -24 +24 @@
 using namespace std;
 
+
+int BvhNode::sCurrentState = 0;
 
 
@@ -75 +77 @@
 mAxis(-1), 
 mDepth(0), 
-mPlaneMask(0),
-mPreferredPlane(0),
 mLastRenderedFrame(-999),
 mFirst(-1), 
@@ -87 +87 @@
 mIsVirtualLeaf(false)
 {
+        for (int i = 0; i < NUM_STATES; ++ i)
+        {
+                mPlaneMask[i] = 0;
+                mPreferredPlane[i]= 0;
+        }
 }
 
@@ -97 +102 @@
 void BvhNode::ResetVisibility()
 {
-        mVisibility.Reset();
+        for (int i = 0; i < NUM_STATES; ++ i)
+        {
+                mVisibility[i].Reset();
+        }
+
         mLastRenderedFrame = -999;
 }
@@ -301 +310 @@
 {
         // do the test only if necessary
-        if (!(node->mPlaneMask & (1 << i)))
+        if (!(node->mPlaneMask[BvhNode::sCurrentState] & (1 << i)))
                 return true;
                         
@@ -310 +319 @@
         {
                 // outside
-                node->mPreferredPlane = i;
+                node->mPreferredPlane[BvhNode::sCurrentState] = i;
                 return false;
         }
@@ -320 +329 @@
         {
                 // completely inside: children don't need to check against this plane no more
-                node->mPlaneMask^= 1 << i;
+                node->mPlaneMask[BvhNode::sCurrentState] ^= 1 << i;
         }
         else 
@@ -336 +345 @@
 
         if (node->GetParent())
-                node->mPlaneMask = node->GetParent()->mPlaneMask;
-
-
-        //for (int i = 0; i < 6; ++ i)
-        //      if (!TestPlane(node, i, bIntersect)) return 0;
-        
+                node->mPlaneMask[BvhNode::sCurrentState] = node->GetParent()->mPlaneMask[BvhNode::sCurrentState];
 
         ////////
         //-- apply frustum culling for the planes [mPreferredPlane - 5]
 
-        for (int i = node->mPreferredPlane; i < 6; ++ i)
+        for (int i = node->mPreferredPlane[BvhNode::sCurrentState]; i < 6; ++ i)
                 if (!TestPlane(node, i, bIntersect)) return 0;
         
+
         //////////
         //-- do the view frustum culling for the planes [0 - m_iPreferredPlane)
 
-        for (int i = 0; i < node->mPreferredPlane; ++ i)
+        for (int i = 0; i < node->mPreferredPlane[BvhNode::sCurrentState]; ++ i)
                 if (!TestPlane(node, i, bIntersect)) return 0;
         
@@ -362 +367 @@
 {
         // = 0011 1111 which means that at the beginning, all six planes have to frustum culled
-        mRoot->mPlaneMask = 0x3f;
+        mRoot->mPlaneMask[BvhNode::sCurrentState] = 0x3f;
 
         mCamera->CalcFrustum(sFrustum);