Changeset 3144

Timestamp:

11/19/08 17:37:11 (16 years ago)

Author:

mattausch

Message:

working on normal mapping

Location:

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

Files:

• DeferredRenderer.cpp (modified) (3 diffs)
• ResourceManager.cpp (modified) (1 diff)
• ShaderManager.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (1 diff)
• shaders/normalMapping.cg (modified) (12 diffs)
• shaders/ssao.cg (modified) (2 diffs)

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

@@ -477 +477 @@
 #endif
 
-        ///////
+        /////////
         //-- pcf tabs for shadowing
 
@@ -526 +526 @@
         case SSAO:
                 ComputeSsao(fbo, tempCohFactor);
-                SmoothSsao(fbo);
+                //SmoothSsao(fbo);
                 CombineSsao(fbo);
                 break;
@@ -810 +810 @@
         GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
-        GLuint ssaoTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex)->GetTexture();
-        //GLuint ssaoTex = mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetTexture();
+        //GLuint ssaoTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex)->GetTexture();
+        GLuint ssaoTex = mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetTexture();
         
         FlipFbos(fbo);

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

@@ -287 +287 @@
         static ShaderProgram *sDefaultVertexProgramMrt = ShaderManager::GetSingleton()->GetShaderProgram("defaultVertexMrt");
 
-        //static ShaderProgram *sNormalMappingVertexProgramMrt = ShaderManager::GetSingleton()->GetShaderProgram("normalMappingVertexMrt");
-        //static ShaderProgram *sNormalMappingFragmentProgramMrt = ShaderManager::GetSingleton()->GetShaderProgram("normalMappingFragmentMrt");
+        static ShaderProgram *sNormalMappingVertexProgramMrt = ShaderManager::GetSingleton()->GetShaderProgram("normalMappingVertexMrt");
+        static ShaderProgram *sNormalMappingFragmentProgramMrt = ShaderManager::GetSingleton()->GetShaderProgram("normalMappingFragmentMrt");
 
 

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

@@ -44 +44 @@
         CGerror lastError = cgGetError();
 
-        if(lastError)
+        if (lastError)
         {
                 printf("Cg error, exiting...\n");
@@ -124 +124 @@
 
         
-        //ShaderProgram *normalMappingVertexMrt, *normalMappingFragmentMrt;
-
-        //normalMappingVertexMrt = CreateFragmentProgram("normalMapping", "vtx", "normalMappingVertexMrt");
-        //normalMappingFragmentMrt = CreateFragmentProgram("normalMapping", "frag", "normalMappingFragmentMrt");
+        ShaderProgram *normalMappingVertexMrt, *normalMappingFragmentMrt;
+
+        normalMappingVertexMrt = CreateVertexProgram("normalMapping", "vtx", "normalMappingVertexMrt");
+        normalMappingFragmentMrt = CreateFragmentProgram("normalMapping", "frag", "normalMappingFragmentMrt");
 
 

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

@@ -471 +471 @@
         //-- load some dynamic stuff
 
-        //resourceManager->mUseNormalMapping = true;
-        resourceManager->mUseNormalMapping = false;
-
-        //LoadModel("fisch.dem", dynamicObjects);
-        LoadModel("hbuddha.dem", dynamicObjects);
+        resourceManager->mUseNormalMapping = true;
+        //resourceManager->mUseNormalMapping = false;
+
+        LoadModel("fisch.dem", dynamicObjects);
+        //LoadModel("hbuddha.dem", dynamicObjects);
 
         resourceManager->mUseNormalMapping = false;

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

@@ -2 +2 @@
 /*    Shader for normal mapped geoemtry    */
 /*******************************************/
-
-/**************************************************************/
-/* Shader computing the MRT output for normal mapped geoemtry */
-/**************************************************************/
-
 
 // input
@@ -13 +8 @@
   float4 position: POSITION;
   float4 normal: NORMAL;
-  float4 tangent: COLOR0;
+  float4 color: COLOR0;
   float4 texCoord: TEXCOORD0;
 };
@@ -24 +19 @@
         float4 texCoord: TEXCOORD0;    
 
-        float4 tangent: COLOR0;  
+        float4 tangent: TEXCOORD6;  
          // eye position
         float4 eyePos: TEXCOORD1;
@@ -31 +26 @@
         float4 worldPos: TEXCOORD3;
         float4 oldWorldPos: TEXCOORD4;
-        float4 bitangent: TEXCOORD5
+        float4 bitangent: TEXCOORD5;
 };
 
@@ -38 +33 @@
 struct fragin
 {
-        float4 tangent: COLOR0;  
+        float4 tangent: TEXCOORD6;  
         float4 texCoord: TEXCOORD0;    
 
@@ -47 +42 @@
         float4 worldPos: TEXCOORD3;
         float4 oldWorldPos: TEXCOORD4;
-        float4 bitangent: TEXCOORD5
+        float4 bitangent: TEXCOORD5;
 };
 
@@ -69 +64 @@
         vtxout OUT;
 
-        OUT.color = IN.color;
+        OUT.tangent = IN.color;
         OUT.texCoord = IN.texCoord;
 
@@ -84 +79 @@
         OUT.tangent = mul(glstate.matrix.invtrans.modelview[0], IN.color); 
 
-        OUT.bitangent = cross(IN.tangent, IN.normal);
+        OUT.bitangent = float4(cross(IN.color.xyz, IN.normal.xyz), 1);
 
         return OUT;
 }
+
+
+
+/**************************************************************/
+/* Shader computing the MRT output for normal mapped geoemtry */
+/**************************************************************/
 
 
@@ -126 +127 @@
         // as it is the inverse of a rotation matrix 
         float3x3 tangToWorldTrafo = transpose(float3x3(IN.tangent, IN.bitangent, IN.normal));
-        const float3 tangentSpaceNorm = tex2Dlod(normalMap, float4(IN.texCoord.xy).xyz);
+        const float3 tangentSpaceNorm = tex2Dlod(normalMap, float4(IN.texCoord.xy, 0, 0)).xyz;
         pix.normal = mul(tangToWorldTrafo, tangentSpaceNorm);
 
@@ -133 +134 @@
 
 
-pixel frag(fragin IN, uniform float4x4 viewMatrix)
+pixel frag(fragin IN,
+                   uniform float4x4 viewMatrix,
+                   uniform sampler2D normalMap: TEXUNIT1)
 {
         pixel pix;
         // hack: use comination of emmisive + diffuse (emmisive used as constant ambient term)
-        pix.col = glstate.material.diffuse + glstate.material.emission;
+        pix.color = glstate.material.diffuse + glstate.material.emission;
         // save world space normal in rt => transform back into world space by
         // multiplying with inverse view. since transforming normal with T means to 
         // multiply with the inverse transpose of T, we multiple with Transp(Inv(Inv(view))) = Transp(view)
-        pix.norm = mul(transpose(viewMatrix), IN.normal).xyz;
+        pix.normal = mul(transpose(viewMatrix), IN.normal).xyz;
         // eye space depth
-        pix.col.w = length(IN.eyePos.xyz);
+        pix.color.w = length(IN.eyePos.xyz);
         // the scene entity id
         //pix.id = glstate.fog.color.xyz;
@@ -149 +152 @@
         pix.offsVec = IN.oldWorldPos.xyz - IN.worldPos.xyz;
 
-        pixel pix;
         // compute tanget space in world space => transform basis vectors back into world space by
         // multiplying with inverse view. since transforming normal with T means to 
@@ -160 +162 @@
         // compute tangent space - world space transform which is the transpose,
         // as it is the inverse of a rotation matrix 
-        float3x3 tangToWorldTrafo = transpose(float3x3(IN.tangent, IN.bitangent, IN.normal));
-        const float3 tangentSpaceNorm = tex2Dlod(normalMap, float4(IN.texCoord.xy).xyz);
+        float3x3 tangToWorldTrafo = transpose(float3x3(IN.tangent.xyz, IN.bitangent.xyz, IN.normal.xyz));
+        const float3 tangentSpaceNorm = tex2Dlod(normalMap, float4(IN.texCoord.xy, 0, 0)).xyz;
         pix.normal = mul(tangToWorldTrafo, tangentSpaceNorm);
 

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

@@ -1 +1 @@
 #include "../shaderenv.h"
+
 
 ////////////////////
@@ -5 +6 @@
 // based on shader of Alexander Kusternig
 
+
 #define USE_EYESPACE_DEPTH 1
-