Changeset 2819

Timestamp:

07/07/08 15:11:03 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• Material.cpp (modified) (2 diffs)
• Material.h (modified) (2 diffs)
• RenderQueue.cpp (modified) (1 diff)
• RenderState.cpp (modified) (3 diffs)
• RenderState.h (modified) (1 diff)
• SceneEntity.h (modified) (1 diff)
• chcdemo.cpp (modified) (10 diffs)
• shaders/deferred.cg (modified) (1 diff)
• shaders/mrt.cg (modified) (2 diffs)

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

@@ -8 +8 @@
 namespace CHCDemoEngine
 {
+
+CGparameter Material::sDiffuseParam;
+CGparameter Material::sDiffuseTexParam;
 
 RgbaColor RandomColor(float a, float b)
@@ -60 +63 @@
 
         if (mTexture)
+        {
                 mTexture->Bind();
+                cgGLSetParameter4f(sDiffuseTexParam, mDiffuseColor.r, mDiffuseColor.g, mDiffuseColor.b, mDiffuseColor.a);
+        }
         else
+        {
+                cgGLSetParameter4f(sDiffuseParam, mDiffuseColor.r, mDiffuseColor.g, mDiffuseColor.b, mDiffuseColor.a);
                 glBindTexture(GL_TEXTURE_2D, 0);
+        }
 
         glMaterialfv(GL_FRONT, GL_AMBIENT, (float *)&mAmbientColor.r);

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Material.h

@@ -2 +2 @@
 #define __MATERIAL_H
 
+#include "glInterface.h"
+#include <Cg/cg.h>
+#include <Cg/cgGL.h>
 #include "common.h"
 
@@ -69 +72 @@
         void InitMaterial();
 
+        static CGparameter sDiffuseParam;
+        static CGparameter sDiffuseTexParam;
 
 protected:

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

@@ -63 +63 @@
 
         // test if entity 
-        if (mat->IsAlphaTestEnabled() != mBuckets[idx]->mAlphaTestEnabled)
-                return false;
+        //if (mat->IsAlphaTestEnabled() != mBuckets[idx]->mAlphaTestEnabled) return false;
 
         const bool hasTexture = (mat->GetTexture() != NULL);

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

@@ -9 +9 @@
 CGprofile RenderState::sCgFragmentProfile;
 CGprofile RenderState::sCgVertexProfile; 
+
+CGprogram RenderState::sCgMrtFragmentProgram = NULL;
+CGprogram RenderState::sCgMrtFragmentTexProgram = NULL;
 
 
@@ -84 +87 @@
         {
                 mTexturesEnabled = false;
+
+                cgGLBindProgram(sCgMrtFragmentProgram);
+
                 glDisable(GL_TEXTURE_2D);
                 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -92 +98 @@
                 {
                         mTexturesEnabled = true;
+
+                        cgGLBindProgram(sCgMrtFragmentTexProgram);
+
                         glEnable(GL_TEXTURE_2D);
                         glEnableClientState(GL_TEXTURE_COORD_ARRAY);

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderState.h

@@ -57 +57 @@
         static CGprofile sCgVertexProfile; 
 
+        static CGprogram sCgMrtFragmentProgram;
+        static CGprogram sCgMrtFragmentTexProgram;
+
 
 protected:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SceneEntity.h

@@ -3 +3 @@
 
 #include "glInterface.h"
+#include <Cg/cg.h>
+#include <Cg/cgGL.h>
 #include "common.h"
 #include "AxisAlignedBox3.h"
 #include "Triangle3.h"
-#include <Cg/cg.h>
-#include <Cg/cgGL.h>
+
 
 namespace CHCDemoEngine 

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

@@ -23 +23 @@
 #include "SceneQuery.h"
 #include "RenderQueue.h"
+#include "Material.h"
 #include <Cg/cg.h>
 #include <Cg/cgGL.h>
@@ -144 +145 @@
 bool eightKeyPressed = false;
 
-
 static Vector3 samples[32];
 GLubyte *randomNormals;
+
+PerfTimer frameTimer, algTimer;
+        
 
 // function forward declarations
@@ -207 +210 @@
 static CGprogram sCgMrtVertexProgram = NULL;
 static CGprogram sCgSSAOProgram = NULL;
-static CGprogram sCgMrtFragmentProgram = NULL;
+
 
 static CGparameter sColorsTexParam;
@@ -217 +220 @@
 //static CGparameter sModelMatrixParam;
 static CGparameter sMaxDepthParam;
+static CGparameter sMaxDepthParamTex;
 
 const static float radius = 1e-3f;
@@ -394 +398 @@
         }
 
-        sCgMrtFragmentProgram = 
+        RenderState::sCgMrtFragmentTexProgram = 
+                cgCreateProgramFromFile(sCgContext, 
+                                                                CG_SOURCE,
+                                                                "src/shaders/mrt.cg", 
+                                                                RenderState::sCgFragmentProfile,
+                                                                "fragtex",
+                                                                NULL);
+
+        if (RenderState::sCgMrtFragmentTexProgram != NULL)
+        {
+                cgGLLoadProgram(RenderState::sCgMrtFragmentTexProgram);
+
+                sMaxDepthParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "maxDepth");
+                Material::sDiffuseTexParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "diffuse");
+
+                cgGLSetParameter1f(sMaxDepthParamTex, 10.0f / myfar);
+        }
+        else
+                cerr << "fragment tex program failed to load" << endl;
+
+        RenderState::sCgMrtFragmentProgram = 
                 cgCreateProgramFromFile(sCgContext, 
                                                                 CG_SOURCE,
@@ -402 +426 @@
                                                                 NULL);
 
-        if(sCgMrtFragmentProgram != NULL)
-        {
-                cgGLLoadProgram(sCgMrtFragmentProgram);
-
-                sMaxDepthParam = cgGetNamedParameter(sCgMrtFragmentProgram, "maxDepth");
+        if (RenderState::sCgMrtFragmentProgram != NULL)
+        {
+                cgGLLoadProgram(RenderState::sCgMrtFragmentProgram);
+
+                sMaxDepthParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "maxDepth");
+                Material::sDiffuseParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "diffuse");
 
                 cgGLSetParameter1f(sMaxDepthParam, 10.0f / myfar);
         }
         else
-                cerr << "test program failed to load" << endl;
+                cerr << "fragment program failed to load" << endl;
 
         PrintGLerror("test");
@@ -814 +839 @@
 
 
-
 void Display() 
 {       
-        PerfTimer frameTimer, algTimer;
+        // take time from last frame
+        elapsedTime = frameTimer.Elapsed();
         frameTimer.Start();
 
@@ -848 +873 @@
 
         cgGLEnableProfile(RenderState::sCgFragmentProfile);
-        cgGLBindProgram(sCgMrtFragmentProgram);
+        cgGLBindProgram(RenderState::sCgMrtFragmentProgram);
 
         cgGLEnableProfile(RenderState::sCgVertexProfile);
@@ -861 +886 @@
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
+        // render without shading
+        if (depthPass) 
+        {
+                state.SetDepthPass(true);
+                glDisable(GL_LIGHTING);
+        }
+        else
+        {
+                state.SetDepthPass(false);
+                glEnable(GL_LIGHTING);
+        }
+        
+
+        // bring eye modelview matrix up-to-date
+        SetupEyeView();
+
         // set modelview matrix for shaders
         cgGLSetStateMatrixParameter(sModelViewProjMatrixParam, CG_GL_MODELVIEW_PROJECTION_MATRIX, CG_GL_MATRIX_IDENTITY);
-
-        // render without shading
-        if (depthPass) 
-        {
-                state.SetDepthPass(true);
-                glDisable(GL_LIGHTING);
-        }
-        else
-        {
-                state.SetDepthPass(false);
-                glEnable(GL_LIGHTING);
-        }
         
         static Matrix4x4 identity = IdentityMatrix();
-
         cgGLSetMatrixParameterfc(SceneEntity::sModelMatrixParam, (const float *)identity.x);
-        // bring eye modelview matrix up-to-date
-        SetupEyeView();
+        
 
         // actually render the scene geometry using one of the specified algorithms
@@ -931 +958 @@
 
         glutSwapBuffers();
-
-        elapsedTime = frameTimer.Elapsed();
 }
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/deferred.cg

@@ -152 +152 @@
   float diffuse = diffuseLight + diffuseLight2;
 
-  float ao = ssao(IN, positions, normals, noiseTexture);
+  //float ao = ssao(IN, positions, normals, noiseTexture);
+  float ao = 1.0f;
   //OUT.color = ao; 
   OUT.color = ao * (ambient + diffuse) * color;

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/mrt.cg

@@ -63 +63 @@
 }
 
+/*struct Material
+{
+  float4 diffuse;
+}*/
 
-pixel frag(fragin IN, uniform sampler2D tex, uniform float maxDepth)
+
+pixel fragtex(fragin IN, uniform sampler2D tex, uniform float maxDepth, uniform float4 diffuse)
 {
   pixel pix;
       
-  pix.col = tex2D(tex, IN.texCoord.xy);
+  pix.col = diffuse * tex2D(tex, IN.texCoord.xy);
   pix.pos = IN.worldPos * maxDepth;
   pix.norm = IN.normal;
@@ -75 +80 @@
   return pix;
 }
+
+
+pixel frag(fragin IN, uniform float maxDepth, uniform float4 diffuse)
+{
+  pixel pix;
+      
+  pix.col = diffuse;
+  pix.pos = IN.worldPos * maxDepth;
+  pix.norm = IN.normal;
+  pix.pos.w = IN.projPos.w;
+
+  return pix;
+}