Changeset 3019 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

Timestamp:

10/09/08 18:36:03 (16 years ago)

Author:

mattausch

Message:

detected memory leaks mainly in shadowmapping!!
strange problems with deferred rendering, seems to be uninitialized sometimes (solved?)

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp (modified) (19 diffs)

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

@@ -1 +1 @@
 // chcdemo.cpp : Defines the entry point for the console application.
 //
-#include "glInterface.h"
+
+#ifdef _CRT_SET
+        #define _CRTDBG_MAP_ALLOC
+        #include <stdlib.h>
+        #include <crtdbg.h>
+#endif
+
+#include "common.h"
+
+#ifdef _CRT_SET
+        // redefine new operator
+        #define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+        #define new DEBUG_NEW
+#endif
+
+
 #include <math.h>
 #include <time.h>
-#include "common.h"
+#include "glInterface.h"
+
+#include <Cg/cg.h>
+#include <Cg/cgGL.h>
+
+
 #include "RenderTraverser.h"
 #include "SceneEntity.h"
@@ -40 +60 @@
 #include "EntityMerger.h"
 
-#include <Cg/cg.h>
-#include <Cg/cgGL.h>
-
-
 using namespace std;
 using namespace CHCDemoEngine;
@@ -59 +75 @@
 /// the renderable scene geometry
 SceneEntityContainer sceneEntities;
-SceneEntityContainer sceneEntities2;
 
 // traverses and renders the hierarchy
@@ -255 +270 @@
 inline float KeyRotationAngle() { return keyRotation * elapsedTime * 1e-3f; }
 inline float KeyShift() { return keyForwardMotion * elapsedTime * 1e-3f; }
-
+// initialise the frame buffer objects
 void InitFBO();
 
@@ -309 +324 @@
 int main(int argc, char* argv[])
 {
+#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
+
+        cout << "=== reading environment file ===" << endl << endl;
+
         int returnCode = 0;
 
@@ -317 +347 @@
         cout << "=== reading environment file ===" << endl << endl;
 
-        string envFileName = "default.env";
+        const string envFileName = "default.env";
         if (!env.Read(envFileName))
         {
@@ -347 +377 @@
                 //env.GetStringParam(string("modelPath"), model_path);
                 //env.GetIntParam(string("numSssaoSamples"), numSsaoSamples);
-
 
                 cout << "assumedVisibleFrames: " << assumedVisibleFrames << endl; 
@@ -395 +424 @@
         SceneEntity::SetUseLODs(useLODs);
 
-
         if (!useFullScreen)
         {
@@ -420 +448 @@
         InitGLstate();
 
-
         glEnable(GL_MULTISAMPLE_ARB);
         glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST);
@@ -432 +459 @@
 
         const string filename = string(model_path + "city.dem");
+        
 
         if (loader->Load(filename, sceneEntities))
@@ -441 +469 @@
                 exit(0);
         }
+        
 
         const string bvh_filename = string(model_path + "city.bvh");
@@ -452 +481 @@
                 exit(0);
         }
-        
 
         // set far plane based on scene extent
@@ -468 +496 @@
         
         Matrix4x4 transl = TranslationMatrix(cubeCenter);
-        
 
         SceneEntityContainer dummy;
@@ -474 +501 @@
         string skyDomeStr(model_path + "sky.dem");
 
-        if (loader->Load(skyDomeStr, dummy))
-                cout << "successfully loaded " << dummy.size() << " scene entities" << endl;
+        if (loader->Load(skyDomeStr, sceneEntities))
+                cout << "successfully loaded " << sceneEntities.size() << " scene entities" << endl;
         else
         {
@@ -484 +511 @@
         }
 
-        skyDome = dummy[0];
+        skyDome = sceneEntities.back();
 
 
@@ -506 +533 @@
         // clean up
         CleanUp();
-
+        
         return 0;
 }
@@ -572 +599 @@
                 cgGLLoadProgram(RenderState::sCgMrtFragmentProgram);
 
-                sEyePosParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "eyePos");
+                sEyePosParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "eyePos");
         }
         else
@@ -613 +640 @@
         glGenTextures(1, &fontTex);
         glBindTexture(GL_TEXTURE_2D, fontTex);
+
         if (!myfont.Create("data/fonts/verdana.glf", fontTex))
                 return false;
@@ -1747 +1775 @@
         DEL_PTR(ssaoShader);
 
+        DEL_PTR(light);
+        DEL_PTR(visCamera);
+
+        DEL_PTR(preetham);
+
         if (sCgMrtVertexProgram)
                 cgDestroyProgram(sCgMrtVertexProgram);