Changeset 2550 for GTP/trunk/App/Demos/Illum/Ogre/Media

Timestamp:

09/05/07 10:54:23 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• Towers/parallax.hlsl (modified) (3 diffs)
• Towers/towers.material (modified) (2 diffs)
• materials/GTPBasic/GTPBasic.material (modified) (1 diff)
• materials/GTPBasic/GTPBasic.program (modified) (1 diff)
• materials/GTPBasic/GTPBasic_PS.hlsl (modified) (1 diff)
• materials/GTPBasic/GTPShadowMap_PS.hlsl (modified) (1 diff)
• materials/GTPEnvMap/GTPEnvMap.hlsl (modified) (2 diffs)
• materials/GTPEnvMap/GTPEnvMap.program (modified) (1 diff)

GTP/trunk/App/Demos/Illum/Ogre/Media/Towers/parallax.hlsl

@@ -14 +14 @@
         float det = B2 * T2 - BT * BT;
 
-        return float3x3( (B2 * Tangent - BT * Binormal)/det, 
-                         (T2 * Binormal - BT * Tangent)/det, 
-                         Normal/N2 );
+        //return float3x3( (B2 * Tangent - BT * Binormal)/det, 
+        //                 (T2 * Binormal - BT * Tangent)/det, 
+        //                 Normal/N2 );
                                                         
         // simplified solution
         //return float3x3(Tangent/T2, Binormal/B2, Normal/N2); 
         // more simplified solution
-        //return float3x3(Tangent, Binormal, Normal);
+        return float3x3(Tangent, Binormal, Normal);
 }
 
@@ -89 +89 @@
      
     // performing parallax mapping
-    float2 ParallaxTex = PARALLAX_MAPPING_ITER(BumpMapSampler, IN.TexCoord, tView);
+    float2 ParallaxTex = PARALLAX_MAPPING_OFFSET_LIMIT(BumpMapSampler, IN.TexCoord, tView);
         DISCARD_BY_TEX(ParallaxTex);
         
     // get model space normal vector
+    //ParallaxTex = IN.TexCoord;
     float3 tNormal = tex2D(BumpMapSampler, ParallaxTex).rgb;
         // Normal vector should be transformed with the inverse transpose of TangentToModel
@@ -98 +99 @@
     float3 mNormal = normalize( mul( tNormal, ModelToTangent ) ); 
         //mNormal = normalize(IN.wNormal);
+
     // illumination calculation
+
     return Illumination(mLight, mNormal, mView, ParallaxTex, IN.TexCoord2);
 }

GTP/trunk/App/Demos/Illum/Ogre/Media/Towers/towers.material

@@ -37 +37 @@
                         fragment_program_ref GTP/Demo/ParallaxMapped_PS
                         {
-                         param_named HEIGHT_SCALE float 0.16
+                         param_named HEIGHT_SCALE float 0.20
                          param_named HEIGHT_BIAS float -0.04                    
-                         param_named textureRepeat float 6
+                         param_named textureRepeat float 10
                         }
                         texture_unit color
@@ -173 +173 @@
                                 {
                                         max_light_count 1
-                                        vertex_program_name GTP/Basic/LightVPos_VS
-                                        fragment_program_name GTP/Basic/SM/Depth_VSM_PS
+                                        vertex_program_name GTP/Basic/LightCPos_VS
+                                        fragment_program_name GTP/Basic/SM/CameraDepth_PS
                                         set_light_viewproj true
-                                        set_light_view false
+                                        set_light_view true
                                         set_light_farplane false
                                         world_view_proj_param_name WorldViewProj
                                         world_param_name World
                                         light_viewproj_param_name LightViewProj                 
+                                        light_view_param_name LightView 
+                                        pass_blending one zero
                                 }       
 

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

@@ -73 +73 @@
   pass mainpass
   {
-   cull_hardware clockwise
+   cull_hardware none
    vertex_program_ref GTP/Basic/CPos_VS
    {  

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

@@ -172 +172 @@
    source GTPShadowMap_PS.hlsl
    entry_point shadowMapDepth
+   target ps_2_0
+}
+
+fragment_program GTP/Basic/SM/CameraDepth_PS hlsl
+{
+   source GTPShadowMap_PS.hlsl
+   entry_point shadowMapCameraDepth
    target ps_2_0
 }

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

@@ -41 +41 @@
                                 uniform float farplane) : COLOR
 {
+//return float4(0.5,0,0,0);
  return float4(-IN.CPos.z, -IN.CPos.z / farplane, 0, -IN.CPos.z);       
 }

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

@@ -40 +40 @@
   }             
   return light; 
+}
+
+float4 shadowMapCameraDepth(LightCPos_OUT IN,
+                      uniform sampler2D shadowMap) : COLOR
+{
+  float4 light = shadowColor;     
+        
+ 
+        float4 pos = (IN.LightVPos / IN.LightVPos.w);
+                
+        pos.xy = (pos.xy + 1.0) / 2.0;
+        pos.y = 1.0 - pos.y;
+        float storedDepth = tex2D(shadowMap, pos.xy).r;
+        //light = (pos.z - storedDepth.r)*100.0;
+        float depth = -IN.LightCPos.z;
+        light = max(storedDepth + DEPTH_BIAS > depth, shadowColor2);                    
+        return storedDepth;
+        return light;   
 }
 

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPEnvMap/GTPEnvMap.hlsl

@@ -63 +63 @@
 }
 
+float4 EnvMap_Refract_Default_PS
+                                        (Shaded_OUT IN,
+                                        uniform samplerCUBE CubeMap : register(s0),
+                                        uniform float3 cameraPos,
+                                        uniform float sRefraction,
+                                        uniform float transparency ) : COLOR0
+{
+        float3 N = normalize(IN.wNormal.xyz);
+        float3 V = normalize(IN.wPos.xyz - cameraPos);
+        float3 R = reflect( V, N);      
+        float3 R2 = refract( V, N, sRefraction);        
+        
+        return 0.5;//(1.0 - transparency) * readCubeMap(CubeMap, R ) + transparency * readCubeMap(CubeMap, R2);
+}
+
 float4  EnvMap_Localized_Reflection_PS( Shaded_OUT IN,
                                                                                 uniform samplerCUBE CubeMap : register(s0),
@@ -88 +103 @@
                                                                                 uniform float3 cameraPos,
                                                                                 uniform float3 lastCenter,              
-                                                                                uniform float sFresnel,
+                                                                                uniform float4 sFresnel,
                                                                                 uniform float sRefraction ) :COLOR0
 {

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

@@ -3 +3 @@
         source GTPEnvMap.hlsl
         entry_point EnvMap_Default_PS
+        target ps_2_0
+}
+
+fragment_program GTP/EnvMap/Default_Refract_PS hlsl
+{
+        source GTPEnvMap.hlsl
+        entry_point EnvMap_Refract_Default_PS
         target ps_2_0
 }