Changeset 3021 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SkyPreetham.cpp

Timestamp:

10/10/08 13:53:22 (16 years ago)

Author:

mattausch

Message:

removed leaks. added class for shaders

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SkyPreetham.cpp (modified) (5 diffs)

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

@@ -7 +7 @@
 #include "RenderState.h"
 
+
+#ifdef _CRT_SET
+        #define _CRTDBG_MAP_ALLOC
+        #include <stdlib.h>
+        #include <crtdbg.h>
+
+        // redefine new operator
+        #define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+        #define new DEBUG_NEW
+#endif
+
+
 using namespace CHCDemoEngine;
 using namespace std;
-
 
 
@@ -26 +37 @@
 static CGparameter sMultiplierParam;
 
+ShaderContainer SkyPreetham::sShaders;
 
 
@@ -40 +52 @@
 
 
-void SkyPreetham::Init(CGcontext context)
+void SkyPreetham::InitCG(CGcontext context)
 {       
+        ShaderProgram *pr;
+
         sCgSkyProgram = 
                 cgCreateProgramFromFile(context, 
@@ -64 +78 @@
 
                 sMultiplierParam = cgGetNamedParameter(sCgSkyProgram, "multiplier");
+
+                pr = new ShaderProgram(sCgSkyProgram);
+                sShaders.push_back(pr);
         }
         else
@@ -80 +97 @@
                 cgGLLoadProgram(sCgMrtFragmentSkyDomeProgram);
                 //cgGLSetParameter1f(sMaxDepthParam, MAX_DEPTH_CONST / farDist);
+
+                pr = new ShaderProgram(sCgMrtFragmentSkyDomeProgram);
+                sShaders.push_back(pr);
         }
         else
                 cerr << "fragment skyprogram failed to load" << endl;
+}
+
+
+void SkyPreetham::ReleaseCG()
+{
+        CLEAR_CONTAINER(sShaders);
 }