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

Timestamp:

09/19/08 17:40:48 (16 years ago)

Author:

mattausch

Message:

preetham not working for deferred

File:

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

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

@@ -171 +171 @@
 
 
-
 /// the used render type for this render pass
 enum RenderMethod
@@ -274 +273 @@
 static CGparameter sMaxDepthParamTex;
 static Matrix4x4 oldViewProjMatrix;
+static CGprogram sCgMrtFragmentSkyDomeProgram = NULL;
 
 
@@ -547 +547 @@
                 cerr << "fragment tex program failed to load" << endl;
 
-        RenderState::sCgMrtFragmentProgram = 
+        sCgMrtFragmentSkyDomeProgram = 
                 cgCreateProgramFromFile(sCgContext, 
                                                                 CG_SOURCE,
-                                                                "src/shaders/mrt.cg", 
+                                                                "src/shaders/sky_preetham.cg", 
                                                                 RenderState::sCgFragmentProfile,
-                                                                "frag",
+                                                                "frag_skydome",
                                                                 NULL);
 
-        if (RenderState::sCgMrtFragmentProgram != NULL)
-        {
-                cgGLLoadProgram(RenderState::sCgMrtFragmentProgram);
-
-                sMaxDepthParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "maxDepth");
+        if (sCgMrtFragmentSkyDomeProgram != NULL)
+        {
+                cgGLLoadProgram(sCgMrtFragmentSkyDomeProgram);
+
+                /*sMaxDepthParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "maxDepth");
                 Material::sDiffuseParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "diffuse");
                 Material::sAmbientParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "ambient");
 
                 cgGLSetParameter1f(sMaxDepthParam, MAX_DEPTH_CONST / farDist);
+                */
         }
         else
-                cerr << "fragment program failed to load" << endl;
+                cerr << "fragment skyprogram failed to load" << endl;
 
         PrintGLerror("init");
@@ -617 +618 @@
 void InitGLstate() 
 {
-        glClearColor(0.2f, 0.2f, 0.8f, 1.0f);
+        glClearColor(0.3f, 0.3f, 0.4f, 1.0f);
         
         glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
@@ -675 +676 @@
         //////////////////////////////
 
-        GLfloat lmodel_ambient[] = {0.5f, 0.5f, 0.5f, 1.0f};
+        //GLfloat lmodel_ambient[] = {0.5f, 0.5f, 0.5f, 1.0f};
+        GLfloat lmodel_ambient[] = {1.0f, 1.0f, 1.0f, 1.0f};
 
         glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lmodel_ambient);
@@ -1958 +1960 @@
 void RenderSky()
 {
+        glEnable(GL_LIGHTING);
+        cgGLEnableProfile(RenderState::sCgVertexProfile);
+
+        if (state.GetRenderPassType() == RenderState::DEFERRED)
+        {
+                cgGLEnableProfile(RenderState::sCgFragmentProfile);
+                cgGLBindProgram(sCgMrtFragmentSkyDomeProgram);
+        }
+
         SceneEntityContainer::const_iterator sit, sit_end = skyGeometry.end();
 
@@ -1968 +1979 @@
         preetham->Compute(-light->GetDirection(), camera, &state);
         glEnable(GL_CULL_FACE);
+
         cgGLDisableProfile(RenderState::sCgVertexProfile);
+        cgGLDisableProfile(RenderState::sCgFragmentProfile);
 }