Changeset 3014 for GTP/trunk

Timestamp:

10/08/08 14:26:31 (16 years ago)

Author:

mattausch

Message:

removed eyepos from sssao shader, played around with maxdepth

Location:

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

Files:

• chcdemo.cpp (modified) (2 diffs)
• shaderenv.h (modified) (1 diff)
• shaders/deferred.cg (modified) (1 diff)
• shaders/globillum.cg (modified) (4 diffs)
• shaders/ssao.cg (modified) (8 diffs)
• shaders/tonemap.cg (modified) (1 diff)

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

@@ -569 +569 @@
                 RenderState::sTexParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "tex");
         
-                cgGLSetParameter1f(sMaxDepthParamTex, MAX_DEPTH_CONST / farDist);
+                //const float maxDepth = MAX_DEPTH_CONST / farDist;
+                const float maxDepth = 1.0f;
+
+                cgGLSetParameter1f(sMaxDepthParamTex, maxDepth);
 
                 sTLParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "tl"); 
@@ -594 +597 @@
                 sEyePosParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "eyePos");
                 
-                cgGLSetParameter1f(sMaxDepthParam, MAX_DEPTH_CONST / farDist);
+                //const float maxDepth = MAX_DEPTH_CONST / farDist;
+                const float maxDepth = 1.0f;
+
+                cgGLSetParameter1f(sMaxDepthParam, maxDepth);
 
                 sTLParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "tl"); 

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

@@ -15 +15 @@
 #define AREA_SIZE 8e-1f
 
-//#define DISTANCE_SCALE 1e-4f
-#define DISTANCE_SCALE 1e-6f
+#define DISTANCE_SCALE 1e-4f
+//#define DISTANCE_SCALE 1e-6f
 
 #define ILLUM_INTENSITY 5e-1f;

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

@@ -64 +64 @@
                    uniform sampler2D normals,
                    uniform float3 lightDir
-                  //, uniform sampler2D oldColors
                    )
 {

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

@@ -64 +64 @@
                                    uniform float3 centerPosition,
                                    float w,
-                                   uniform float3 eyePos,
                                    uniform float3 bl,
                                    uniform float3 br,
@@ -107 +106 @@
                 //-- reconstruct world space position from sample
 
-                float4 sample = tex2Dlod(colors, float4(texcoord, 0, 0));
+                const float4 sample = tex2Dlod(colors, float4(texcoord, 0, 0));
+
                 const float eyeSpaceDepth = sample.w;
                 //float3 rotView = normalize(Interpol(texcoord, bl, br, tl, tr));
                 float3 rotView = Interpol(texcoord, bl, br, tl, tr);
                 
-                
-                const float3 sample_position = eyePos - rotView * eyeSpaceDepth;
+                const float3 sample_position = - rotView * eyeSpaceDepth;
                 const float3 sample_color = sample.xyz;
 
@@ -181 +180 @@
         const float eyeDepth = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0)).w;
         
+        const float3 eyeSpacePos = -viewDir * eyeDepth;
+
         float3 centerPosition;
         centerPosition.xyz = eyePos - viewDir * eyeDepth;
@@ -190 +191 @@
         //-- compute color bleeding + ao
 
-        GiStruct gi = globIllum(IN, colors, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
+        GiStruct gi = globIllum(IN, colors, noiseTexture, samples, normal, eyeSpacePos, w, bl, br, tl, tr);
         
 

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

@@ -46 +46 @@
 
 // reconstruct world space position
-inline float3 ReconstructSamplePosition(float3 eyePos, 
+inline float3 ReconstructSamplePosition(
                                                                                 uniform sampler2D colors,
                                                                                 float2 texcoord, 
@@ -56 +56 @@
         float3 rotView = Interpol(texcoord, bl, br, tl, tr);
         
-        float3 samplePos = eyePos - rotView * eyeSpaceDepth;
+        float3 samplePos = -rotView * eyeSpaceDepth;
 #else
         float3 samplePos = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
@@ -73 +73 @@
                    uniform float3 centerPosition,
                    uniform float scaleFactor,
-                   uniform float3 eyePos,
                    uniform float3 bl,
                    uniform float3 br,
@@ -107 +106 @@
                 //if ((texcoord.x <= 1.0f) && (texcoord.x >= 0.0f) && (texcoord.y <= 1.0f) && (texcoord.y >= 0.0f))++ numSamples;
 
-                float3 samplePos = ReconstructSamplePosition(eyePos, colors, texcoord, bl, br, tl, tr);
+                float3 samplePos = ReconstructSamplePosition(colors, texcoord, bl, br, tl, tr);
 
 
@@ -124 +123 @@
                 // the distance to a sample approaches zero
                 const float intensity = 
-                        (SAMPLE_INTENSITY * DISTANCE_SCALE) / (DISTANCE_SCALE + lengthSample * lengthSample);
+                        //(SAMPLE_INTENSITY * DISTANCE_SCALE) / (DISTANCE_SCALE + lengthSample * lengthSample);
+                        SAMPLE_INTENSITY / (DISTANCE_SCALE + lengthSample * lengthSample);
 
 #if 0
@@ -173 +173 @@
         const float eyeDepth = tex2Dlod(colors, float4(IN.texCoord, 0, 0)).w;
 
+        const float3 eyeSpacePos = -viewDir * eyeDepth;
+
         float3 centerPosition;
         centerPosition.xyz = eyePos - viewDir * eyeDepth;
 
-        const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
+        const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, eyeSpacePos, w, bl, br, tl, tr);
 #else
 
@@ -182 +184 @@
         const float3 centerPosition = tex2Dlod(positions, float4(IN.texCoord, 0, 0)).xyz;
 
-        const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
+        const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, bl, br, tl, tr);
 
 #endif
@@ -262 +264 @@
         float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
-        OUT.illum_col = col * ao.x;
-        //OUT.illum_col = float4(ao.x,ao.x,ao.x, ao.w);
+        //OUT.illum_col = col * ao.x;
+        OUT.illum_col = float4(ao.x,ao.x,ao.x, ao.w);
         OUT.illum_col.w = col.w;
 

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

@@ -51 +51 @@
                                   uniform float2 downSampleOffs[NUM_DOWNSAMPLES]): COLOR
 {    
+        //return tex2Dlod(colors, float4(IN.texCoord, 0, 0));
+
     float4 average = .0f;