Changeset 2800 for GTP/trunk

Timestamp:

06/27/08 01:43:45 (17 years ago)

Author:

mattausch

Message:

friendly culling debug version with timers, no materials

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.sln (moved) (moved from GTP/trunk/App/Demos/Vis/FriendlyCulling/chc_revisited.sln) (1 diff)
• FriendlyCulling.vcproj (moved) (moved from GTP/trunk/App/Demos/Vis/FriendlyCulling/chc_revisited.vcproj)
• FriendlyCulling03.sln (added)
• FriendlyCulling03.vcproj (added)
• chc_revisited.vcproj.UNKNOWN.matt.user (deleted)
• src/Bvh.cpp (modified) (3 diffs)
• src/Bvh.h (modified) (10 diffs)
• src/BvhLoader.cpp (modified) (1 diff)
• src/CHCPlusPlusTraverser.cpp (modified) (11 diffs)
• src/CHCPlusPlusTraverser.h (modified) (3 diffs)
• src/CHCTraverser.h (modified) (1 diff)
• src/FrustumCullingTraverser.h (modified) (1 diff)
• src/HierarchyNode.cpp (deleted)
• src/HierarchyNode.h (deleted)
• src/OcclusionQuery.cpp (modified) (2 diffs)
• src/RenderQueue.cpp (modified) (3 diffs)
• src/RenderState.cpp (modified) (4 diffs)
• src/RenderState.h (modified) (1 diff)
• src/RenderTraverser.cpp (modified) (6 diffs)
• src/RenderTraverser.h (modified) (5 diffs)
• src/ResourceManager.cpp (modified) (2 diffs)
• src/SceneQuery.cpp (modified) (6 diffs)
• src/SceneQuery.h (modified) (3 diffs)
• src/StopAndWaitTraverser.cpp (modified) (1 diff)
• src/StopAndWaitTraverser.h (modified) (1 diff)
• src/Texture.cpp (modified) (1 diff)
• src/Timers.cpp (deleted)
• src/chcdemo.cpp (modified) (19 diffs)
• src/common.h (modified) (2 diffs)
• src/gzstream.cpp (added)
• src/gzstream.h (added)

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.sln

@@ -2 +2 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chc_revisited", "chc_revisited.vcproj", "{03661866-4093-4B02-B26A-028EA91AF023}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chc_revisited", "FriendlyCulling.vcproj", "{03661866-4093-4B02-B26A-028EA91AF023}"
 EndProject
 Global

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

@@ -109 +109 @@
         mIsFrustumCulled = false;
         mIsNew = true;
+        mLastQueriedFrame = -1;
 }
 
@@ -609 +610 @@
                                         GL_STATIC_DRAW_ARB);
 
-        //glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+        glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
 
         // data handled by graphics driver from now on
@@ -904 +905 @@
                 }
         }
+
+        ResetNodeClassifications();
 }
 

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

@@ -52 +52 @@
                 /// if the node is newly processed with no prior history available
                 bool mIsNew;
+                /// the frame this node was last queried
+                int mLastQueriedFrame;
         };
 
@@ -113 +115 @@
         inline void SetTurnedVisibleFrame(int turnedVisibleFrame);
 
-        inline int GetLastTestedFrame();
-        inline void SetLastTestedFrame(int lastTested);
+        inline int GetLastQueriedFrame() const;
+        inline void SetLastQueriedFrame(int lastTested);
         
         inline bool IsViewFrustumCulled() const;
@@ -155 +157 @@
         /////////////
         
-        /// some flags
-        //int mFlags;
         /// the depth of this node
         unsigned char mDepth;
@@ -217 +217 @@
 
 
+
 /////////////////
 //-- public inline functions
 
+
 int BvhNode::GetLastVisitedFrame() const 
 { 
@@ -268 +270 @@
 
 
-void BvhNode::SetViewFrustumCulled(const bool frustumCulled) 
+void BvhNode::SetViewFrustumCulled(bool frustumCulled) 
 { 
         mVisibility.mIsFrustumCulled = frustumCulled; 
@@ -280 +282 @@
 
 
-void BvhNode::SetIsNew(const bool isNew) 
+void BvhNode::SetIsNew(bool isNew) 
 { 
         mVisibility.mIsNew = isNew; 
@@ -320 +322 @@
         return mVisibility.mAssumedVisibleFrameId;
 }
+
+
+int BvhNode::GetLastQueriedFrame() const
+{
+        return mVisibility.mLastQueriedFrame;
+}
+
+
+void BvhNode::SetLastQueriedFrame(int lastTested)
+{
+        mVisibility.mLastQueriedFrame = lastTested;
+}
+
 
 
@@ -429 +444 @@
         */
         inline int GetNumLeaves() const { return mNumNodes / 2 + 1;}
+        /** Returns number of 'virtual' nodes in the hierarchy, i.e.
+                the number of nodes actually used for traversal.
+        */
+        int GetNumVirtualNodes() const  { return mNumVirtualNodes; }
+        /** Returns number of bvh leaves.
+        */
+        inline int GetNumVirtualLeaves() const { return mNumVirtualNodes / 2 + 1;}
         /** Returns root node of the bvh.
         */
@@ -512 +534 @@
         */
         void SetVirtualLeaves(int numTriangles);
-
+        
 
         ////////
@@ -526 +548 @@
         void SetAreaRatioThresholdForTestingChildren(float ratio);
 
+
+        ////////////////////////////
+
         /** Returns stats.
         */
         const BvhStats &GetBvhStats() const { return mBvhStats; }
-        /** Returns number of 'virtual' nodes in the hierarchy, i.e.
-                the number of nodes actually used for traversal.
-        */
-        int GetNumVirtualNodes() const  { return mNumVirtualNodes; }
         /** Render wireframe bvh for visualization purpose.
         */

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

@@ -103 +103 @@
         bvh->PostProcess();
         
-        const int trianglesPerVirtualLeaves = 1000;
         // set virtual leaves for specified number of triangles
-        bvh->SetVirtualLeaves(trianglesPerVirtualLeaves);
+        bvh->SetVirtualLeaves(INITIAL_TRIANGLES_PER_VIRTUAL_LEAVES);
 
         bvh->UpdateNumLeaves(bvh->mRoot);

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

@@ -15 +15 @@
 void CHCPlusPlusTraverser::HandleQueryResult(OcclusionQuery *query)
 {
+        waitTimer.Entry();
+
         // wait until result available
         const int visible = query->GetQueryResult() > mVisibilityThreshold;
 
+        waitTimer.Exit();
+
         // multiquery
         if (query->GetSize() > 1)
@@ -27 +31 @@
                         {
                                 BvhNode *node = query->GetNodes()[i];
+#if 1
+                                mIQueue.push_back(node);
+                                node->SetLastQueriedFrame(mFrameId);
+#else
                                 OcclusionQuery *q = IssueOcclusionQuery(node);
                                 mQueryQueue.push(q);
+#endif
                         }
                 }
@@ -38 +47 @@
                                 node->IncTimesTestedInvisible();
                                 node->SetVisible(false);
+                                node->SetLastQueriedFrame(mFrameId);
                         }
 
@@ -46 +56 @@
         {
                 BvhNode *node = query->GetFrontNode();
+
+                node->SetLastQueriedFrame(mFrameId);
 
                 // failed query: query individual nodes
@@ -100 +112 @@
                         mQueryQueue.pop();
 
+                        // waiting for query result
                         HandleQueryResult(query);
                 }       
@@ -186 +199 @@
         if (mUseRenderQueue) ApplyRenderQueue();
 
+        restTimer.Entry();
 
         //////////////
@@ -206 +220 @@
                 HandleQueryResult(query);
         }
-}
-
+
+        restTimer.Exit();
+}
 
 
 void CHCPlusPlusTraverser::QueryPreviouslyInvisibleNodes(BvhNode *node)
 {
-        mIQueue.push(node);
+        mIQueue.push_back(node);
 
         if (mIQueue.size() > mMaxBatchSize)
@@ -221 +236 @@
 
 
-OcclusionQuery * CHCPlusPlusTraverser::GetNextMultiQuery(BvhNodeQueue &iqueue)
+OcclusionQuery * CHCPlusPlusTraverser::GetNextMultiQuery(BvhNodeContainer &iqueue)
 {
         OcclusionQuery *query = mQueryHandler.RequestQuery();
@@ -233 +248 @@
         while (!iqueue.empty())
         {
-                BvhNode *node = iqueue.front();
+                BvhNode *node = iqueue.back();
+
+                // node was already part of a mulitquery => avoid recursion
+                if (node->GetLastQueriedFrame() == mFrameId)
+                        newPBatch = 0;
+                else
                 newPBatch *= mVisibilityPredictor.GetProbability(node);
 
                 if (query->GetNodes().empty())
                 {
-                        // single node will anever cause a wasted query
+                        // single node will never cause a wasted query
                         newBatchVal = 1.0f;
                 }
@@ -250 +270 @@
                         break;
 
-                iqueue.pop();
+                iqueue.pop_back();
                 query->AddNode(node);
 
@@ -263 +283 @@
 
 
+static inline bool lt(BvhNode *a, BvhNode *b)
+{
+        return a->GetTimesTestedInvisible() < b->GetTimesTestedInvisible();
+}
+
+
 void CHCPlusPlusTraverser::IssueMultiQueries()
 {
-        while (!mIQueue.empty())
-        {
-                OcclusionQuery *query;
-
-                if (mUseMultiQueries)
-                {
-                        query = GetNextMultiQuery(mIQueue);
+        if (mUseMultiQueries)
+        {
+                // sort queries by #times invisible
+                sort(mIQueue.begin(), mIQueue.end(), lt);
+
+                while (!mIQueue.empty())
+                        mQueryQueue.push(GetNextMultiQuery(mIQueue));
                 }
                 else
                 {
-                        BvhNode *node = mIQueue.front();
-                        mIQueue.pop();
-                        query = IssueOcclusionQuery(node);
-                }
-
-                mQueryQueue.push(query);
-        }
-}
-
-
-}
+                BvhNodeContainer::const_iterator it, it_end = mIQueue.end();
+
+                for (it = mIQueue.begin(); it != it_end; ++ it)
+                        mQueryQueue.push(IssueOcclusionQuery(*it));
+
+                mIQueue.clear();
+        }
+}
+
+
+}

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/CHCPlusPlusTraverser.h

@@ -33 +33 @@
         
         CHCPlusPlusTraverser();
-        //~CHCPlusPlusTraverser();
+
+        virtual int GetType() const { return CHCPLUSPLUS;}
 
 
@@ -45 +46 @@
         /** Computes the next multiquery.
         */
-        OcclusionQuery *GetNextMultiQuery(BvhNodeQueue &iqueue);
+        OcclusionQuery *GetNextMultiQuery(BvhNodeContainer &iqueue);
         /** Issues batched multiqueries.
         */
@@ -59 +60 @@
         QueryQueue mQueryQueue;
 
-        BvhNodeQueue mIQueue;
         BvhNodeQueue mVQueue;
+        BvhNodeContainer mIQueue;
 
         VisibilityPredictor mVisibilityPredictor;

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/CHCTraverser.h

@@ -14 +14 @@
 public:
         CHCTraverser();
-        //~CHCTraverser();
+
+        virtual int GetType() const { return CHC; }
 
         
 protected:
+
         /** Optimized query querying the node geometry instead
                 of the bounding box

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/FrustumCullingTraverser.h

@@ -16 +16 @@
         FrustumCullingTraverser();
 
+        virtual int GetType() const { return CULL_FRUSTUM; }
+
 protected:
         /** Traverses and renders the scene with the specified method

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

@@ -65 +65 @@
 QueryHandler::QueryHandler(): mCurrentQueryIdx(0) 
 {
-        Allocate(1000);
+        Allocate(500);
 }
 
@@ -99 +99 @@
 {
         CLEAR_CONTAINER(mOcclusionQueries);
+        
         mCurrentQueryIdx = 0;
         mOcclusionQueries.clear();

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

@@ -21 +21 @@
         int tsize2 = t2 ? t2->GetByteSize() : 0;
 
-        return tsize1 < tsize2;
+        return tsize1 > tsize2;
 }
 
@@ -88 +88 @@
         Debug << "\nrq size: " << GetSize() << endl;
         Debug << "texture size: " << endl;
+
         // show ordering by texture size
         for (sit = mEntities.begin(); sit != sit_end; ++ sit)
@@ -93 +94 @@
                 SceneEntity *ent = *sit;
                 Texture *t = ent->GetMaterial()->GetTexture();
+        
                 int tsize = t ? t->GetByteSize() : 0;
                 Debug << tsize << " ";

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

@@ -9 +9 @@
 
 
-/** Constructor setting render as default state.
-*/
 RenderState::RenderState():
 mAlphaTestEnabled(false), 
@@ -22 +20 @@
 bool RenderState::SetState(Mode mode)
 {
+        ///////////
         //-- just change the modewhen necessary
+
         if (mode == mMode) return false;
 
         mMode = mode;
-        //++ state_changes;
 
         if (mode == QUERY)
@@ -62 +61 @@
         {
                 mTexturesEnabled = true;
-                glEnable(GL_TEXTURE_2D);
-                glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+                //glEnable(GL_TEXTURE_2D);
+                //glEnableClientState(GL_TEXTURE_COORD_ARRAY);
         }
 
@@ -74 +73 @@
         {
                 mAlphaTestEnabled = true;
-                glEnable(GL_ALPHA_TEST);
-                glAlphaFunc(GL_GEQUAL, 0.5f);
+                //glEnable(GL_ALPHA_TEST);
+                //glAlphaFunc(GL_GEQUAL, 0.5f);
         }
 }

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderState.h

@@ -48 +48 @@
         inline int GetCurrentVboId() { return mCurrentVboId; }
 
+
 protected:
 

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

@@ -27 +27 @@
         mNumIssuedQueries = 0;
         mNumStateChanges = 0;
+        mNumBatches = 0;
 
         mRenderTime = 0;
+        mWaitTime = 0;
+        mQueryTime = 0;
+        mRestTime = 0;
 }
 
@@ -132 +136 @@
         PerfTimer timer;
         
+        glFinish();
+
         timer.Start();
 
@@ -154 +160 @@
         // render the contents of the render queue
         if (mUseRenderQueue) ApplyRenderQueue();
+        
+        // reset the render state
         mRenderState->Reset();
 
@@ -159 +167 @@
         glDisableClientState(GL_NORMAL_ARRAY);
 
+        glFinish();
+
+
         mStats.mRenderTime = timer.Elapsedms();
         
+        //Debug << "type: " << GetType() << endl;
         //if (mUseRenderQueue) Debug << "rq sort: " << 1e3f * mRenderQueue.sortTimer.TotalTime() << " ms" << endl;
+        /*
+        Debug << "wait time: " << 1e3f * waitTimer.TotalTime() << " ms" << endl;
+        Debug << "query time: " << 1e3f * queryTimer.TotalTime() << " ms" << endl;
+        Debug << "rest time: " << 1e3f * restTimer.TotalTime() << " ms" << endl;
+        */
 }
 
@@ -219 +236 @@
 OcclusionQuery *RenderTraverser::IssueOcclusionQuery(BvhNode *node)
 {
+        queryTimer.Entry();
+
         OcclusionQuery *query = mQueryHandler.RequestQuery();
         query->AddNode(node);
 
         IssueOcclusionQuery(*query);
+
+        queryTimer.Exit();
 
         return query;
@@ -254 +275 @@
                 ++ mStats.mNumStateChanges;
                  
+        if (mRenderQueue.GetSize() > 0)
+                ++ mStats.mNumBatches;
+
         mRenderQueue.Apply();
 }

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderTraverser.h

@@ -7 +7 @@
 #include "Camera.h"
 #include "RenderQueue.h"
+#include "Timer/PerfTimer.h"
 
 
@@ -37 +38 @@
         int mNumIssuedQueries;
         int mNumStateChanges;
+        int mNumBatches;
         
         double mRenderTime;
+
+        double mWaitTime;
+        double mQueryTime;
+        double mRestTime;
 };
-
 
 
@@ -49 +54 @@
 public:
         
-        enum {CULL_FRUSTUM, STOP_AND_WAIT, CHC, CHCPLUSPLUS, NUM_RENDERMODES};
+        enum {CULL_FRUSTUM, STOP_AND_WAIT, CHC, CHCPLUSPLUS, NUM_TRAVERSAL_TYPES};
 
         RenderTraverser();
@@ -118 +123 @@
         void SetShowBounds(bool showBounds);
 
+        virtual int GetType() const = 0;
         
 protected:
@@ -187 +193 @@
 
         bool mShowBounds;
+
+        // timers
+        PerfTimer restTimer;
+        PerfTimer waitTimer;
+        PerfTimer queryTimer;
 };
 

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

@@ -81 +81 @@
         }
 
-        cout << "loaded " << mTextureTable.size() << " textures" << endl;
+        cout << "loaded " << (int)mTextureTable.size() << " textures" << endl;
 }
 
@@ -102 +102 @@
         }
 
-        cout << "loaded " << mGeometryTable.size() << " shapes" << endl;
+        cout << "loaded " << (int)mGeometryTable.size() << " shapes" << endl;
 }
 

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

@@ -5 +5 @@
 #include "SceneQuery.h"
 #include "RenderTraverser.h"
+#include <IL/il.h>
+#include <assert.h>
 
 
-void startil();
-void stopil();
+void startil()
+{
+        ilInit();
+        assert(ilGetError() == IL_NO_ERROR);
+}
+
+
+void stopil()
+{
+        ilShutDown();
+        assert(ilGetError() == IL_NO_ERROR);
+}
 
 
@@ -17 +29 @@
 
 
-const static int viewport[4] = {0, 0, 512, 512};
-//const static int viewport[4] = {0, 0, 1024, 768};
+//const static int viewport[4] = {0, 0, 512, 512};
+const static int viewport[4] = {0, 0, 1024, 768};
+//const static int viewport[4] = {0, 0, 2048, 2048};
 
 
@@ -34 +47 @@
         int py = (pt.y - mSceneBox.Min(1)) * (viewport[3] - 1) / mSceneBox.Size(1);
 
-        const float d = mDepth[px + py * viewport[1]];
+        unsigned char d = mDepth[px + py * viewport[2]];
 
-        if (d > 0.0f)
+        const float offs = mSceneBox.Size(2) * 1e-1f;
+
+        static float depth = (float)d;
+
+        if (d > 0)
         {
-                pt.z =  mSceneBox.Max().z - mSceneBox.Size().z * d;
-                cout << "new depth " << pt.z << " (" << d << ")" << endl;
+                const float x = 0.1f;
+                depth = depth * x + d * (1.0f - x);
+                pt.z =  mSceneBox.Max().z - mSceneBox.Size().z * depth / 255.0f + offs;
+                //cout << "new depth " << pt.z << " (" << d << ")" << endl;
 
                 return true;
         }
+        //cout << "invalid depth: " << d << endl;
 
         return false;
@@ -65 +85 @@
 
         //glPixelStorei(GL_PACK_ROW_LENGTH, viewport[2]);
+        glPixelStorei(GL_PACK_ALIGNMENT, 1);
+        glReadBuffer(GL_BACK);
 
         // hack: should create offscreen buffer for this
@@ -80 +102 @@
         glClear(GL_DEPTH_BUFFER_BIT);
 
-        mDepth = new float[viewport[2] * viewport[3]];
+        mDepth = new unsigned char[viewport[2] * viewport[3]];
+        //mDepth = new float[viewport[2] * viewport[3]];
 
         //renderer->SetCamera(orthoCam);
@@ -86 +109 @@
         renderer->RenderScene();
 
-        glReadPixels(0, 0, viewport[2], viewport[3], GL_DEPTH_COMPONENT, GL_FLOAT, mDepth);
+        glReadPixels(0, 0, viewport[2], viewport[3], GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, mDepth);
+        //glReadPixels(0, 0, viewport[2], viewport[3], GL_DEPTH_COMPONENT, GL_FLOAT, mDepth);
+/*
+        startil();
 
+        if (!ilTexImage(viewport[2], viewport[3], 1, 1, IL_LUMINANCE, IL_UNSIGNED_BYTE, mDepth))
+        {
+                cerr << "IL error " << ilGetError() << endl;
+                stopil();
+                return;
+        }
+
+        ILstring writename = ILstring("out.tga");
+
+        ilSetInteger(IL_TGA_RLE, 1);
+        if (!ilSaveImage(writename))
+        {
+                cerr << "TGA write error " << ilGetError() << endl;
+        }
+
+        stopil();
+*/
         DEL_PTR(orthoCam);
 }

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SceneQuery.h

@@ -4 +4 @@
 #include "common.h"
 #include "AxisAlignedBox3.h"
+
 
 namespace CHCDemoEngine
@@ -22 +23 @@
         bool CalcIntersection(Vector3 &pt);
 
-
 protected:
 
@@ -32 +32 @@
         AxisAlignedBox3 mSceneBox;
 
-        float *mDepth;
+        unsigned char *mDepth;
 };
 

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

@@ -33 +33 @@
                                 OcclusionQuery *query = IssueOcclusionQuery(node);
 
+                                waitTimer.Entry();
                                 bool visible = query->GetQueryResult() > mVisibilityThreshold;
+                                waitTimer.Exit();
 
                                 if (visible)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/StopAndWaitTraverser.h

@@ -16 +16 @@
         StopAndWaitTraverser();
 
-        //~StopAndWaitTraverser();
+        int GetType() const { return STOP_AND_WAIT; }
+
 
 protected:

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

@@ -2 +2 @@
 #include "glInterface.h"
 #include "common.h"
-
 
 #include <IL/il.h>

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

@@ -57 +57 @@
 int maxBatchSize = 50;
 
-int trianglesPerVirtualLeaf = 1000;
+int trianglesPerVirtualLeaf = INITIAL_TRIANGLES_PER_VIRTUAL_LEAVES;
 
 SceneQuery *sceneQuery = NULL;
@@ -83 +83 @@
 int queryCulledNodes = 0;
 int stateChanges = 0;
+int numBatches = 0;
 
 bool showHelp = false;
@@ -98 +99 @@
 bool useRenderQueue = true;
 bool useMultiQueries = true;
+
+bool flyMode = true;
 
 /// the accumulated z axis rotation
@@ -233 +236 @@
         visualization = new Visualization(bvh, camera, NULL, &state);
 
-        //sceneQuery = new SceneQuery(bvh->GetBox(), traverser);
+        sceneQuery = new SceneQuery(bvh->GetBox(), traverser);
+
 
         glutMainLoop();
@@ -270 +274 @@
         glEnable(GL_CULL_FACE);
         //glDisable(GL_CULL_FACE);
-        
+        glDisable(GL_TEXTURE_2D);
 
         GLfloat ambientColor[] = {0.5, 0.5, 0.5, 1.0};
@@ -292 +296 @@
                 "'F3'           - shows/hides bounds (boxes or tight bounds)",
                 "'F4'           - shows/hides statistics",
-                "'F5',          - shows/hides parameters",
+                "'F5',          - toggles between fly / walkmode",
+                "'F6',          - shows/hides parameters",
                 "'SPACE'        - cycles through occlusion culling algorithms",
                 "",
@@ -390 +395 @@
         glEnable(GL_LIGHTING);
         glEnable(GL_LIGHT0);
-        glEnable(GL_LIGHT1);
+        //glEnable(GL_LIGHT1);
+        glDisable(GL_LIGHT1);
 
         //GLfloat ambient[] = {0.5, 0.5, 0.5, 1.0};
@@ -424 +430 @@
 
         glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lmodel_ambient);
-        glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE);
-        //glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_FALSE);
+        //glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE);
+        glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_FALSE);
         //glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL_EXT, GL_SEPARATE_SPECULAR_COLOR_EXT);
         glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL_EXT, GL_SINGLE_COLOR_EXT);
-
-}
+}
+
 
 void SetupEyeView()
@@ -476 +482 @@
 void Display() 
 {
+        Vector3 oldPos = camera->GetPosition();
+
         PerfTimer frameTimer;
-
         frameTimer.Start();
 
@@ -493 +500 @@
                 KeyVerticalMotion(KeyShift());
 
-        
         Vector3 playerPos = camera->GetPosition();
-        //sceneQuery->CalcIntersection(playerPos);
+        
+        if (!flyMode)
+        {
+        Vector3 playerPos = camera->GetPosition();
+
+                bool validIntersect = sceneQuery->CalcIntersection(playerPos);
+
+                if (validIntersect &&
+                        (( playerPos.z - oldPos.z) < bvh->GetBox().Size(2) * 1e-1f))
+                {
         camera->SetPosition(playerPos);
+                }
+        }
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -532 +549 @@
                 break;
         case 32: //space
-                renderMode = (renderMode + 1) % RenderTraverser::NUM_RENDERMODES;
+                renderMode = (renderMode + 1) % RenderTraverser::NUM_TRAVERSAL_TYPES;
                 ResetTraverser();
                 break;
@@ -563 +580 @@
                 break;
         case '8':
-                {
                         eightKeyPressed = true;
-                        KeyVerticalMotion(-KeyShift());
                         break;
-                }
         case '9':
-                {
                         nineKeyPressed = true;
-                        KeyVerticalMotion(+KeyShift());
                         break;
-                }       
         case 'o':
         case 'O':
@@ -581 +592 @@
         case 'a':
         case 'A':
-                {
                         leftKeyPressed = true;
-                        camera->Pitch(KeyRotationAngle());
-                }
                 break;
         case 'd':
         case 'D':
-        {
                         rightKeyPressed = true;
-                        camera->Pitch(-KeyRotationAngle());
-                }
                 break;
         case 'w':
         case 'W':
-                {
                         upKeyPressed = true;
-                        KeyHorizontalMotion(KeyShift());
-                }
                 break;
         case 'x':
         case 'X':
-                {
                         downKeyPressed = true;
-                        KeyHorizontalMotion(-KeyShift());
-                }
                 break;
         case 'r':
@@ -716 +715 @@
         case GLUT_KEY_F5:
                 showOptions = !showOptions;
+                break;
+        case GLUT_KEY_F6:
+                flyMode = !flyMode;
                 break;
         case GLUT_KEY_LEFT:
@@ -1004 +1006 @@
         if (numbers.size() > 0)
         {
-                sprintf_s(hstr, "%d", numbers.back());
+                sprintf(hstr, "%d", numbers.back());
                 str.append(hstr);
         }
@@ -1010 +1012 @@
         for (int i = (int)numbers.size() - 2; i >= 0; i--)
         {
-                sprintf_s(hstr, ",%03d", numbers[i]);
+                sprintf(hstr, ",%03d", numbers[i]);
                 str.append(hstr);
         }
@@ -1050 +1052 @@
                 issuedQueries = traverser->GetStats().mNumIssuedQueries;
                 stateChanges = traverser->GetStats().mNumStateChanges;
-        }
-
-        sprintf_s(msg2, "assumed visible frames: %4d, max batch size: %4d", 
+                numBatches = traverser->GetStats().mNumBatches;
+        }
+
+        sprintf(msg2, "assumed visible frames: %4d, max batch size: %4d", 
                       assumedVisibleFrames, maxBatchSize);
 
-        sprintf_s(msg3, "render queue: %d, multiqueries: %d, tight bounds: %d", 
+        sprintf(msg3, "render queue: %d, multiqueries: %d, tight bounds: %d", 
                       useRenderQueue, useMultiQueries, useTightBounds);
 
@@ -1064 +1067 @@
         CalcDecimalPoint(str2, bvh->GetBvhStats().mTriangles);
 
-        sprintf_s(msg4, "rendered nodes: %6d (of %6d), rendered triangles: %s (of %s)", 
+        sprintf(msg4, "rendered nodes: %6d (of %6d), rendered triangles: %s (of %s)", 
                           renderedNodes, bvh->GetNumVirtualNodes(), str.c_str(), str2.c_str()); 
 
-        sprintf_s(msg5, "traversed: %5d, frustum culled: %5d, query culled: %5d",
+        sprintf(msg5, "traversed: %5d, frustum culled: %5d, query culled: %5d",
                           traversedNodes, frustumCulledNodes, queryCulledNodes);
 
-        sprintf_s(msg6, "issued queries: %5d, state changes: %5d", issuedQueries, stateChanges);
-
-        sprintf_s(msg8, "triangles per virtual leaf: %5d", trianglesPerVirtualLeaf);
-
-        sprintf_s(msg7, "fps: %6.1f", fps);
+        sprintf(msg6, "issued queries: %5d, state changes: %5d, render batches: %5d", issuedQueries, stateChanges, numBatches);
+
+        sprintf(msg8, "triangles per virtual leaf: %5d", trianglesPerVirtualLeaf);
+
+        sprintf(msg7, "fps: %6.1f", fps);
 
 
@@ -1085 +1088 @@
         else
         {
-                glColor3f(1.0f, 1.0f, 1.0f);
+        //      glColor3f(1.0f, 1.0f, 1.0f);
+                glColor3f(1.0f, 0.0f, 0.0f);
                 Output(850, 30, msg[renderMode]);
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/common.h

@@ -476 +476 @@
 static std::string model_path("data/city/model/");
 
+
 ///////////
 //-- typedefs
@@ -490 +491 @@
 static std::ofstream Debug("debug.log");
 
-}
-
-#endif
-
-
-
-
-
-
-
-
+
+#define INITIAL_TRIANGLES_PER_VIRTUAL_LEAVES 1000
+
+}
+
+#endif
+
+
+
+
+
+
+
+