Changeset 1879 for GTP/trunk/App/Demos/Illum/Ogre/Media/materials/programs

Timestamp:

12/11/06 16:30:08 (18 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/App/Demos/Illum/Ogre/Media/materials/programs/GameTools_HPS_Smoke_L_Depth.hlsl (modified) (4 diffs)

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/programs/GameTools_HPS_Smoke_L_Depth.hlsl

@@ -21 +21 @@
 {
         VS_OUT OUT;
-        //texCoord.z = normalize(texCoord.z);
-        //texCoord.w = normalize(texCoord.w);
-    float2 offset = texCoord.zw * baseRadius;
+        float2 offset = texCoord.zw * baseRadius;
         OUT.r = abs(offset.x);
         float4 cPosition;   
@@ -30 +28 @@
         cPosition.xy += offset; 
         OUT.cPosition = cPosition;
+        OUT.cPosition.z += baseRadius;
         OUT.cPosition.z *= -1;
-        //OUT.cPosition.z = OUT.cPosition.z - OUT.r;    
         
     OUT.hPosition = mul( Proj, cPosition );
@@ -48 +46 @@
                                                 uniform sampler2D Texture  : register(s0),
                                                 uniform sampler2D depthTexture : register(s1),
+                                                uniform sampler2D illumVolume : register(s2),
                                                 uniform float farplane,
-                                                uniform float width = 800,
-                                                uniform float height = 600
+                                                uniform float nearplane                                         
                                                         ) : COLOR
 {
@@ -60 +58 @@
         
         if(b == 0)
-                discard;
-        
-        float2 halfpixel = float2(1.0 / width, 1.0 / height);
-    IN.screenCoord += halfpixel;
-   
+                discard;        
+
         float sceneDepth = tex2D(depthTexture, IN.screenCoord).r;
         if(sceneDepth == 0)
-                //discard;
                 sceneDepth = farplane;
-        
+           
         float size = 2.0 * IN.r;
         float frontDepth = IN.cPosition.z + size * (f - 0.5);
         float backDepth = IN.cPosition.z +  size * (b - 0.5);
         
-        alpha = (sceneDepth - frontDepth) / (backDepth - frontDepth);
+        float far = min(sceneDepth, backDepth);
+        float near = max(frontDepth, nearplane);
+        
+        alpha = (far - near) / (backDepth - frontDepth);
         alpha = saturate(alpha) * impostor.a;
         
-        //Color = float4(Color.g, 0, 0, 1);
+        
         Color = float4(1, 1, 1, alpha) * IN.Color;
-        //Color = float4(b - 0.5, 0, 0, 1);
-        //Color = sceneDepth / farplane;
-        //Color = 1;
-        return Color; 
+    return Color; 
         
 }