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

Timestamp:

09/21/06 08:35:22 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• GameTools_HPS_Smoke_L.hlsl (modified) (4 diffs)
• GameTools_HPS_Smoke_L_Depth.hlsl (added)
• GameTools_HPS_Smoke_S.hlsl (modified) (5 diffs)
• GameTools_Phase.hlsl (added)
• GameTools_Smoke_IllumVolume.hlsl (added)

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

@@ -7 +7 @@
         float r                         : TEXCOORD2;    
         float4 center           : TEXCOORD3;
+        float4 Color            : TEXCOORD4;    
 };
 
 VS_OUT HPS_Smoke_L_VS (float4 position : POSITION,      
                 float4 texCoord : TEXCOORD0,
-                
+                float4 Color: COLOR0,
+                uniform float baseRadius,
                 uniform float4x4 worldView,
                 uniform float4x4 Proj,
@@ -17 +19 @@
 {
         VS_OUT OUT;
-  
-        float2 offset = texCoord.zw;
+    float2 offset = texCoord.zw * baseRadius;
         float4 cPosition;   
         cPosition = mul(worldView, position);
@@ -24 +25 @@
         cPosition.xy += offset;                         
         OUT.cPosition = cPosition;
-        OUT.r = abs(texCoord.z);                
+        OUT.r = abs(offset.x);          
  
     OUT.hPosition = mul( Proj, cPosition );
      
-    OUT.texCoord = texCoord.xy;    
+    OUT.texCoord = texCoord.xy;  
+    OUT.Color = Color;  
         return OUT;
 } 
@@ -39 +41 @@
         float4 Color = 0;
         Color = tex2D(Texture, IN.texCoord);
-        Color = float4(1, 1, 1, Color.a);
+        Color = float4(1, 1, 1, Color.a) * IN.Color;
         return Color; 
 }

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

@@ -7 +7 @@
         float r                         : TEXCOORD2;    
         float4 center           : TEXCOORD3;
+        float4 Color            : TEXCOORD4;
 };
 
 VS_OUT HPS_Smoke_S_VS (float4 position : POSITION,      
                 float4 texCoord : TEXCOORD0,
-                
+                float4 Color: COLOR0,
                 uniform float4x4 worldView,
                 uniform float4x4 Proj,
@@ -28 +29 @@
     OUT.hPosition = mul( Proj, cPosition );
      
-    OUT.texCoord = texCoord.xy;    
+    OUT.texCoord = texCoord.xy;
+    OUT.Color = Color;    
         return OUT;
 } 
@@ -42 +44 @@
         float alpha = 0;
                 
-        float d = length( IN.cPosition.xyz - IN.center.xyz);
+        float d = length( IN.cPosition.xy- IN.center.xy);
         
         if( d < IN.r )
@@ -53 +55 @@
          fPosition = mul(Proj, fPosition);
          bPosition = mul(Proj, bPosition);
-         f = (fPosition.z / fPosition.w + 1.0) / 2.0;
-         b = (bPosition.z / bPosition.w + 1.0) / 2.0;
+         f = fPosition.z / fPosition.w;
+         b = bPosition.z / bPosition.w;
          
          alpha = pow(w / IN.r, 4) * 0.5;                
@@ -63 +65 @@
         Color.r = b;
         Color.g = 1 - f;
-        Color.a = alpha;
+        Color.a = alpha * IN.Color.a;
         //Color.a = tex2D(Texture, IN.texCoord).a * 0.2;