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

Timestamp:

09/19/08 23:13:47 (16 years ago)

Author:

mattausch

Message:

preetham working but big hack

File:

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

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

@@ -273 +273 @@
 static CGparameter sMaxDepthParamTex;
 static Matrix4x4 oldViewProjMatrix;
-static CGprogram sCgMrtFragmentSkyDomeProgram = NULL;
 
 
@@ -547 +546 @@
                 cerr << "fragment tex program failed to load" << endl;
 
-        sCgMrtFragmentSkyDomeProgram = 
+        RenderState::sCgMrtFragmentProgram = 
                 cgCreateProgramFromFile(sCgContext, 
                                                                 CG_SOURCE,
-                                                                "src/shaders/sky_preetham.cg", 
+                                                                "src/shaders/mrt.cg", 
                                                                 RenderState::sCgFragmentProfile,
-                                                                "frag_skydome",
+                                                                "frag",
                                                                 NULL);
 
-        if (sCgMrtFragmentSkyDomeProgram != NULL)
-        {
-                cgGLLoadProgram(sCgMrtFragmentSkyDomeProgram);
-
-                /*sMaxDepthParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "maxDepth");
+        if (RenderState::sCgMrtFragmentProgram != NULL)
+        {
+                cgGLLoadProgram(RenderState::sCgMrtFragmentProgram);
+
+                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 skyprogram failed to load" << endl;
+                cerr << "fragment program failed to load" << endl;
+        
 
         PrintGLerror("init");
@@ -618 +617 @@
 void InitGLstate() 
 {
-        glClearColor(0.3f, 0.3f, 0.4f, 1.0f);
+        glClearColor(0.4f, 0.4f, 0.4f, 1.0f);
         
         glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
@@ -643 +642 @@
         glDisable(GL_TEXTURE_2D);
 
-        GLfloat ambientColor[] = {0.5, 0.5, 0.5, 1.0};
+        GLfloat ambientColor[] = {0.2, 0.2, 0.2, 1.0};
         GLfloat diffuseColor[] = {1.0, 0.0, 0.0, 1.0};
         GLfloat specularColor[] = {0.0, 0.0, 0.0, 1.0};
@@ -671 +670 @@
         if (!skyDome) cerr << "loadig plane failed" << endl;
 
-        preetham = new SkyPreetham(3.0f, skyDome);
+        const float turbitiy = 3.0f;
+        preetham = new SkyPreetham(turbitiy, skyDome);
 
 
         //////////////////////////////
 
-        //GLfloat lmodel_ambient[] = {0.5f, 0.5f, 0.5f, 1.0f};
-        GLfloat lmodel_ambient[] = {1.0f, 1.0f, 1.0f, 1.0f};
+        //GLfloat lmodel_ambient[] = {1.0f, 1.0f, 1.0f, 1.0f};
+        GLfloat lmodel_ambient[] = {0.7f, 0.7f, 0.8f, 1.0f};
 
         glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lmodel_ambient);
-        glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE);
+        //glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE);
+        glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_FALSE);
         glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL_EXT, GL_SINGLE_COLOR_EXT);
 }
@@ -795 +796 @@
 void SetupLighting()
 {
-        //glEnable(GL_LIGHTING);
         glEnable(GL_LIGHT0);
+        glDisable(GL_LIGHT1);
         
         Vector3 lightDir = -light->GetDirection();
@@ -807 +808 @@
         GLfloat diffuse[] = {1.0f, 0.95f, 0.85f, 1.0f};
         GLfloat specular[] = {1.0f, 1.0f, 1.0f, 1.0f};
+        //GLfloat specular[] = {0.0f, 0.0f, 0.0f, 1.0f};
 
         Vector3 sunAmbient;
@@ -832 +834 @@
         diffuse[1] = sunDiffuse.y;
         diffuse[2] = sunDiffuse.z;
-
+        
         //cout<< "sunambient: " << sunAmbient << endl;
         //cout<< "sundiffuse: " << sunDiffuse << endl;
@@ -1101 +1103 @@
         RenderSky();
         
-
 
         if ((renderMethod == RENDER_DEFERRED) ||
@@ -1960 +1961 @@
 void RenderSky()
 {
-        glEnable(GL_LIGHTING);
+        //glEnable(GL_LIGHTING);
         cgGLEnableProfile(RenderState::sCgVertexProfile);
 
-        if (state.GetRenderPassType() == RenderState::DEFERRED)
-        {
-                cgGLEnableProfile(RenderState::sCgFragmentProfile);
-                cgGLBindProgram(sCgMrtFragmentSkyDomeProgram);
-        }
+        if ((renderMethod == RENDER_DEFERRED) || (renderMethod == RENDER_DEPTH_PASS_DEFERRED))
+                state.SetRenderPassType(RenderState::DEFERRED);
 
         SceneEntityContainer::const_iterator sit, sit_end = skyGeometry.end();
@@ -1976 +1974 @@
         //cube->Render(&state);
         //aeroplane->Render(&state);
-        glDisable(GL_CULL_FACE);
+        //glEnable(GL_LIGHTING);
+
         preetham->Compute(-light->GetDirection(), camera, &state);
-        glEnable(GL_CULL_FACE);
-
+        
         cgGLDisableProfile(RenderState::sCgVertexProfile);
         cgGLDisableProfile(RenderState::sCgFragmentProfile);
@@ -2034 +2032 @@
 
         glDepthFunc(GL_LESS);
+        state.Reset();
 
         PrintGLerror("visibleobjects");