Changeset 2763 for GTP/trunk

Timestamp:

06/16/08 08:56:35 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/CHC_revisited

Files:

• BinaryLoader.cpp (modified) (2 diffs)
• Bvh.cpp (modified) (6 diffs)
• Bvh.h (modified) (2 diffs)
• BvhLoader.cpp (modified) (3 diffs)
• Devil (added)
• Devil/include (added)
• Devil/include/IL (added)
• Devil/include/IL/Makefile.am (added)
• Devil/include/IL/Makefile.in (added)
• Devil/include/IL/config.h (added)
• Devil/include/IL/config.h.in (added)
• Devil/include/IL/devil_internal_exports.h (added)
• Devil/include/IL/il.h (added)
• Devil/include/IL/il_wrap.h (added)
• Devil/include/IL/ilu.h (added)
• Devil/include/IL/ilu_region.h (added)
• Devil/include/IL/ilut.h (added)
• Devil/include/IL/stamp-h.in (added)
• Devil/lib (added)
• Devil/lib/DevIL.dll (added)
• Devil/lib/DevIL.lib (added)
• Devil/lib/ILU.dll (added)
• Devil/lib/ILU.lib (added)
• Devil/lib/ILUT.dll (added)
• Devil/lib/ILUT.lib (added)
• FrustumCullingTraverser.cpp (modified) (2 diffs)
• OcclusionQuery.cpp (modified) (1 diff)
• OcclusionQuery.h (modified) (2 diffs)
• RenderTraverser.cpp (modified) (2 diffs)
• RenderTraverser.h (modified) (3 diffs)
• StopAndWaitTraverser.cpp (modified) (2 diffs)
• StopAndWaitTraverser.h (modified) (1 diff)
• chcdemo.cpp (modified) (3 diffs)
• common.h (modified) (1 diff)

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

@@ -175 +175 @@
         geometry.resize(shapeCount);
 
+        for (size_t i = 0; i < geometry.size(); ++ i)
+                geometry[i] = NULL;
+        
+
         int progress = 0;
 
         for (int i = 0; i < shapeCount; ++ i)
         {
-                int id;
-                istr.read(reinterpret_cast<char *>(&id), sizeof(int));
-
+                //int id;istr.read(reinterpret_cast<char *>(&id), sizeof(int));
                 SceneEntity *ent = LoadSceneEntity(istr);
-                ent->id = id;
-
-                geometry[id] = ent;
+                ent->id = i;
+
+                geometry[i] = ent;
                 
                 int p = (i + 1) * 100 / shapeCount;
@@ -191 +193 @@
                 if (p >= progress)
                 {
-                        //cout << "% loaded: " << p << endl;
+                        cout << "% loaded: " << p << endl;
                         progress += 10;
                 }
         }
 
+        for (size_t i = 0; i < geometry.size(); ++ i)
+        {
+                if (!geometry[i])
+                        Debug << "error: index " << i << " missing" << endl;
+        }
+
         cout << "bin loading finished" << endl;
 

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

@@ -295 +295 @@
 {
         // do the test only if necessary
-        if (1)//node->mPlaneMask & (1 << i))
-        {//cout<<"plane "<< i << endl;
-                bool outs = true;
-                //-- test the n-vertex
-                for (int j = 0; j < 8; ++ j)
-                {
-                        if (sFrustum.mClipPlanes[i].Distance(node->mBox.GetVertex(j)) <= 0) outs = false;
-                }
-                if (outs) return 0;
-                //if ((node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 0], sFrustum.mClipPlanes[i]) > 0.0f))
-                        //&&    (node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 1], sFrustum.mClipPlanes[i]) > 0.0f))
-                {
-                        // outside
-                //      node->mPreferredPlane = i;
-                        //cout<<"f " << node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 0], sFrustum.mClipPlanes[i]) << " " << sFrustum.mClipPlanes[i] << endl;
-                //      return false;
-                }//else cout<<"ok " << node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 0], sFrustum.mClipPlanes[i]) << " " << sFrustum.mClipPlanes[i] << endl;
-
-                //-- test the p-vertex
-                if (node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 1], sFrustum.mClipPlanes[i]) <= 0.0f)
-                {
-                        // completely inside: children don't need to check against this plane no more
-                        node->mPlaneMask^= 1 << i;
-                }
-                else 
-                {
-                        bIntersect = true;
-                }
-        }
-
+        if (!(node->mPlaneMask & (1 << i)))
+                return true;
+                        
+        ////////
+        //-- test the n-vertex
+                
+        if ((node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 0], sFrustum.mClipPlanes[i]) > 0.0f))
+        {
+                // outside
+                node->mPreferredPlane = i;
+                return false;
+        }
+
+        ////////////
+        //-- test the p-vertex
+
+        if (node->mBox.GetDistance(sClipPlaneAABBVertexIndices[i * 2 + 1], sFrustum.mClipPlanes[i]) <= 0.0f)
+        {
+                // completely inside: children don't need to check against this plane no more
+                node->mPlaneMask^= 1 << i;
+        }
+        else 
+        {
+                bIntersect = true;
+        }
+        
         return true;
 }
@@ -337 +333 @@
 
 
-        for (int i = 0; i < 6; ++ i)
-        {
-                if (!TestPlane(node, i, bIntersect)) return 0;
-        }
+        //for (int i = 0; i < 6; ++ i)
+        //      if (!TestPlane(node, i, bIntersect)) return 0;
+        
 
         ////////
         //-- apply frustum culling for the planes [mPreferredPlane - 5]
-/*
+
         for (int i = node->mPreferredPlane; 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)
-        {
                 if (!TestPlane(node, i, bIntersect)) return 0;
-        }
-*/
+        
         return bIntersect ? -1 : 1;
 }
@@ -373 +364 @@
         sFrustum.CalcNPVertexIndices(sClipPlaneAABBVertexIndices);
 
-        for (int i = 0; i<12; ++ i)
-//cout<<" x " << sClipPlaneAABBVertexIndices[i];
-//      cout<<"\n********\n";
-        // near plane
+        // store near plane
         sNearPlane = Plane3(mCamera->GetDirection(), mCamera->GetPosition());
-
 //      Debug << "near: " << sNearPlane << " d " << mCamera->GetDirection() << " " << mCamera->GetPosition() << std::endl;
 //      for (int i = 0; i < 6; ++ i) Debug << "plane: " << sFrustum.mClipPlanes[i] << std::endl;
@@ -392 +379 @@
 void Bvh::RenderBoundingBox(BvhNode *node)
 {
-        static BvhNodeContainer dummy(1);
+        RenderBoundingBoxImmediate(node->GetBox());
+        /**static BvhNodeContainer dummy(1);
         dummy[0] = node;
-        RenderBoundingBoxes(dummy);
+        RenderBoundingBoxes(dummy);*/
 }
 
@@ -870 +858 @@
 
 
-void Bvh::Dummy()
-{
-        for (int i = 0; i < mGeometrySize; ++ i)
-                Debug << mGeometry[i]->id << " " << mGeometry[i]->GetGeometry()->GetBoundingBox() << endl;
-
-        AxisAlignedBox3 boxl; boxl.Initialize();
-        AxisAlignedBox3 boxr; boxr.Initialize();
-
-
-        for (int i = 0; i <= 107; ++ i)
-                boxl.Include(mGeometry[i]->GetBoundingBox());
-
-        for (int i = 108; i <= 193; ++ i)
-                boxr.Include(mGeometry[i]->GetBoundingBox());
-
-        Debug << "dummy " << boxl << " " << boxr << endl;
-
-        queue<BvhNode *> tStack;
-        tStack.push(mRoot);
-
-        while (!tStack.empty())
-        {
-                BvhNode *node = tStack.front();//top();
-                tStack.pop();
-
-                AxisAlignedBox3 box;
-                box.Initialize();
-
-                int i = 0;
-                for (int i = node->mFirst; i <= node->mLast; ++ i)
-                {
-                        if ((mGeometry[i]->id < node->mFirst) || (mGeometry[i]->id > node->mLast))
-                                cout << "big error!! " << mGeometry[i]->id << endl;
-                        else cout << "ok"<<mGeometry[i]->id;
-                        box.Include(mGeometry[i]->GetBoundingBox());
-                }
-
-                Debug<< box << " " << node->GetBox() << " f " << node->mFirst << " l " << node->mLast << " id " << node->GetId() << " l " << node->IsLeaf() << endl;
-
-                //node->mBox = box;
-                if (!node->IsLeaf())
-                {
-                        BvhInterior *interior = static_cast<BvhInterior *>(node);
-
-                        tStack.push(interior->mFront);
-                        tStack.push(interior->mBack);
-                }
-        }
-}
-
-
 void Bvh::SetVirtualLeaves(int numTriangles) 
 {
@@ -1006 +943 @@
 
 
-}
+void Bvh::RenderBoundingBoxImmediate(const AxisAlignedBox3 &box)
+{
+        const Vector3 l = box.Min();
+        const Vector3 u = box.Max();
+
+        ///////////
+        //-- render AABB as triangle strips
+
+        glVertex3f(l.x, l.y, u.z);
+        glVertex3f(u.x, l.y, u.z);
+        glVertex3f(l.x, u.y, u.z);
+        glVertex3f(u.x, u.y, u.z);
+        glVertex3f(l.x, u.y, l.z); 
+        glVertex3f(u.x, u.y, l.z);
+        glVertex3f(l.x, l.y, l.z); 
+        glVertex3f(u.x, l.y, l.z);
+
+        glPrimitiveRestartNV();
+
+        //-- render second half of AABB
+        glVertex3f(l.x, u.y, u.z); 
+        glVertex3f(l.x, u.y, l.z);
+        glVertex3f(l.x, l.y, u.z);
+        glVertex3f(l.x, l.y, l.z);
+        glVertex3f(u.x, l.y, u.z); 
+        glVertex3f(u.x, l.y, l.z);
+        glVertex3f(u.x, u.y, u.z); 
+        glVertex3f(u.x, u.y, l.z);
+}
+
+
+
+}

GTP/trunk/App/Demos/Vis/CHC_revisited/Bvh.h

@@ -440 +440 @@
 
 public:
-void Dummy();
+
         /** Destructor.
         */
@@ -601 +601 @@
         inline bool TestPlane(BvhNode *node, int i, bool &bIntersect);
 
+        void RenderBoundingBoxImmediate(const AxisAlignedBox3 &box);
 
         ////////////////////////

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

@@ -27 +27 @@
 
         if (nodeType == TYPE_LEAF)
-        {
-                // cout << "l";
                 node = new BvhLeaf(parent);
-        }
         else if (nodeType == TYPE_INTERIOR)
-        {
-                //cout << "i";
                 node = new BvhInterior(parent);
-        }
         else
-        {
-                cerr << "wrong node type: " << nodeType << endl;
-                //exit(0);
-        }
+                cerr << "error: wrong node type: " << nodeType << endl;
+                
 
         Vector3 bMin, bMax;
@@ -50 +42 @@
         stream.read(reinterpret_cast<char *>(&bMax), sizeof(Vector3));
 
-        //if ((bMin.x >= bMax.x)||(bMin.y >= bMax.y)||(bMin.z >= bMax.z))
-        //      cout << "error: " << bMin << " " << bMax << endl;
-
         node->mBox = AxisAlignedBox3(bMin, bMax);
-
         node->mArea = node->mBox.SurfaceArea();
 
         //cout << "box: " << node->mBox << " area: " << node->mArea << endl;
-        cout << node->mBox << " f " << node->mFirst << " l " << node->mLast << endl;
-
+        
         return node;
 }
@@ -122 +109 @@
         bvh->ComputeBvhStats();
         bvh->PrintBvhStats();
-bvh->Dummy();
+
         return bvh;
 }

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

@@ -29 +29 @@
                 //mNumTraversedNodes ++;
 
-                //bool intersects;
-                int intersect;
-                if (mBvh->IsWithinViewFrustum(node)!=0)
+                if (mBvh->IsWithinViewFrustum(node))
                 {
                         // update node's visited flag => needed for rendering
@@ -39 +37 @@
                         ++ traversed;
                         TraverseNode(node);
-                        RenderBox(node->GetBox());
                 }
                 else
-                {RenderBox(node->GetBox());
-                        if (node->IsLeaf()) 
-                        {
-                        
-                        //cout <<"b: " << node->GetBox() << endl;
-                        }
+                {
                         //mNumFrustumCulledNodes ++;
                 }
                 //cout << "intersect: " << intersect << " bx " << node->GetBox() << endl;
         }
-                
-        //RenderFrustum();
-
+        
         //std::cout << "traversed: " << traversed << std::endl;
 }

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

@@ -69 +69 @@
 }
 
+
+
+QueryHandler::QueryHandler(): mCurrentQueryIdx(0) 
+{}
+
+
+OcclusionQuery *QueryHandler::RequestQuery()
+{
+        OcclusionQuery *query;
+
+        if (mCurrentQueryIdx == mOcclusionQueries.size())
+        {
+                query = new OcclusionQuery();
+                mOcclusionQueries.push_back(query);
+        }
+        else
+                query = mOcclusionQueries[mCurrentQueryIdx];
+
+        return query;
+}
+
+
+void QueryHandler::ResetQueries()
+{
+        mCurrentQueryIdx = 0;
+}
+
+
+void QueryHandler::DestroyQueries()
+{
+        CLEAR_CONTAINER(mOcclusionQueries);
+        mCurrentQueryIdx = 0;
+        mOcclusionQueries.clear();
+}
+
+
+
 } // namespace

GTP/trunk/App/Demos/Vis/CHC_revisited/OcclusionQuery.h

@@ -22 +22 @@
         virtual ~OcclusionQuery();
 
-        virtual bool ResultAvailable() const;
+        bool ResultAvailable() const;
         
-        virtual unsigned int GetQueryResult() const;
+        unsigned int GetQueryResult() const;
         
-        virtual void BeginQuery();
+        void BeginQuery();
         
-        virtual void EndQuery();
+        void EndQuery();
         
         unsigned int GetQueryId() const;
@@ -59 +59 @@
 };
 
+
+class QueryHandler
+{
+public:
+
+        QueryHandler();
+
+        OcclusionQuery *RequestQuery();
+
+        /** Must be called every frame.
+        */
+        void ResetQueries();
+        void DestroyQueries();
+
+protected:
+
+        int mCurrentQueryIdx;
+
+        QueryContainer mOcclusionQueries;
+};
+
+
 } // namespace 
 #endif // OcclusionQuery_H

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

@@ -100 +100 @@
 
 
+
+void RenderTraverser::Switch2GLRenderState()
+{
+        // boolean used to avoid unnecessary state changes
+        if (mIsQueryMode)
+        {
+                // switch back to rendermode            
+                glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+                glDepthMask(GL_TRUE);
+                glEnable(GL_LIGHTING);
+                mIsQueryMode = false;
+        }
+}
+
+
+OcclusionQuery *RenderTraverser::IssueOcclusionQuery(BvhNode *node, bool wasVisible)
+{
+        OcclusionQuery *query = mQueryHandler.RequestQuery();
+
+        query->BeginQuery();
+        
+        // if leaf and was visible => will be rendered anyway, thus we
+        // can also test with the real geometry 
+        /*if(node->IsLeaf() && wasVisible && mUseOptimization)
+        {
+                mNumRenderedGeometry += node->Render();
+        }
+        else
+        {*/
+
+        // change state so the bounding box gets not actually rendered on the screen
+        //Switch2GLQueryState();
+        mBvh->RenderBoundingBox(node);
+        //Switch2GLRenderState();
+
+        query->EndQuery();
+
+        return query;
+}
+
+
+void RenderTraverser::Switch2GLQueryState()
+{       
+        // boolean used to avoid unnecessary state changes
+        if (!mIsQueryMode)
+        {
+                glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+                glDepthMask(GL_FALSE);
+                glDisable(GL_LIGHTING);
+                mIsQueryMode = true;
+        }
+}
+
+
+
 #if 0
 
@@ -160 +215 @@
 }
 
-
-unsigned int RenderTraverser::GetOcclusionQueryResult(HierarchyNode *node) const
-{
-        unsigned int result;
-
-        if (mUseArbQueries)
-        {
-                glGetQueryObjectuivARB(node->GetOcclusionQuery(), GL_QUERY_RESULT_ARB, &result);
-        }
-        else
-        {
-                glGetOcclusionQueryuivNV(node->GetOcclusionQuery(), GL_PIXEL_COUNT_NV, &result);
-        }
-
-        return result;
-}
-
-
-void RenderTraverser::Switch2GLQueryState()
-{       
-        // boolean used to avoid unnecessary state changes
-        if(!mIsQueryMode)
-        {
-                glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-                glDepthMask(GL_FALSE);
-                glDisable(GL_LIGHTING);
-                mIsQueryMode = true;
-        }
-}
-
-
-void RenderTraverser::Switch2GLRenderState()
-{
-        // boolean used to avoid unnecessary state changes
-        if(mIsQueryMode)
-        {
-                // switch back to rendermode            
-                glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-                glDepthMask(GL_TRUE);
-                glEnable(GL_LIGHTING);
-                mIsQueryMode = false;
-        }
-}
-
-void RenderTraverser::IssueOcclusionQuery(HierarchyNode *node, const bool wasVisible)
-{
-        // get next available test id
-        unsigned int occlusionQuery = mOcclusionQueries[mCurrentQueryIdx ++];
-        
-        node->SetOcclusionQuery(occlusionQuery);
-
-        // do the actual occlusion query for this node
-        if (mUseArbQueries)
-        {
-                glBeginQueryARB(GL_SAMPLES_PASSED_ARB, occlusionQuery);
-        }
-        else
-        {
-                glBeginOcclusionQueryNV(occlusionQuery);
-        }
-        
-        // if leaf and was visible => will be rendered anyway, thus we
-        // can also test with the real geometry 
-        if(node->IsLeaf() && wasVisible && mUseOptimization)
-        {
-                mNumRenderedGeometry += node->Render();
-        }
-        else
-        {
-                // change state so the bounding box gets not actually rendered on the screen
-                Switch2GLQueryState();
-                node->RenderBoundingVolume();
-                Switch2GLRenderState();
-        }
-
-        if (mUseArbQueries)
-        {
-                glEndQueryARB(GL_SAMPLES_PASSED_ARB);
-        }
-        else
-        {
-                glEndOcclusionQueryNV();
-        }
-}
 
 void RenderTraverser::Preprocess()

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

@@ -6 +6 @@
 #include "glInterface.h"
 #include "Bvh.h"
+#include "OcclusionQuery.h"
+
 
 namespace CHCDemo
@@ -104 +106 @@
         /** Issues occlusion query for specified node
         */
-        void IssueOcclusionQuery(BvhNode *node, bool wasVisible);
+        OcclusionQuery *IssueOcclusionQuery(BvhNode *node, bool wasVisible);
         /** Resets occlusion queries after a traversal
         */
@@ -151 +153 @@
 
         RenderState *mRenderState;
+
+        QueryHandler mQueryHandler;
 };
 

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

@@ -1 +1 @@
 #include "StopAndWaitTraverser.h"
+#include "SceneEntity.h"
+
 
 namespace CHCDemo
 {
+
+using namespace std;
+
+
+
 StopAndWaitTraverser::StopAndWaitTraverser(): RenderTraverser() 
 {
@@ -16 +23 @@
 void StopAndWaitTraverser::Render()
 {
-#if 0
-        while(! mDistanceQueue.empty())
+        mRenderState->mTexturesEnabled = false;
+        mDistanceQueue.push(mBvh->GetRoot());
+
+
+        int traversed = 0;
+        while (!mDistanceQueue.empty())
         {
-                HierarchyNode *node = mDistanceQueue.top();
+                BvhNode *node = mDistanceQueue.top();
                 mDistanceQueue.pop();
-                mNumTraversedNodes ++;
+        
                 // interesting for the visualization, so rest and set
                 node->SetVisible(false);
+                //mNumTraversedNodes ++;
 
-                bool intersects;
-                
-                if(InsideViewFrustum(node, intersects))
+                if (mBvh->IsWithinViewFrustum(node))
                 {
-                        // update node's visited flag
-                        node->SetLastVisited(mFrameID);
-
-                        // for near plane intersecting abbs possible 
-                        // wrong results => skip occlusion query
-                        if(intersects)
+                        // if intersects near plane assume visible and don't issue test
+                        if (mBvh->CalcDistance(node) < 0.1f)
                         {
-                                node->SetVisible(true);
                                 TraverseNode(node);
                         }
                         else
                         {
-                                IssueOcclusionQuery(node, false);
-                                
-                                // wait if result not available
-                                int visiblePixels = GetOcclusionQueryResult(node);
-                                
-                                // node visible
-                                if(visiblePixels > mVisibilityThreshold)
+                                OcclusionQuery *query = IssueOcclusionQuery(node, false);
+
+                                int visiblePixels = query->GetQueryResult();
+
+                                if (visiblePixels > 0)
                                 {
-                                        node->SetVisible(true);
+                                        cout<< "visible: " << visiblePixels << endl;
+                                        // update node's visited flag => needed for rendering
+                                        // so set it also here
+                                        //node->SetLastVisited(mFrameID);
+                                        //node->SetVisible(true);
+                                        ++ traversed;
                                         TraverseNode(node);
                                 }
-                                else
-                                {
-                                        mNumQueryCulledNodes ++;
-                                }
-                        }                                       
+                        }
                 }
                 else
                 {
-                        mNumFrustumCulledNodes ++;
+                        //mNumFrustumCulledNodes ++;
                 }
+                //cout << "intersect: " << intersect << " bx " << node->GetBox() << endl;
         }
-#endif
+
+        mQueryHandler.ResetQueries();
+        //std::cout << "traversed: " << traversed << std::endl;
 }
 

GTP/trunk/App/Demos/Vis/CHC_revisited/StopAndWaitTraverser.h

@@ -18 +18 @@
         /** Renders the scene with the specified method
         */
-        virtual void Render() = 0;
+        virtual void Render();
 };
 

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

@@ -15 +15 @@
 #include "BvhLoader.h"
 #include "FrustumCullingTraverser.h"
+#include "StopAndWaitTraverser.h"
 
 
@@ -128 +129 @@
         //const string filename("house_test.dem");
         //const string filename("city_demo.dem");
-        //const string filename("city.dem");
-        const string filename("roofs.dem");
+        const string filename("city.dem");
+        //const string filename("roofs.dem");
 
         if (loader.Load(filename, sceneEntities))
@@ -137 +138 @@
 
         BvhLoader bvhLoader;
-        bvh = bvhLoader.Load("roofs.bvh", sceneEntities);
-        
-
-        //bvh = bvhLoader.Load("city.bvh", sceneEntities);
+        //bvh = bvhLoader.Load("roofs.bvh", sceneEntities);
+        bvh = bvhLoader.Load("city.bvh", sceneEntities);
+        //bvh = bvhLoader.Load("city_demo.bvh", sceneEntities);
         //bvh = bvhLoader.Load("house_test.bvh", sceneEntities);
 
         sceneBox = bvh->GetBox();
 
-        traverser = new FrustumCullingTraverser();
+        //traverser = new FrustumCullingTraverser();
+        traverser = new StopAndWaitTraverser();
         traverser->SetHierarchy(bvh);
         traverser->SetRenderState(&state);

GTP/trunk/App/Demos/Vis/CHC_revisited/common.h

@@ -469 +469 @@
 typedef std::vector<BvhLeaf *> BvhLeafContainer;
 typedef std::vector<Triangle3> TriangleContainer;
+typedef std::vector<OcclusionQuery *> QueryContainer;
 
 typedef std::queue<OcclusionQuery *> QueryQueue;