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

Timestamp:

09/16/08 16:03:01 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -184 +184 @@
 
 ShadowMap *shadowMap = NULL;
-Light *light = NULL;
+DirectionalLight *light = NULL;
 DeferredRenderer *ssaoShader = NULL;
+
 
 
@@ -242 +243 @@
 static CGprogram sCgMrtVertexProgram = NULL;
 
-static CGparameter sModelViewProjMatrixParam;
 static CGparameter sMaxDepthParam;
 static CGparameter sMaxDepthParamTex;
-
 static Matrix4x4 oldViewProjMatrix;
 
@@ -284 +283 @@
         Vector3 camPos(.0f, .0f, .0f);
         Vector3 camDir(.0f, 1.0f, .0f);
+        Vector3 lightDir(-0.8f, 1.0f, -0.7f);
 
         cout << "=== reading environment file ===" << endl << endl;
@@ -308 +308 @@
                 env.GetVectorParam(string("camPosition"), camPos);
                 env.GetVectorParam(string("camDirection"), camDir);
+                env.GetVectorParam(string("lightDirection"), lightDir);
 
                 env.GetBoolParam(string("useLODs"), useLODs);
@@ -345 +346 @@
 
         visCamera = new Camera(winWidth, winHeight, fov);
-
         visCamera->SetNear(0.0f);
         visCamera->Yaw(.5 * M_PI);
+
+        // create a new light
+        light = new DirectionalLight(lightDir, RgbaColor(1, 1, 1, 1));
+
 
         renderQueue = new RenderQueue(&state, camera);
@@ -449 +453 @@
         sceneQuery = new SceneQuery(bvh->GetBox(), traverser);
 
-        //Vector3 lightDir = Normalize(Vector3(0.2, -0.8, -1));
-        Vector3 lightDir = Normalize(-Vector3(0.8f, -1.0f, 0.7f));
-        
-        light = new Light(lightDir, RgbaColor(1, 1, 1, 1));
-
-
         // frame time is restarted every frame
         frameTimer.Start();
@@ -495 +493 @@
                 cgGLLoadProgram(sCgMrtVertexProgram);
 
-                Transform3::sModelMatrixParam = cgGetNamedParameter(sCgMrtVertexProgram, "ModelMatrix");
-                sModelViewProjMatrixParam = cgGetNamedParameter(sCgMrtVertexProgram, "ModelViewProj");
+                //sInvViewProjParam = cgGetNamedParameter(sCgMrtVertexProgram, "InvViewProj");
+                Transform3::sModelMatrixParam = cgGetNamedParameter(sCgMrtVertexProgram, "ModelView");
         }
 
@@ -757 +755 @@
         glLightfv(GL_LIGHT0, GL_SPECULAR, specular);
 
-        GLfloat position[] = {0.8f, -1.0f, 0.7f, 0.0f};
+        Vector3 lightDir = -light->GetDirection();
+        GLfloat position[] = {lightDir.x, lightDir.y, lightDir.z, 0.0f};
         glLightfv(GL_LIGHT0, GL_POSITION, position);
 
@@ -802 +801 @@
         glMatrixMode(GL_PROJECTION);
         glLoadIdentity();
-
         gluPerspective(fov, winAspectRatio, nearDist, farDist);
 
@@ -823 +821 @@
         if ((renderType == RenderState::DEFERRED) || (renderType == RenderState::DEPTH_PASS_DEFERRED))
         {
-                // set modelview matrix for shaders
-                cgGLSetStateMatrixParameter(sModelViewProjMatrixParam, 
-                                                                        CG_GL_MODELVIEW_PROJECTION_MATRIX, 
-                                                                        CG_GL_MATRIX_IDENTITY);
-
-                static Matrix4x4 identity = IdentityMatrix();
-                cgGLSetMatrixParameterfc(Transform3::sModelMatrixParam, (const float *)identity.x);
-        }               
+                cgGLSetMatrixParameterfc(Transform3::sModelMatrixParam, (const float *)IdentityMatrix().x);
+        }
 }
 
@@ -1012 +1004 @@
 
         // set up lights
-        GLfloat position[] = {0.8f, -1.0f, 0.7f, 0.0f};
-        glLightfv(GL_LIGHT0, GL_POSITION, position);
-
-#if 0
-        GLfloat position1[] = {-0.5f, 0.5f, 0.4f, 0.0f};
-        glLightfv(GL_LIGHT1, GL_POSITION, position1);
-#endif
+        Vector3 lightDir = -light->GetDirection();
+        GLfloat lightPos[] = {lightDir.x, lightDir.y, lightDir.z, 0.0f};
+        glLightfv(GL_LIGHT0, GL_POSITION, lightPos);
+
+        // second light
+        //GLfloat lightPos1[] = {-0.5f, 0.5f, 0.4f, 0.0f};
+        //glLightfv(GL_LIGHT1, GL_POSITION, lightPos1);
+
 
         if (renderLightView)
@@ -1090 +1083 @@
 
                 ShadowMap *sm = showShadowMap ? shadowMap : NULL;
-                ssaoShader->Render(fbo, oldViewProjMatrix, matProjectionView, ssaoTempCohFactor, sm);
+                ssaoShader->Render(fbo, oldViewProjMatrix, matProjectionView, ssaoTempCohFactor, light, sm);
         }