Changeset 2959 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders

Timestamp:

09/19/08 23:13:47 (16 years ago)

Author:

mattausch

Message:

preetham working but big hack

Location:

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

Files:

• deferred.cg (modified) (4 diffs)
• sky_preetham.cg (modified) (2 diffs)

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

@@ -33 +33 @@
                          uniform float4 position,
                          uniform float3 normal,
-                         uniform float amb,
+                         uniform float emmisive,
                          float3 lightDir)
 {
@@ -50 +50 @@
         const float4 ambient = glstate.light[0].ambient;
         
-        return (ambient + diffuse) * color * (1.0f - amb) + amb * color;
+        //return (saturate(((ambient + diffuse))) * (1.0f - emmisive) + emmisive) * color;
+        return saturate((((ambient + diffuse)) * (1.0f - emmisive) + emmisive) * color);
 }
 
@@ -152 +153 @@
         const float angle = saturate(dot(normal, lightDir)); 
         //float4 lightDiffuse = float4(1.0f, 1.0f, 0.9f, 1.0f);
-        float4 lightDiffuse = glstate.light[0].diffuse;
+        const float4 lightDiffuse = glstate.light[0].diffuse;
         //float4(1.0f, 1.0f, 0.9f, 1.0f);
 
@@ -178 +179 @@
         
         // base lighting
-        OUT.color = (ambient + diffuse) * color * (1.0f - emmisive) + emmisive * color;
+        OUT.color = (emmisive < 0.95) ? (ambient + diffuse) * color : color;
 
         // also write out depth component

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

@@ -27 +27 @@
 
 
-struct PixelOutput
+
+struct pixel
 {
-        float4 color: SV_TARGET0;
+  float4 col: COLOR0;
+  float4 pos: COLOR1;
+  float4 norm: COLOR2;
 };
 
+// fragment input
+struct fragin
+{
+        float4 color: COLOR0;  
+        float4 position: POSITION; // eye space
+        float4 texCoord: TEXCOORD0;    
 
-
+        float4 projPos: WPOS;
+        float4 worldPos: TEXCOORD1; // world position
+        float3 normal: TEXCOORD2;
+        float4 mypos: TEXCOORD3;
+};
 //--------------------------------------------------------------------------------------
 // Vertex Shaders
@@ -91 +104 @@
 
 
-pixel frag_skydome(fragin IN, 
-                                   uniform float maxDepth)
+pixel frag_skydome(fragin IN)
 {
         pixel pix;
 
         pix.col = IN.color;
-        pix.pos = IN.worldPos;// * maxDepth;
+        pix.pos = IN.worldPos * 1e20;// * maxDepth;
 
         pix.norm.xyz = IN.normal;
         
         // hack: squeeze some information about the ambient term into the target
-        pix.norm.w = 0;
+        pix.norm.w = 1;
         pix.pos.w = IN.mypos.w;