Changeset 2781 for GTP/trunk

Timestamp:

06/19/08 22:57:08 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/CHC_revisited

Files:

• BinaryLoader.cpp (modified) (3 diffs)
• BinaryLoader.h (modified) (1 diff)
• Camera.cpp (modified) (1 diff)
• Geometry.cpp (modified) (2 diffs)
• Geometry.h (modified) (1 diff)
• OcclusionQuery.cpp (modified) (2 diffs)
• OcclusionQuery.h (modified) (3 diffs)
• chcdemo.cpp (modified) (1 diff)

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

@@ -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)
@@ -119 +149 @@
                 str.read(reinterpret_cast<char *>(&mat->mDiffuseColor), sizeof(Vector3));
                 str.read(reinterpret_cast<char *>(&mat->mSpecularColor), sizeof(Vector3));
-                
-                /*RgbColor dum;
-                str.read(reinterpret_cast<char *>(&dum), sizeof(RgbColor));
-                str.read(reinterpret_cast<char *>(&dum), sizeof(RgbColor));
-                str.read(reinterpret_cast<char *>(&dum), sizeof(RgbColor));
-                */
         }
 
@@ -169 +193 @@
                 texcoords = NULL;
 
-        for (int i = 0; i < vertexCount; i += 3)
-        {
-                Triangle3 tri(vertices[i], vertices[i + 1], vertices[i + 2]);
-                Vector3 n = tri.GetNormal();
-
-                normals[i + 0] = n;
-                normals[i + 1] = n;
-                normals[i + 2] = n;
-        }
-
-        return new Geometry(vertices, normals, texcoords, vertexCount);
+        return new Geometry(vertices, normals, texcoords, vertexCount, false);
 }
 

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

@@ -25 +25 @@
 public:
 
+        ~BinaryLoader();
+
         bool Load(const std::string &filename, SceneEntityContainer &geometry);
 

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

@@ -35 +35 @@
         mRight = -Normalize(CrossProd(mDirection, mUp));
 
-
-        float k = tan(mFovy/2);
+        /*float k = tan(mFovy/2);
         mUp *= k;
-        mRight *= k*mWidth/mHeight;
+        mRight *= k*mWidth/mHeight;*/
 }
 

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

@@ -11 +11 @@
                                    Vector3 *normals,
                                    float *texcoords,
-                                   int numVertices):
+                                   int numVertices,
+                                   bool delData):
 mVertices(vertices), 
 mNormals(normals), 
@@ -19 +20 @@
 {
         Prepare();
+
+        if (delData)
+        {
+                delete [] mVertices; mVertices = NULL;
+                delete [] mNormals;  mNormals = NULL;
+                if (!mTexCoords) delete [] mTexCoords; mTexCoords = NULL;
+        }
 }
 
+Geometry::~Geometry()
+{
+        if (!mVertices) delete [] mVertices;    
+        if (!mNormals) delete [] mNormals;
+        if (!mTexCoords) delete [] mTexCoords;
 
+        // delete vbo
+        glDeleteBuffersARB(1, &mVboId);
+}
+
+        
 void Geometry::Prepare()
 {

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

@@ -19 +19 @@
         /** Constructor taking an array of triangles.
         */
-        Geometry(Vector3 *vertices, Vector3 *normals, float *texcoords, int numVertices);
+        Geometry(Vector3 *vertices, Vector3 *normals, float *texcoords, int numVertices, bool delData);
+        ~Geometry();
         /** Render the geometry
         */

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

@@ -64 +64 @@
 
 QueryHandler::QueryHandler(): mCurrentQueryIdx(0) 
-{}
+{
+        Allocate(1000);
+}
 
 
@@ -102 +104 @@
 
 
+void QueryHandler::Allocate(int n)
+{
+        unsigned int *ids = new unsigned int[n]; 
+        glGenQueriesARB(n, ids);
+
+        for (int i = 0; i < n; ++ i) 
+        {
+                OcclusionQuery *q = new OcclusionQuery(ids[i]);
+                mOcclusionQueries.push_back(q);
+        }
+
+        mCurrentQueryIdx = n;
+        delete [] ids;
+}
+
 
 } // namespace

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

@@ -16 +16 @@
 class OcclusionQuery
 {
+        friend class QueryHandler;
+
 public:
         /** constructor requesting an opengl occlusion query.
@@ -46 +48 @@
         */
         inline int GetSize() const { return (int)mNodes.size();}
+        
 
 protected:
 
-        
+        OcclusionQuery(unsigned int id): mQueryId(id) { }
+
         ///////
         //-- members
@@ -77 +81 @@
 
 protected:
+        
+        /** allocates n queries in advance
+        */
+        void Allocate(int n);
+
+
+        ////////////////
 
         int mCurrentQueryIdx;

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

@@ -117 +117 @@
 int main(int argc, char* argv[])
 {
+        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);
         camera->SetNear(nearDist);