Changeset 2294

Timestamp:

03/27/07 11:55:42 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• GTPBasic/GTPBasic.material (modified) (4 diffs)
• GTPBasic/GTPBasic.program (modified) (1 diff)
• GTPBasic/GTPBasicFSQuad.hlsl (added)
• GTPBasic/GTPBasic_PS.hlsl (modified) (2 diffs)
• GTPBasic/GTPBasic_VS.hlsl (modified) (1 diff)
• GTPBasic/GTPShadowMap_PS.hlsl (modified) (3 diffs)
• GTPParticles/GTP_Particles.particle (modified) (2 diffs)
• programs/GameTools_Cau.hlsl (deleted)
• programs/GameTools_CauCube.hlsl (deleted)
• programs/GameTools_Caustic.hlsl (deleted)
• programs/GameTools_CausticSoftShadow.hlsl (deleted)
• programs/GameTools_Depth.hlsl (deleted)
• programs/GameTools_DepthShadow.hlsl (deleted)
• programs/GameTools_Diffuse.hlsl (deleted)
• programs/GameTools_LocalizedBump_EnvMap.hlsl (deleted)
• programs/GameTools_Localized_EnvMap.hlsl (deleted)
• programs/GameTools_Phong.hlsl (modified) (2 diffs)
• programs/GameTools_PostProc.hlsl (deleted)
• programs/GameTools_ReduceCubeMap.hlsl (deleted)
• programs/GameTools_SoftShadow.hlsl (deleted)
• programs/GameTools_UV.hlsl (deleted)
• programs/MetalTeapot.hlsl (deleted)
• programs/MetalTeapotNew.hlsl (deleted)
• programs/kupola.hlsl (deleted)
• programs/textured.hlsl (deleted)

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPBasic/GTPBasic.material

@@ -44 +44 @@
   pass mainpass
   {
-   cull_hardware clockwise
+   cull_hardware none
    vertex_program_ref GTP/Basic/VPos_VS
    {  
@@ -69 +69 @@
 material GTP/Basic/CameraDepth
 {
- technique
- {
-  pass
+ technique maintechnique
+ {
+  pass mainpass
   {
    cull_hardware clockwise
@@ -86 +86 @@
 }
 
-material GTP/Basic/CameraDepthCCW : GTP/Basic/CameraDepthCCW
-{
- technique
- {
-  pass
-  {
-   cull_hardware anticlockwise
-   vertex_program_ref GTP/Basic/CPos_VS
-   {  
-     param_named_auto WorldViewProj worldviewproj_matrix
-     param_named_auto WorldView     worldview_matrix     
-   } 
-   fragment_program_ref GTP/Basic/CDepth_PS
-   {    
-   }   
+material GTP/Basic/CameraDepthCCW : GTP/Basic/CameraDepth
+{
+ technique maintechnique
+ {
+  pass mainpass
+  {
+   cull_hardware anticlockwise   
   }
  }
@@ -173 +165 @@
   {
         vertex_program_ref GTP/Basic/LightVPos_VS
-        {       
-            param_named_auto    World           world_matrix
-            param_named_auto    WorldViewProj   worldviewproj_matrix
-            param_named         LightViewProj   matrix4x4        
-        } 
+    {       
+            param_named_auto    World                   world_matrix
+        param_named_auto        WorldViewProj   worldviewproj_matrix
+            param_named                 LightViewProj   matrix4x4 1 0 0 0 0 1 0 0 0 0  1 0 0 0 0 1
+    } 
         fragment_program_ref  GTP/Basic/LightVPos_PS
-        { 
+    { 
            
-        }
+    }
   }
  }              

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPBasic/GTPBasic.program

@@ -144 +144 @@
    source GTPBasic_PS.hlsl
    entry_point PlainTex2D
+   target ps_2_0
+}
+
+fragment_program GTP/Basic/PlainTex2DColored_PS hlsl
+{
+   source GTPBasic_PS.hlsl
+   entry_point PlainTex2DColored
    target ps_2_0
 }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPBasic/GTPBasic_PS.hlsl

@@ -35 +35 @@
 {
  float4 pos = IN.VPosition / IN.VPosition.w;
- return float4(pos.z, pos.z * pos.z, 1, 1);     
+ return float4(pos.z, 0, 0, 1); 
 }
 
@@ -62 +62 @@
 
 float4 PlainTex2D(PlainTex_OUT IN,
-                uniform sampler2D Texture) : COLOR
+                                  uniform sampler2D Texture) : COLOR
 {
- return IN.color * tex2D(Texture, IN.texCoord.xy);
+ return tex2D(Texture, IN.texCoord.xy);
+}
+
+float4 PlainTex2DColored(PlainTex_OUT IN,
+                                        uniform float4 color,
+                                  uniform sampler2D Texture) : COLOR
+{
+ return color * tex2D(Texture, IN.texCoord.xy);
 }
 

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPBasic/GTPBasic_VS.hlsl

@@ -24 +24 @@
 
 PlainTex_OUT PlainTex_VS(float4 position : POSITION,
-                   float4 color : COLOR0,
+                                   float4 color : COLOR,
                    float4 texCoord : TEXCOORD0,
                    uniform float4x4 WorldViewProj)

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPBasic/GTPShadowMap_PS.hlsl

@@ -14 +14 @@
 #define DEPTH_BIAS      0.001
 #define DEPTH_BIAS_VSM  0.001
-#define DEPTH_EPSILON   0.0005
+#define DEPTH_EPSILON   0.05
 #define DIST_BIAS       0.005
 #define DIST_BIAS_VSM   0.05
 #define DIST_EPSILON    0.01
 
-#define shadowColor float4(0.9,0.9,0.9,1)
+//#define shadowColor float4(0.9,0.9,0.9,1)
+#define shadowColor float4(0.1,0.1,0.1,1)
 
 float4 shadowMapDepth(LightVPos_OUT IN,
@@ -26 +27 @@
   float4 light = shadowColor;     
         
-  if(IN.LightVPos.z > 0.0)
+ // if(IN.LightVPos.z > 0.0)
   {
         float4 pos = (IN.LightVPos / IN.LightVPos.w);
@@ -32 +33 @@
         pos.xy = (pos.xy + 1.0) / 2.0;
         pos.y = 1.0 - pos.y;
-        float4 storedDepth = tex2D(shadowMap, pos.xy);
-        light = max(storedDepth.r + DEPTH_BIAS >= pos.z, shadowColor);                  
+        float storedDepth = abs(tex2D(shadowMap, pos.xy).r);
+        //light = (pos.z - storedDepth.r)*100.0;
+        light = max(storedDepth + DEPTH_BIAS > pos.z, shadowColor);                     
   }             
   return light; 

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPParticles/GTP_Particles.particle

@@ -48 +48 @@
     quota           200
     sorted                      true
-    billboard_type  point
+    //billboard_type  point
     
     // Area emitter
@@ -90 +90 @@
     cull_each       false
     quota           400
-    billboard_type  point
+    //billboard_type  point
     
     // Area emitter

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

@@ -110 +110 @@
                 uniform float4x4 worldViewProj,
                 uniform float4x4 worldView,
-                uniform float4x4 worldViewIT)
+                uniform float4x4 worldViewI)
 {
   vertOUT OUT;
   OUT.hPos = OUT.hPosition = mul(worldViewProj, position);
   OUT.wPos = mul(worldView, position).xyz;  
-  OUT.mNormal = mul(worldViewIT, normal).xyz;
+  OUT.mNormal = mul(normal, worldViewI).xyz;
   //OUT.mNormal = normal;
   OUT.texCoord = texCoord;  
@@ -160 +160 @@
            uniform float4 diffuse,
            uniform float4 ambient,
-           uniform sampler2D colorTexture,
-           uniform float4x4 worldViewIT          
-
-            ) : COLOR0
+           uniform sampler2D colorTexture ) : COLOR0
 {