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

Timestamp:

07/07/06 08:53:01 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/programs

Files:

• GameTools_Cau.hlsl (modified) (4 diffs)
• GameTools_Caustic.hlsl (modified) (1 diff)
• GameTools_Localized_EnvMap.hlsl (modified) (1 diff)
• _oldGameTools_DepthShadow.hlsl (added)

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

@@ -10 +10 @@
         float2 center           : TEXCOORD2;
         float4 position         : TEXCOORD3;
+        float pSize                     : PSIZE;
+        float dist                      : TEXCOORD4;
 };
 
@@ -24 +26 @@
      
    float radius = CauSpriteSize;
-   float2 offset = 2.0 * texCoord.zw * radius;
-   
+   OUT.pSize = radius;
    float4 cPosition;  
 
-   float4 pos = tex2Dlod(PhotonHitMap, float4(position.x, 1.0 - position.y,0,0)).rgba;
+  float4 pos = tex2Dlod(PhotonHitMap, float4(position.x, 1.0 - position.y,0,0)).rgba;
+//      float4 pos = float4(0,0,-0.5,1);
    if(pos.a == 0)//no photon hit
    {
@@ -40 +42 @@
                 cPosition = mul(worldView, wPosition);
                 OUT.center = cPosition.xy;
-                cPosition.xy += offset;                         
                 OUT.position = cPosition;       
-                OUT.hPosition = mul(Proj, cPosition);
-                
-                /* 
-                //rotate to camera
-                cPosition = mul(worldView, wPosition);
-                                
-                float3 C = cPosition.xyz;
-                float3 right = cross(C, float3(0,1,0));
-                float3 up = cross(right, C);
-                
-                float3 cOffset = offset.x * right + offset.y * up;
-                cPosition.xy += float2(-0.5/resolution, -0.5/resolution);
-                OUT.center = cPosition.xy;
-                cPosition.xyz += cOffset;                               
-                OUT.position = cPosition;       
-                OUT.hPosition = mul(Proj, cPosition);
-                */
+                OUT.hPosition = mul(Proj, cPosition);           
          }      
   
-   OUT.r.x = abs(offset.x);
+   OUT.r.x = radius;
    OUT.r.y = radius;
    OUT.texCoord = texCoord;
-   OUT.color = 1;       
+   OUT.color = 1; 
+   OUT.color = float4(pos);
+   OUT.dist = length(pos.xyz);
    
    return OUT;
@@ -71 +58 @@
 
 float4 CauPS(VS_OUT IN,
+                uniform float3 color,
                 uniform sampler2D intensityTex : register(s1)
                  ):COLOR
 {
 
-  float2 texcoord = (IN.center - IN.position.xy) / IN.r.x;
-  texcoord = (texcoord + 1.0) * 0.5;
-  float intens = tex2D(intensityTex, texcoord).r;
-  IN.color = intens * CauSpriteIntens;
- 
-  return IN.color;
-  
+ // float2 texcoord = (IN.center - IN.position.xy) / IN.r.x;
+ // texcoord = (texcoord + 1.0) * 0.5;
+  IN.color.rgb = color;
+  float intens = tex2D(intensityTex, IN.texCoord).r;
+  IN.color.a = intens * CauSpriteIntens;
+  return IN.color;  
 }
 

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

@@ -40 +40 @@
         float dist = readDistanceCubeMap(distanceCube, dir);
         
-        float EPSILON = 0.1;
+        float EPSILON = 1.0;
 
-        //if(mydist > dist + EPSILON) caustic = 0;
-         caustic *= max(attenuation - mydist, 0) / attenuation;
-                
+        if(mydist > dist + EPSILON) caustic = 0;
+        //caustic.rgb *= max(attenuation - mydist, 0.0) / attenuation;
+                        
         Color = caustic;
-                
+        Color += attenuation;
+        Color.a = 1;    
         return Color;
 }

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

@@ -24 +24 @@
 {
         float4 color = texCUBE( cm, float3(coord.xy, - coord.z) );
+        color.a = 1;
         return color;
 }