Changeset 2771 for GTP/trunk/App/Demos/Vis/CHC_revisited/RenderTraverser.cpp

Timestamp:

06/18/08 17:33:16 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/RenderTraverser.cpp (modified) (8 diffs)

GTP/trunk/App/Demos/Vis/CHC_revisited/RenderTraverser.cpp

@@ -5 +5 @@
 #include "SceneEntity.h"
 #include "RenderState.h"
+
+
+using namespace std;
 
 
@@ -35 +38 @@
 mVisibilityThreshold(0),
 mBvh(NULL), 
-mIsQueryMode(false),
 mUseOptimization(false),
 mFrameId(-1),
 mUseRenderQueue(false),
-mAssumedVisibleFrames(10)
+mAssumedVisibleFrames(10),
+mMaxBatchSize(50)
 {
 }
@@ -78 +81 @@
 void RenderTraverser::RenderNode(BvhNode *node)
 {
-        if (mUseRenderQueue)
-        {
-                int geometrySize;
-                SceneEntity **geom = mBvh->GetGeometry(node, geometrySize);
-                mRenderQueue.Enqueue(geom, geometrySize);
-                mStats.mNumRenderedGeometry += geometrySize;
-        }
-        else
-        {
-                if (mRenderState->SetState(RenderState::RENDER))
-                        ++ mStats.mNumStateChanges;
-
-                mStats.mNumRenderedGeometry += mBvh->Render(node, mRenderState);
-        }               
+        if (node->GetLastRenderedFrame() != mFrameId)
+        {
+                //cout << "big error!!" << endl;
+                node->SetLastRenderedFrame(mFrameId);
+
+                if (mUseRenderQueue)
+                {
+                        int geometrySize;
+                        SceneEntity **geom = mBvh->GetGeometry(node, geometrySize);
+                        mRenderQueue.Enqueue(geom, geometrySize);
+                        mStats.mNumRenderedGeometry += geometrySize;
+                }
+                else
+                {
+                        if (mRenderState->SetState(RenderState::RENDER))
+                                ++ mStats.mNumStateChanges;
+
+                        mStats.mNumRenderedGeometry += mBvh->Render(node, mRenderState);
+                }               
+        }
 }
 
@@ -130 +139 @@
         }
 
-        // if this node is a previous visible leaf => will be rendered anyway, thus we
-        // can also test with the real geometry 
+        // if this node is a previous visible leaf:
+        // leaves will be rendered anyway => we can also test with the real geometry 
         if (wasVisible && mUseOptimization)
         {
-                mStats.mNumRenderedGeometry += mBvh->Render(node, mRenderState);
+                RenderNode(node);
         }
         else
@@ -151 +160 @@
 
 
-void RenderTraverser::SetVisibilityThreshold(int threshold)
-{
-        mVisibilityThreshold = threshold;
-}
-
-
-int RenderTraverser::GetVisibilityThreshold() const
-{
-        return mVisibilityThreshold;
-}
-
-
-void RenderTraverser::SetUseOptimization(bool useOptimization)
-{
-        mUseOptimization = useOptimization;
-}
-
-
-
 void RenderTraverser::RenderScene()
 {
@@ -182 +172 @@
         ++ mFrameId;
 
-        mBvh->InitFrame(mCamera, mFrameId);
+        mBvh->InitFrame();
 
         mStats.Reset();
@@ -195 +185 @@
         Traverse();
 
-        // render the rest of the objects
-        if (mUseRenderQueue)
-        {
-                if (mRenderState->SetState(RenderState::RENDER))
-                        ++ mStats.mNumStateChanges;
-
-                mRenderQueue.Render();
-                mRenderQueue.Clear();
-        }
-
         mRenderState->Reset();
 
@@ -221 +201 @@
 }
 
-}
+
+
+
+void RenderTraverser::SetVisibilityThreshold(int threshold)
+{
+        mVisibilityThreshold = threshold;
+}
+
+
+void RenderTraverser::SetUseOptimization(bool useOptimization)
+{
+        mUseOptimization = useOptimization;
+}
+
+
+}