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

Timestamp:

01/23/07 08:53:32 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• GameTools_Blur.hlsl (modified) (1 diff)
• GameTools_HPS_Smoke_L.hlsl (deleted)
• GameTools_HPS_Smoke_L_Depth.hlsl (deleted)
• GameTools_HPS_Smoke_S.hlsl (deleted)
• GameTools_Smoke_IllumVolume.hlsl (deleted)
• GameTools_Sprite.hlsl (deleted)
• HPS_ILLUM_L_PS.asm (deleted)
• MetalTeapotNew.hlsl (modified) (1 diff)
• _oldGameTools_DepthShadow.hlsl (deleted)

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

@@ -38 +38 @@
   return sum;
   return tex2D(Texture, uv);
+}
+
+float4 CopyPS(VS_OUTPUT IN,
+                        uniform sampler2D Texture : register(s0),
+                        uniform float alpha,
+                        uniform float width,
+                        uniform float height ) : COLOR
+{  
+  float2 pixel = float2(1.0 / width, 1.0 / height);
+  float2 uv = IN.Position + pixel * 0.5;
+
+  float4 Color = tex2D(Texture, uv);
+  Color.a = alpha;  
+  //Color = float4(0,0,0,1);
+  return Color;
 }
 

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

@@ -525 +525 @@
     I = readCubeMap(NormDistMap1, p);
   }
+<<<<<<< .mine
+I = max1 + 0.0000000000001 *x.x;
+=======
  I = max1 + 0.000000001 * x.x;
+>>>>>>> .r1994
   //I = readCubeMap(NormDistMap1, R)+0.00000000001*x.x; 
   return I;