Changeset 2984 for GTP/trunk

Timestamp:

10/01/08 01:10:22 (16 years ago)

Author:

mattausch

Message:

added eye space depth

Location:

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

Files:

• DeferredRenderer.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (4 diffs)
• shaders/deferred.cg (modified) (3 diffs)
• shaders/mrt.cg (modified) (4 diffs)

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

@@ -582 +582 @@
 
         float imageKey, whiteLum, middleGrey;
-
+/*
         glPixelStorei(GL_PACK_ALIGNMENT, 1);
         // generate mip map levels for average loglum and tone mapping 
@@ -590 +590 @@
         ComputeToneParameters(fbo, light, imageKey, whiteLum, middleGrey);
         ToneMap(fbo, light, imageKey, whiteLum, middleGrey);
-
+*/
         AntiAliasing(fbo, light);
 

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

@@ -272 +272 @@
 static CGparameter sMaxDepthParam;
 static CGparameter sMaxDepthParamTex;
+static CGparameter sCurrentPosParamTex;
+static CGparameter sCurrentPosParam;
 
 static Matrix4x4 oldViewProjMatrix;
@@ -591 +593 @@
 
                 sMaxDepthParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "maxDepth");
+                sCurrentPosParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "currentPos");
                 RenderState::sTexParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "tex");
         
@@ -611 +614 @@
 
                 sMaxDepthParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "maxDepth");
+                sCurrentPosParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "currentPos");
                 
                 cgGLSetParameter1f(sMaxDepthParam, MAX_DEPTH_CONST / farDist);
@@ -943 +947 @@
         cgGLBindProgram(RenderState::sCgMrtFragmentProgram);
 
+        Vector3 pos = camera->GetPosition();
+        cgGLSetParameter3f(sCurrentPosParam, pos.x, pos.y, pos.z);
+        cgGLSetParameter3f(sCurrentPosParamTex, pos.x, pos.y, pos.z);
+
         // draw to 3 color buffers
         // a color, normal, and positions buffer

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

@@ -48 +48 @@
         float4 outColor;
 
-        //if (color.w > 1e19f) outColor = color;
-        if (emmisive > 1.5f) outColor = color;
+        if (position.w > 1e19f) outColor = color;
+        //if (emmisive > 1.5f) outColor = color;
         else outColor = (ambient + diffuse) * color;
 
@@ -181 +181 @@
 
         // calc diffuse illumination + shadow term
-        if ((emmisive < 1.5f) // hack: prevent shadowing the sky        
+        //if ((emmisive < 1.5f) // hack: prevent shadowing the sky      
+        if (
+                (position.w > 1e19f)
                 && (angle > 1e-3f) // shadow only if diffuse color has some minimum intensity
                 )
@@ -200 +202 @@
         
         // base lighting
-        OUT.color = (emmisive > 1.5f) ? color: (ambient + diffuse) * color;
+        //OUT.color = (emmisive > 1.5f) ? color: (ambient + diffuse) * color;
+        OUT.color = (position.w > 1e19f) ? color: (ambient + diffuse) * color;
 
 

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

@@ -68 +68 @@
                           uniform sampler2D dirtTex,
                           uniform float maxDepth,
-                          uniform sampler2D tex)
+                          uniform sampler2D tex,
+                          uniform float3 currentPos)
 {
         pixel pix;
@@ -93 +94 @@
 
         // hack: squeeze some information about ambient into the texture
-        pix.col.w = glstate.material.emission.x;
-        //pix.col.w = length(currentPos - IN.worldPos)
+        //pix.col.w = glstate.material.emission.x;
+        pix.col.w = length(currentPos - IN.worldPos);
 
         return pix;
@@ -100 +101 @@
 
 
-pixel frag(fragin IN, 
-                   uniform float maxDepth)
+pixel frag(fragin IN, uniform float maxDepth, uniform float3 currentPos)
 {
         pixel pix;
@@ -117 +117 @@
         
         // hack: squeeze some information about the ambient term into the target
-        pix.col.w = glstate.material.emission.x;
+        //pix.col.w = glstate.material.emission.x;
+        pix.col.w = length(currentPos - IN.worldPos);
 
         return pix;