Changeset 2795 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Timestamp:

06/22/08 05:24:22 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• Bvh.cpp (modified) (8 diffs)
• BvhLoader.cpp (modified) (4 diffs)
• BvhLoader.h (modified) (2 diffs)
• CHCPlusPlusTraverser.cpp (modified) (1 diff)
• CHCTraverser.cpp (modified) (3 diffs)
• FrustumCullingTraverser.cpp (modified) (1 diff)
• Geometry.cpp (modified) (4 diffs)
• Geometry.h (modified) (2 diffs)
• Material.cpp (modified) (3 diffs)
• Material.h (modified) (4 diffs)
• RenderQueue.cpp (modified) (4 diffs)
• RenderQueue.h (modified) (2 diffs)
• RenderTraverser.cpp (modified) (6 diffs)
• RenderTraverser.h (modified) (2 diffs)
• ResourceManager.cpp (moved) (moved from GTP/trunk/App/Demos/Vis/FriendlyCulling/src/BinaryLoader.cpp) (16 diffs)
• ResourceManager.h (moved) (moved from GTP/trunk/App/Demos/Vis/FriendlyCulling/src/BinaryLoader.h) (2 diffs)
• SceneEntity.cpp (modified) (1 diff)
• SceneEntity.h (modified) (1 diff)
• StopAndWaitTraverser.cpp (modified) (3 diffs)
• chcdemo.cpp (modified) (45 diffs)
• common.h (modified) (1 diff)

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

@@ -13 +13 @@
 #include "Geometry.h"
 #include "RenderState.h"
+#include "gzstream.h"
 
 
@@ -66 +67 @@
 static int sClipPlaneAABBVertexIndices[12];
 
+
+#define ALIGN_INDICES
 
 BvhNode::BvhNode(BvhNode *parent): 
@@ -177 +180 @@
         mCurrentIndicesPtr = 0;
         mNumNodes = 0;
-        mMaxDepthForTestingChildren = 4;
-        mAreaRatioThreshold = 1.4f;
+        
+        mMaxDepthForTestingChildren = 3;
+        //mMaxDepthForTestingChildren = 4;
+        mAreaRatioThreshold = 2.0f;
+        //mAreaRatioThreshold = 1.4f;
+
         mVboId = -1;
 }
@@ -452 +459 @@
                 memcpy(mIndices + numNodes * sNumIndicesPerBox, 
                            mTestIndices + node->mIndicesPtr, 
-#if 0 //ALIGN_INDICES
-                           ((numIndices / 32) * 32 + 32) * sizeof(unsigned int));
-#else
                            numIndices * sizeof(unsigned int));
-#endif
+
                 numNodes += node->mNumTestNodes;
         }
@@ -485 +489 @@
 
 
-#define ALIGN_INDICES 1
-
 void Bvh::CreateIndices()
 {
@@ -502 +504 @@
         {
                 int offset = (*lit)->mNumTestNodes * sNumIndicesPerBox;
-#if ALIGN_INDICES
+#ifdef ALIGN_INDICES
                 // align with 32
                 offset = (offset / 32) * 32 + 32; 
@@ -547 +549 @@
 
                 // align with 32
-#if ALIGN_INDICES
+#ifdef ALIGN_INDICES
                 const int offset = (numIndices / 32) * 32 + 32;
 #else
@@ -654 +656 @@
                 BvhNode *node = *lit;
 
-                // recreate list of nodes that will be tested as a proxy ...
+                // recreate list of nodes that will be queried as a proxy
                 if (CreateNodeRenderList(node))
                         ++ success;

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

@@ -5 +5 @@
 
 #include "BvhLoader.h"
-
+#include "gzstream.h"
 
 
@@ -19 +19 @@
 
 
-BvhNode *BvhLoader::LoadNextNode(ifstream &stream, BvhInterior *parent)
+BvhNode *BvhLoader::LoadNextNode(igzstream &stream, BvhInterior *parent)
 {
         int nodeType;
@@ -55 +55 @@
 {
         queue<BvhNode *> tQueue;
-        ifstream stream(filename.c_str(), ifstream::binary);
+        igzstream stream(filename.c_str());
 
         if (!stream.is_open()) return NULL;
@@ -98 +98 @@
 
         bvh->PostProcess();
-        const int n = 1000;
-        // set virtual leaves for n triangles
-        bvh->SetVirtualLeaves(n);
+        
+        const int trianglesPerVirtualLeaves = 1000;
+        // set virtual leaves for specified number of triangles
+        bvh->SetVirtualLeaves(trianglesPerVirtualLeaves);
 
         bvh->UpdateNumLeaves(bvh->mRoot);

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

@@ -5 +5 @@
 
 #include "Bvh.h"
+
+class igzstream;
 
 
@@ -20 +22 @@
 protected:
         
-        BvhNode *LoadNextNode(std::ifstream &stream, BvhInterior *parent);
+        BvhNode *LoadNextNode(igzstream &stream, BvhInterior *parent);
 };
 

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

@@ -184 +184 @@
 
         // render the rest of the objects
-        if (mUseRenderQueue)
-        {
-                if (mRenderState->SetState(RenderState::RENDER))
-                        ++ mStats.mNumStateChanges;
-
-                mRenderQueue.Render();
-                mRenderQueue.Clear();
-        }
+        if (mUseRenderQueue) ApplyRenderQueue();
 
 

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

@@ -12 +12 @@
 OcclusionQuery *CHCTraverser::IssueOcclusionQueryWithGeometry(BvhNode *node)
 {
+        // render out what is left in the qeue
+        if (mUseRenderQueue) ApplyRenderQueue();
+
         OcclusionQuery *query = mQueryHandler.RequestQuery();
         query->AddNode(node);
@@ -20 +23 @@
 
         RenderNode(node);
-
-        if (mUseRenderQueue)
-        {
-                mRenderQueue.Render();
-                mRenderQueue.Clear();
-        }
+        if (mUseRenderQueue) ApplyRenderQueue();
 
         query->EndQuery();
@@ -134 +132 @@
                 }
         }
-
-        /// Empty render queue.
-        if (mUseRenderQueue)
-        {
-                mRenderQueue.Render();
-                mRenderQueue.Clear();
-        }
 }
 

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

@@ -36 +36 @@
                 }
         }
-
-        // render the contents of the render queue
-        if (mUseRenderQueue)
-        {
-                mRenderQueue.Render();
-                mRenderQueue.Clear();
-        }
 }
 

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

@@ -19 +19 @@
 mVboId(-1)
 {
+        mHasTexture = (mTexCoords != NULL);
+
         Prepare();
 
         if (delData)
         {
-                delete [] mVertices; mVertices = NULL;
-                delete [] mNormals;  mNormals = NULL;
-                //if (mTexCoords) delete [] mTexCoords; mTexCoords = NULL;
+                DEL_ARRAY_PTR(mVertices);
+                DEL_ARRAY_PTR(mNormals);
+                DEL_ARRAY_PTR(mTexCoords);
         }
 }
@@ -32 +34 @@
 Geometry::~Geometry()
 {
-        if (mVertices) delete [] mVertices;     
-        if (mNormals) delete [] mNormals;
-        if (mTexCoords) delete [] mTexCoords;
+        DEL_ARRAY_PTR(mVertices);
+        DEL_ARRAY_PTR(mNormals);
+        DEL_ARRAY_PTR(mTexCoords);
 
         // delete vbo
@@ -65 +67 @@
 
         glGenBuffersARB(1, &mVboId);
-        
         glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
 
@@ -93 +94 @@
         {
                 glBindBufferARB(GL_ARRAY_BUFFER_ARB, mVboId);
-                glVertexPointer(3, GL_FLOAT, 0, (char *)NULL);  
+                
+                if (mHasTexture)
+                        glTexCoordPointer(2, GL_FLOAT, 0, (char *)NULL + 2 * mNumVertices * sizeof(Vector3));
+
                 glNormalPointer(GL_FLOAT, 0, (char *)NULL + mNumVertices * sizeof(Vector3));
 
-                if (mTexCoords)
-                        glTexCoordPointer(2, GL_FLOAT, 0, (char *)NULL + 2 * mNumVertices * sizeof(Vector3));
+                glVertexPointer(3, GL_FLOAT, 0, (char *)NULL);  
 
                 state->SetCurrentVboId(mVboId);

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

@@ -28 +28 @@
         int GetNumTriangles() const { return mNumVertices / 3; }
 
-        inline bool HasTexture() const { return mTexCoords != NULL; }
+        inline bool HasTexture() const { return mHasTexture; }
         const AxisAlignedBox3& GetBoundingBox() const;
 
@@ -52 +52 @@
 
         AxisAlignedBox3 mBoundingBox;
+
+        bool mHasTexture;
 };
 

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

@@ -20 +20 @@
         mAlphaTestEnabled = false;
 
-        mAmbientColor = RgbaColor(.2f, .2f, .2f, 1.0f);
+        mAmbientColor = RgbaColor(0.2f, 0.2f, 0.2f, 1.0f);
         mDiffuseColor = RgbaColor(1.0f, 1.0f, 1.0f, 1.0f);
-        //mSpecularColor = RgbaColor(0.0f, 0.0f, 0.0f, 1.0f);
+        //mSpecularColor = RgbaColor(.0f, .0f, .0f, 1.0f);
         mSpecularColor = RgbaColor(0.5f, 0.5f, 0.5f, 1.0f);
+        mEmmisiveColor = RgbaColor(.0f, .0f, .0f, 1.0f);
 }
 
 
-Material::Material(): mId(0)
-{
-        InitMaterial();
-}
-
-
-Material::Material(int id): 
-mId(id)
+Material::Material()
 {
         InitMaterial();
@@ -43 +37 @@
 mDiffuseColor(color),
 mAmbientColor(color),
-mSpecularColor(0, 0, 0, 1), 
-mId(0),
+mSpecularColor(0, 0, 0, 1),
 mTexture(NULL)
 {
-}
-
-
-int Material::GetId() const
-{
-        return mId;
 }
 
@@ -80 +67 @@
         glMaterialfv(GL_FRONT, GL_AMBIENT, (float *)&mAmbientColor.r);
         glMaterialfv(GL_FRONT, GL_DIFFUSE, (float *)&mDiffuseColor.r);
+        glMaterialfv(GL_FRONT, GL_EMISSION, (float *)&mEmmisiveColor.r);
         glMaterialfv(GL_FRONT, GL_SPECULAR, (float *)&mSpecularColor.r);
 }

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

@@ -1 +1 @@
 #ifndef __MATERIAL_H
 #define __MATERIAL_H
+
+#include "common.h"
 
 
@@ -34 +36 @@
 class Material 
 {
+friend class ResourceManager;
+
 public:
 
         Material();
 
-        Material(int id);
-
         Material(const RgbaColor &color);
-        /** Returns unique material id.
-        */
-        int GetId() const;
 
         friend Material RandomMaterial();
@@ -49 +48 @@
         inline Texture *GetTexture() const { return mTexture; }
 
-        void SetTexture(Texture *texture) { mTexture = texture; }
+        inline RgbaColor GetAmbient() const { return mAmbientColor; }
+        inline RgbaColor GetDiffuse() const { return mDiffuseColor; }
+        inline RgbaColor GetSpecular() const { return mSpecularColor; }
+        inline RgbaColor GetEmmisive() const { return mEmmisiveColor; }
+
+        inline void SetTexture(Texture *texture) { mTexture = texture; }
+
+        inline void SetAmbient(const RgbaColor &color) { mAmbientColor = color; }
+        inline void SetDiffuse(const RgbaColor &color) { mDiffuseColor = color; }
+        inline void SetSpecular(const RgbaColor &color) { mSpecularColor = color; }
+        inline void SetEmmisive(const RgbaColor &color) { mEmmisiveColor = color; }
+        
+        inline void SetAlphaTestEnabled(bool alpha) { mAlphaTestEnabled = alpha; }
+        inline bool IsAlphaTestEnabled() const { return mAlphaTestEnabled; } 
         /** Renders this material.
         */
         void Render(RenderState *state);
+        /** Initialize the material with default values
+        */
+        void InitMaterial();
 
+
+protected:
 
         ///////////
@@ -60 +77 @@
         RgbaColor mSpecularColor;
         RgbaColor mAmbientColor;
+        RgbaColor mEmmisiveColor;
 
         bool mAlphaTestEnabled;
-
-protected:
-
-        /** Initialize the material with default values
-        */
-        void InitMaterial();
-
-        ////////////////
-
-        /// unique material id
-        int mId;
         /// the assciated texture
         Texture *mTexture;

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

@@ -4 +4 @@
 #include "Texture.h"
 #include "Material.h"
-
 
 using namespace std;
@@ -22 +21 @@
         int tsize2 = t2 ? t2->GetByteSize() : 0;
 
-        // if texture size equal, group by material
-        if (tsize1 == tsize2)
-                return ent1->GetMaterial() < ent2->GetMaterial();
+        return tsize1 < tsize2;
+}
 
-        return tsize1 < tsize2;
+
+inline static bool IsLower2(SceneEntity *ent1, SceneEntity *ent2)
+{
+        return ent1->GetMaterial() < ent2->GetMaterial();
 }
 
@@ -63 +64 @@
 {
         if (mEntities.size() >= mMinSizeForSorting)
+        {
+                sortTimer.Entry();
                 Sort();
+                sortTimer.Exit();
+        }
         
         SceneEntityContainer::const_iterator sit, sit_end = mEntities.end();
@@ -72 +77 @@
                 ent->Render(mState);
         }
+
+        //Print();
 }
+
+
+void RenderQueue::Print()
+{
+        SceneEntityContainer::const_iterator sit, sit_end = mEntities.end();
+
+        Debug << "\nrq size: " << GetSize() << endl;
+        Debug << "texture size: " << endl;
+        // show ordering by texture size
+        for (sit = mEntities.begin(); sit != sit_end; ++ sit)
+        {
+                SceneEntity *ent = *sit;
+                Texture *t = ent->GetMaterial()->GetTexture();
+                int tsize = t ? t->GetByteSize() : 0;
+                Debug << tsize << " ";
+        }
+
+        // show ordering by material
+        Debug << "\nmaterial ptr: " << endl;
         
+        for (sit = mEntities.begin(); sit != sit_end; ++ sit)
+        {
+                Debug << (*sit)->GetMaterial() << " ";
+        }
+}
+
+
+void RenderQueue::Apply()
+{
+        Render();
+        Clear();
+}
+
 
 void RenderQueue::Sort()
 {
-        sort(mEntities.begin(), mEntities.end(), IsLower);
+        // sort by material
+        sort(mEntities.begin(), mEntities.end(), IsLower2);
+        // sort by texture size
+        stable_sort(mEntities.begin(), mEntities.end(), IsLower);
 }
 

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

@@ -3 +3 @@
 
 #include "common.h"
+#include "Timer/PerfTimer.h"
+
 
 namespace CHCDemoEngine 
@@ -38 +40 @@
         */
         int GetSize() const { return (int)mEntities.size(); }
+        /** Renders and clears the queue.
+        */
+        void Apply();
+        /** Prints the ordering in the render queue.
+        */
+        void Print();
+
+        PerfTimer sortTimer;
+
 
 protected:

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

@@ -130 +130 @@
 void RenderTraverser::RenderScene()
 {
-        //glFinish();
         PerfTimer timer;
+        
         timer.Start();
 
@@ -152 +152 @@
         Traverse();
 
+        // render the contents of the render queue
+        if (mUseRenderQueue) ApplyRenderQueue();
         mRenderState->Reset();
 
@@ -157 +159 @@
         glDisableClientState(GL_NORMAL_ARRAY);
 
-        //glFinish();
         mStats.mRenderTime = timer.Elapsedms();
+        
+        //if (mUseRenderQueue) Debug << "rq sort: " << 1e3f * mRenderQueue.sortTimer.TotalTime() << " ms" << endl;
 }
 
@@ -178 +181 @@
 {
         mUseOptimization = useOptimization;
-        //cout << "using optimization: " << mUseOptimization << endl;
+        cout << "using optimization: " << mUseOptimization << endl;
 }
 
@@ -229 +232 @@
         ++ mStats.mNumIssuedQueries;
 
+        // render pending objects before changing to query mode
         if (mUseRenderQueue && (mRenderState->GetMode() == RenderState::RENDER))
-        {
-                //Debug << "render queue: " << mRenderQueue.GetSize() << endl;
-                mRenderQueue.Render();
-                mRenderQueue.Clear();
-        }
+                ApplyRenderQueue();
+        
 
         query.BeginQuery();
@@ -248 +249 @@
 
 
-}
+void RenderTraverser::ApplyRenderQueue()
+{
+        if (mRenderState->SetState(RenderState::RENDER))
+                ++ mStats.mNumStateChanges;
+                 
+        mRenderQueue.Apply();
+}
+
+
+}

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

@@ -118 +118 @@
         void SetShowBounds(bool showBounds);
 
+        
 protected:
 
@@ -142 +143 @@
         */
         void RenderNode(BvhNode *node);
+        /** Renders and clears the contents of the render queue.
+        */
+        void ApplyRenderQueue();
 
 

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

@@ -1 @@
-#include "BinaryLoader.h"
+#include "ResourceManager.h"
 #include "Matrix4x4.h"
 #include "Geometry.h"
@@ -5 +5 @@
 #include "Material.h"
 #include "Texture.h"
-//#include "gzstream.h"
+#include "gzstream.h"
 
 
@@ -15 +15 @@
 
 
-BinaryLoader::~BinaryLoader()
-{
-        /** delete all maps.
-        */
-        std::map<int, Texture *>::iterator it, it_end = mTextureTable.end();
-
-        for (it = mTextureTable.begin(); it != it_end; ++ it)
-        {
-                Texture *tex = (*it).second;
-                delete tex;
-        }
-
-        std::map<int, Material *>::iterator nit, nit_end = mMaterialTable.end();
-
-        for (nit = mMaterialTable.begin(); nit != nit_end; ++ nit)
-        {
-                Material *mat = (*nit).second;
-                delete mat;
-        }
-
-        
-        std::map<int, Geometry *>::iterator git, git_end = mGeometryTable.end();
-
-        for (git = mGeometryTable.begin(); git != git_end; ++git)
-        {
-                Geometry *geom = (*git).second;
-                delete geom;
-        }
-}
-
-//SceneEntity *BinaryLoader::LoadSceneEntity(igzstream &str)
-SceneEntity *BinaryLoader::LoadSceneEntity(ifstream &str)
+ResourceManager::~ResourceManager()
+{
+        // delete all resources.
+        CLEAR_CONTAINER(mSceneEntities);
+        CLEAR_CONTAINER(mGeometry);
+        CLEAR_CONTAINER(mMaterials);
+        CLEAR_CONTAINER(mTextures);
+        CLEAR_CONTAINER(mTrafos);
+}
+
+
+SceneEntity *ResourceManager::LoadSceneEntity(igzstream &str)
 {       
         // shape
@@ -69 +49 @@
                 trafo = new Matrix4x4();
                 str.read(reinterpret_cast<char *>(trafo->x), sizeof(Matrix4x4));
+                mTrafos.push_back(trafo);
         }
 
@@ -77 +58 @@
 
 
-void BinaryLoader::LoadTextures(ifstream &str)
+void ResourceManager::LoadTextures(igzstream &str)
 {
         int numTextures;
@@ -97 +78 @@
 
                 mTextureTable[i] = tex;
+                mTextures.push_back(tex);
         }
 
@@ -103 +85 @@
 
 
-void BinaryLoader::LoadShapes(ifstream &str)
+void ResourceManager::LoadShapes(igzstream &str)
 {
         int numShapes;
@@ -115 +97 @@
                 mGeometryTable[i] = geom;
                 mMaterialTable[i] = mat;
+
+                mGeometry.push_back(geom);
+                mMaterials.push_back(mat);
         }
 
@@ -121 +106 @@
 
 
-//Appearance *BinaryLoader::LoadMaterial(igzstream &str)
-Material *BinaryLoader::LoadMaterial(ifstream &str)
+Material *ResourceManager::LoadMaterial(igzstream &str)
 {
         // default material
@@ -145 +129 @@
                 str.read(reinterpret_cast<char *>(&mat->mAmbientColor), sizeof(Vector3));
                 str.read(reinterpret_cast<char *>(&mat->mDiffuseColor), sizeof(Vector3));
+                str.read(reinterpret_cast<char *>(&mat->mEmmisiveColor), sizeof(Vector3));
                 str.read(reinterpret_cast<char *>(&mat->mSpecularColor), sizeof(Vector3));
         }
@@ -152 +137 @@
 
 
-//Geometry *BinaryLoader::LoadGeometry(igzstream &str)
-Geometry *BinaryLoader::LoadGeometry(ifstream &str)
+Geometry *ResourceManager::LoadGeometry(igzstream &str)
 {
         Vector3 *vertices;
@@ -183 +167 @@
         if (texCoordCount)
         {
-                //cout << "loading texcoords of size " << texCoordCount << endl;
                 texcoords = new float[texCoordCount * 2];
                 str.read(reinterpret_cast<char *>(texcoords), sizeof(float) * vertexCount * 2);
@@ -194 +177 @@
 
 
-void BinaryLoader::LoadSceneEntities(ifstream &str, SceneEntityContainer &entities)
+void ResourceManager::LoadSceneEntities(igzstream &str, SceneEntityContainer &entities)
 {
         int entityCount;
@@ -205 +188 @@
                 SceneEntity *ent = LoadSceneEntity(str);
                 entities[i] = ent;
+                mSceneEntities.push_back(ent);
         }
 
@@ -211 +195 @@
 
 
-bool BinaryLoader::Load(const std::string &filename, SceneEntityContainer &entities)
-{
-        //clear_textures(); // clear the texture table
-
-        //igzstream str(filename.c_str());//, ios::binary);
-        ifstream istr(filename.c_str(), ios::binary);
+bool ResourceManager::Load(const std::string &filename, SceneEntityContainer &entities)
+{
+        igzstream istr(filename.c_str());
         
         if (!istr.is_open())
@@ -236 +217 @@
         cout << "bin loading finished" << endl;
 
+        // clean up
+        mTextureTable.clear();
+        mGeometryTable.clear();
+        mMaterialTable.clear();
+
         return true;
 }

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

@@ -1 @@
-#ifndef __BinaryLoader_H__
-#define __BinaryLoader_H__
+#ifndef __ResourceManager_H__
+#define __ResourceManager_H__
 
-// note use forward declaration instead
+
 #include <string>
 #include <iostream>
@@ -10 +10 @@
 #include "common.h"
 
+class igzstream;
+
 
 namespace CHCDemoEngine
 {
 
-class igzstream;
 class SceneEntity;
 class Material;
 class Geometry;
 class Texture;
+class Matrix4x4;
 
-
-class BinaryLoader
+/** Loads a scene and also handles the cleanup
+*/
+class ResourceManager
 {
 public:
 
-        ~BinaryLoader();
-
+        ~ResourceManager();
+        /** Loads a model
+        */
         bool Load(const std::string &filename, SceneEntityContainer &geometry);
 
 protected:
         
-        void LoadTextures(std::ifstream &str);
-        void LoadShapes(std::ifstream &str);
-        void LoadSceneEntities(std::ifstream &str, SceneEntityContainer &entities);
+        void LoadTextures(igzstream &str);
+        void LoadShapes(igzstream &str);
+        void LoadSceneEntities(igzstream &str, SceneEntityContainer &entities);
 
-        SceneEntity *LoadSceneEntity(std::ifstream &str);
-        Material *LoadMaterial(std::ifstream &str);
-        Geometry *LoadGeometry(std::ifstream &str);
+        SceneEntity *LoadSceneEntity(igzstream &str);
+        Material *LoadMaterial(igzstream &str);
+        Geometry *LoadGeometry(igzstream &str);
 
         std::map<int, Texture *> mTextureTable;
         std::map<int, Material *> mMaterialTable;
         std::map<int, Geometry *> mGeometryTable;
+
+        // these are kept to be able to delete these resources afterwards
+        std::vector<Texture *> mTextures;
+        std::vector<Material *> mMaterials;
+        std::vector<Geometry *> mGeometry;
+        std::vector<SceneEntity *> mSceneEntities;
+        std::vector<Matrix4x4 *> mTrafos;
 };
 

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

@@ -20 +20 @@
 SceneEntity::~SceneEntity()
 {
-        // delete only trafo here, the other members could be shared
-        // among several entities and are therefore handled separately
-        DEL_PTR(mTransform);
 }
 

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

@@ -59 +59 @@
         Geometry *mGeometry;
         Material *mMaterial;
-
-        //AxisAlignedBox3 mBoundingBox;
         
         int mLastRendered;

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

@@ -22 +22 @@
                 mDistanceQueue.pop();
         
-                // interesting for the visualization
-                node->SetVisible(false);
-
-
                 if (mBvh->IsWithinViewFrustum(node))
                 {
@@ -37 +33 @@
                                 OcclusionQuery *query = IssueOcclusionQuery(node);
 
-                                int visiblePixels = query->GetQueryResult();
+                                bool visible = query->GetQueryResult() > mVisibilityThreshold;
 
-                                if (visiblePixels > mVisibilityThreshold)
+                                if (visible)
                                 {
-                                        //cout<< "visible: " << visiblePixels << endl;
-                                        // update node's visited flag => needed for rendering
-                                        // so set it also here
-                                        //node->SetLastVisited(mFrameID);
-                                        //node->SetVisible(true);
-                                
                                         TraverseNode(node);
                                 }
                                 else
                                 {
+                                        node->SetVisible(false);
                                         ++ mStats.mNumQueryCulledNodes;
                                 }
+                                
+                                // update node's visited flag (could be interesting for the visualization)
+                                node->SetVisible(visible);              
                         }
                 }
@@ -60 +54 @@
                 }       
         }
-
-        /// Empty render queue.
-        if (mUseRenderQueue)
-        {
-                mRenderQueue.Render();
-                mRenderQueue.Clear();
-        }
 }
 

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

@@ -9 +9 @@
 #include "Vector3.h"
 #include "Matrix4x4.h"
-#include "BinaryLoader.h"
+#include "ResourceManager.h"
 #include "Bvh.h"
 #include "Camera.h"
@@ -20 +20 @@
 #include "Visualization.h"
 #include "RenderState.h"
-
+#include "Timer/PerfTimer.h"
 
 
@@ -35 +35 @@
 Bvh *bvh = NULL;
 /// handles scene loading
-BinaryLoader *loader = NULL;
+ResourceManager *loader = NULL;
 /// the scene camera
 Camera *camera = NULL;
+/// the scene camera
+Camera *visCamera = NULL;
 /// the visualization
 Visualization *visualization = NULL;
@@ -43 +45 @@
 RenderState state;
 /// the rendering algorithm
-int renderMode = RenderTraverser::CULL_FRUSTUM;
+int renderMode = RenderTraverser::CHCPLUSPLUS;
 // eye near plane distance
 float nearDist = 0.1f; 
@@ -49 +51 @@
 int threshold;
 
+float fov = 50.0f;
+
 int assumedVisibleFrames = 10;
 int maxBatchSize = 50;
 
-const float keyForwardMotion = 0.5f;
-const float keyRotation = 0.05f;
+int trianglesPerVirtualLeaf = 1000;
+
+/// these values get scaled with the frame rate
+const float keyForwardMotion = 50.0f;
+const float keyRotation = 2.0f;
+/// elapsed time in seconds
+double elapsedTime = 1.0f;
 
 int winWidth = 1024;
@@ -84 +93 @@
 bool useOptimization = false;
 bool useTightBounds = true;
-bool useRenderQueue = false;
+bool useRenderQueue = true;
 bool useMultiQueries = true;
 
+/// the accumulated z axis rotation
 float rotation = 0;
 
 Matrix4x4 visView = IdentityMatrix();
+
+SceneEntityContainer skyGeometry;
 
 bool leftKeyPressed = false;
@@ -129 +141 @@
 void KeyHorizontalMotion(float shift);
 void KeyVerticalMotion(float shift);
-void KeyRotate(float angle);
+
+
+inline float KeyRotationAngle() { return keyRotation * elapsedTime; }
+inline float KeyShift() { return keyForwardMotion * elapsedTime; }
 
 
@@ -137 +152 @@
         int returnCode = 0;
 
-#ifdef _CRT_SET
-
-        //Now just call this function at the start of your program and if you're
-        //compiling in debug mode (F5), any leaks will be displayed in the Output
-        //window when the program shuts down. If you're not in debug mode this will
-        //be ignored. Use it as you will!
-        //note: from GDNet Direct [3.8.04 - 3.14.04] void detectMemoryLeaks() {
-
-        _CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF|_CRTDBG_ALLOC_MEM_DF);
-        _CrtSetReportMode(_CRT_ASSERT,_CRTDBG_MODE_FILE);
-        _CrtSetReportFile(_CRT_ASSERT,_CRTDBG_FILE_STDERR); 
-#endif
-
-
-        camera = new Camera(winWidth, winHeight, 60);
+        camera = new Camera(winWidth, winHeight, fov);
         camera->SetNear(nearDist);
+
+        visCamera = new Camera(winWidth, winHeight, fov);
+        visCamera->SetNear(nearDist);
 
         glutInitWindowSize(winWidth, winHeight);
@@ -158 +162 @@
         glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH);
 
-        glutCreateWindow("Coherent Hierarchical Culling");
+        glutCreateWindow("FriendlyCulling");
 
         glutDisplayFunc(Display);
@@ -177 +181 @@
 
 
-        loader = new BinaryLoader();
+        loader = new ResourceManager();
 
         //const string filename("data/city/model/city.dem");
@@ -190 +194 @@
                 exit(0);
         }
+
+        SceneEntityContainer dummy;
+
+        const string envname = string(model_path + "env.dem");
+
+        if (loader->Load(envname, skyGeometry))
+                cout << "sky box " << filename << " loaded" << endl;
+        else
+        {
+                cerr << "loading sky box " << filename << " failed" << endl;
+                CleanUp();
+                exit(0);
+        }
+
 
         const string bvh_filename = string(model_path + "city.bvh");
@@ -206 +224 @@
         ResetTraverser();
 
-        camera->SetDirection(Vector3(0.961829f, 0.273652f, 0.0f));
+        //camera->SetDirection(Vector3(0.961829f, 0.273652f, 0.0f));
+        camera->Pitch(-M_PI * 0.5);
         camera->SetPosition(Vector3(483.398f, 242.364f, 186.078f));
 
@@ -265 +284 @@
                 "",
                 "'F1'           - shows/dismisses this message",
-                "'F2'           - shows/hides statistics",
+                "'F2'           - shows/hides bird eye view",
                 "'F3'           - shows/hides bounds (boxes or tight bounds)",
-                "'F4'           - shows/hides bird eye view",
-                "'f5',          - load helpScreen",
+                "'F4'           - shows/hides statistics",
+                "'F5',          - shows/hides parameters",
                 "'SPACE'        - cycles through occlusion culling algorithms",
                 "",
@@ -281 +300 @@
                 "'-'            - decreases max batch size",
                 "'+'            - increases max batch size",
+                "'4'            - decrease triangles per virtual leaf (sets depth of bvh)",
+                "'5'            - increase triangles per virtual leaf (sets depth of bvh)",
                 "'6'            - decrease assumed visible frames",
                 "'7'            - increase assumed visible frames",
-                "'8'            - upward motion",
-                "'9'            - downward motion",
+                "'8'            - downward motion",
+                "'9'            - upward motion",
                 "",
                 "'R'            - use render queue",
@@ -405 +426 @@
 }
 
-void SetupEyeView(void)
+void SetupEyeView()
 {
         glMatrixMode(GL_PROJECTION);
         glLoadIdentity();
 
-        gluPerspective(60.0f, 1.0f / winAspectRatio, nearDist, 2.0f * Magnitude(bvh->GetBox().Diagonal()));
+        gluPerspective(fov, 1.0f / winAspectRatio, nearDist, 10.0f * Magnitude(bvh->GetBox().Diagonal()));
 
         glMatrixMode(GL_MODELVIEW);
+        glLoadIdentity();
         camera->SetupCameraView();
 
@@ -423 +445 @@
 
 
-void KeyRotate(float angle)
-{
-        Vector3 viewDir = camera->GetDirection();
-        // rotate view vector
-        Matrix4x4 rot = RotationZMatrix(angle);
-        viewDir = rot * viewDir;
-        camera->SetDirection(viewDir);
-}
-
-
 void KeyHorizontalMotion(float shift)
 {
@@ -459 +471 @@
 void Display() 
 {
+        PerfTimer frameTimer;
+
+        frameTimer.Start();
+
         if (leftKeyPressed)
-                KeyRotate(keyRotation);
+                camera->Pitch(KeyRotationAngle());
         if (rightKeyPressed)
-                KeyRotate(-keyRotation);
+                camera->Pitch(-KeyRotationAngle());
         if (upKeyPressed)
-                KeyHorizontalMotion(keyForwardMotion);
+                KeyHorizontalMotion(KeyShift());
         if (downKeyPressed)
-                KeyHorizontalMotion(-keyForwardMotion);
+                KeyHorizontalMotion(-KeyShift());
         if (eightKeyPressed)
-                KeyVerticalMotion(keyForwardMotion);
+                KeyVerticalMotion(-KeyShift());
         if (nineKeyPressed)
-                KeyVerticalMotion(-keyForwardMotion);
+                KeyVerticalMotion(KeyShift());
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -479 +495 @@
         // actually render the scene geometry using one of the specified algorithms
         traverser->RenderScene();
-        
+
+        
+        glEnableClientState(GL_VERTEX_ARRAY);
+        glEnableClientState(GL_NORMAL_ARRAY);
+
+        SceneEntityContainer::const_iterator sit, sit_end = skyGeometry.end();
+
+        for (sit = skyGeometry.begin(); sit != sit_end; ++ sit)
+                (*sit)->Render(&state);
+
+        glDisableClientState(GL_VERTEX_ARRAY);
+        glDisableClientState(GL_NORMAL_ARRAY);
+
+        state.Reset();
+
         if (visMode) DisplayVisualization();
         
@@ -485 +515 @@
 
         glutSwapBuffers();
+
+        elapsedTime = frameTimer.Elapsed();
 }
 
@@ -531 +563 @@
                 {
                         eightKeyPressed = true;
-                        KeyVerticalMotion(keyForwardMotion);
+                        KeyVerticalMotion(-KeyShift());
                         break;
                 }
@@ -537 +569 @@
                 {
                         nineKeyPressed = true;
-                        KeyVerticalMotion(-keyForwardMotion);
+                        KeyVerticalMotion(+KeyShift());
                         break;
                 }       
@@ -549 +581 @@
                 {
                         leftKeyPressed = true;
-                        KeyRotate(keyRotation);
+                        camera->Pitch(KeyRotationAngle());
                 }
                 break;
@@ -556 +588 @@
         {
                         rightKeyPressed = true;
-                        KeyRotate(-keyRotation);
+                        camera->Pitch(-KeyRotationAngle());
                 }
                 break;
@@ -563 +595 @@
                 {
                         upKeyPressed = true;
-                        KeyHorizontalMotion(keyForwardMotion);
+                        KeyHorizontalMotion(KeyShift());
                 }
                 break;
@@ -570 +602 @@
                 {
                         downKeyPressed = true;
-                        KeyHorizontalMotion(-keyForwardMotion);
+                        KeyHorizontalMotion(-KeyShift());
                 }
                 break;
@@ -587 +619 @@
                 }
                 break;
-
-
-
+        case '4':
+                if (trianglesPerVirtualLeaf >= 100)
+                        trianglesPerVirtualLeaf -= 100;
+
+                bvh->SetVirtualLeaves(trianglesPerVirtualLeaf);
+                break;
+        case '5':
+                trianglesPerVirtualLeaf += 100;
+                bvh->SetVirtualLeaves(trianglesPerVirtualLeaf);
+                break;
         default:
                 return;
@@ -658 +697 @@
 void Special(int c, int x, int y) 
 {
-        // used to avoid vertical motion with the keys
-        Vector3 hvec = Vector3(camera->GetDirection()[0], camera->GetDirection()[1], 0.0f);
-        
         switch(c) 
         {
@@ -667 +703 @@
                 break;
         case GLUT_KEY_F2:
-                showStatistics = !showStatistics;
+                visMode = !visMode;
                 break;
         case GLUT_KEY_F3:
@@ -674 +710 @@
                 break;
         case GLUT_KEY_F4:
-                visMode = !visMode;
+                showStatistics = !showStatistics;
                 break;
         case GLUT_KEY_F5:
@@ -682 +718 @@
                 {
                         leftKeyPressed = true;
-                        KeyRotate(keyRotation);
+                        camera->Pitch(KeyRotationAngle());
                 }
                 break;
@@ -688 +724 @@
                 {
                         rightKeyPressed = true;
-                        KeyRotate(-keyRotation);
+                        camera->Pitch(-KeyRotationAngle());
                 }
                 break;
@@ -694 +730 @@
                 {
                         upKeyPressed = true;
-                        KeyHorizontalMotion(keyForwardMotion);
+                        KeyHorizontalMotion(KeyShift());
                 }
                 break;
@@ -700 +736 @@
                 {
                         downKeyPressed = true;
-                        KeyHorizontalMotion(-keyForwardMotion);
+                        KeyHorizontalMotion(-KeyShift());
                 }
                 break;
@@ -728 +764 @@
         glLoadIdentity();
 
-        gluPerspective(60.0f, 1.0f / winAspectRatio, nearDist, 2.0f * Magnitude(bvh->GetBox().Diagonal()));
+        gluPerspective(fov, 1.0f / winAspectRatio, nearDist, 2.0f * Magnitude(bvh->GetBox().Diagonal()));
 
         glMatrixMode(GL_MODELVIEW);
@@ -768 +804 @@
 void LeftMotion(int x, int y) 
 {
-        static float eyeXAngle = 0.0f;
-
         Vector3 viewDir = camera->GetDirection();
         Vector3 pos = camera->GetPosition();
@@ -776 +810 @@
         Vector3 horView(viewDir[0], viewDir[1], 0);
         
-        eyeXAngle = 0.2f *  M_PI * (xEyeBegin - x) / 180.0;
-
-        rotation += eyeXAngle;
-
-        // rotate view vector
-        Matrix4x4 rot = RotationZMatrix(eyeXAngle);
-        viewDir = rot * viewDir;
+        float eyeXAngle = 0.2f *  M_PI * (xEyeBegin - x) / 180.0;
+
+        camera->Pitch(eyeXAngle);
 
         pos += horView * (yMotionBegin - y) * 0.2f;
-
-        camera->SetDirection(viewDir);
+        
         camera->SetPosition(pos);
         
@@ -801 +830 @@
 void RightMotion(int x, int y) 
 {
-        static float eyeYAngle = 0.0f;
-
-        Vector3 viewDir = camera->GetDirection();
-        Vector3 right = camera->GetRightVector();
-
-        eyeYAngle = -0.2f *  M_PI * (yEyeBegin - y) / 180.0;
-
-        // rotate view vector
-        Matrix4x4 rot = RotationAxisMatrix(right, eyeYAngle);
-        viewDir = rot * viewDir;
-
-        camera->SetDirection(viewDir);
-                
+        float eyeYAngle = -0.2f *  M_PI * (yEyeBegin - y) / 180.0;
+
+        camera->Yaw(eyeYAngle);
+
         yEyeBegin = y;
-        
         glutPostRedisplay();
 }
@@ -907 +926 @@
 // displays the visualisation of culling algorithm
 void DisplayVisualization()
-{
+{cout<<"here34"<<endl;
         SetupVisView();
 
@@ -923 +942 @@
         glViewport(winWidth - winWidth / 4, winHeight - winHeight / 3, winWidth, winHeight);
 
-
         glMatrixMode(GL_PROJECTION);
         glLoadIdentity();
         
-        //gluPerspective(60.0f, 1.0f / winAspectRatio, nearDist, 2.0f * Magnitude(bvh->GetBox().Diagonal()));
+        gluPerspective(fov, 1.0f / winAspectRatio, nearDist, 20.0f * Magnitude(bvh->GetBox().Diagonal()));
+        
         AxisAlignedBox3 box = bvh->GetBox();
         const float offs = 2000;
-        glOrtho(box.Min().y - offs, box.Max().y + offs, box.Min().y - offs, box.Max().y + offs, 0.1, 20.0f * Magnitude(bvh->GetBox().Diagonal())); 
-        
-        
-        glPushMatrix();
-
+        
+        //glOrtho(box.Min().y - offs, box.Max().y + offs, box.Min().y - offs, box.Max().y + offs, 0.1, 20.0f * Magnitude(bvh->GetBox().Diagonal())); 
+        //glOrtho(-offs, offs, offs, -offs, 0.1, 20.0f * Magnitude(bvh->GetBox().Diagonal())); 
+        //glPushMatrix();
+
+        Vector3 vizpos = Vector3(box.Center().x, box.Center().y, box.Max().z);
+        visCamera->SetPosition(vizpos);
+        visCamera->Yaw(-0.5 * M_PI);
+        cout<<"pos: " << visCamera->GetPosition()<<endl;
         glMatrixMode(GL_MODELVIEW);
         glLoadIdentity();
 
-        glMultMatrixf((float *)visView.x);
+        visCamera->SetupCameraView();
+        //glMultMatrixf((float *)visView.x);
 
         //SetupLighting();
@@ -947 +971 @@
         glLightfv(GL_LIGHT1, GL_POSITION, position1);
 
-
-
         glClear(GL_DEPTH_BUFFER_BIT);
 
@@ -956 +978 @@
         visualization->Render();
         
-        glPopMatrix();
+        //glPopMatrix();
         
         glViewport(0, 0, winWidth, winHeight);
@@ -991 +1013 @@
 void CleanUp()
 {
-        CLEAR_CONTAINER(sceneEntities);
         DEL_PTR(traverser);
-
         DEL_PTR(bvh);
         DEL_PTR(visualization);
         DEL_PTR(camera);
-
         DEL_PTR(loader);
 }
@@ -1040 +1059 @@
         char msg6[200];
         char msg7[200];
+        char msg8[200];
 
 
@@ -1084 +1104 @@
         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);
 
@@ -1111 +1133 @@
                         Output(20, 150, msg2);
                         Output(20, 180, msg3);
+                        Output(20, 210, msg8);
                 }
         }

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

@@ -145 +145 @@
 
 
+// delete a pointer and set to NULL
+#ifndef DEL_ARRAY_PTR
+#define DEL_ARRAY_PTR(ptr) do {if (ptr) {           \
+                                   delete [] (ptr); \
+                                                           (ptr) = 0;}}     \
+                           while (0)
+#endif
+
+
 // Clears a container (i.e., a vector of pointers) and deletes the pointers
 #ifndef CLEAR_CONTAINER