Changeset 2054 for GTP/trunk/App/Demos/Illum/Ogre

Timestamp:

01/24/07 21:44:30 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• GTPAdvancedEnvMap/diffuse/GTPDiffuse.hlsl (added)
• GTPAdvancedEnvMap/diffuse/GTPDiffuse.material (added)
• GTPAdvancedEnvMap/diffuse/GTPDiffuse.program (added)
• GTPAdvancedEnvMap/multibounce/GTPMultipleReflection.hlsl (added)
• GTPAdvancedEnvMap/multibounce/GTPMultipleReflection_MinMax.hlsl (added)
• GTPAdvancedEnvMap/multibounce/MultiBounceShared.hlsl (added)
• GTPAdvancedEnvMap/multibounce/MultiBounceShared.material (added)
• GTPAdvancedEnvMap/multibounce/MultiBounceShared.program (added)
• GTPAdvancedEnvMap/multibounce/multipleReflection (added)
• GTPAdvancedEnvMap/multibounce/multipleReflection/GTPMultipleReflection.material (added)
• GTPAdvancedEnvMap/multibounce/multipleReflectionMinMax (added)
• GTPAdvancedEnvMap/multibounce/multipleReflectionMinMax/GTPMultipleReflectionMinMax.material (added)
• GTPAdvancedEnvMap/multibounce/multipleRefraction (added)
• GTPAdvancedEnvMap/multibounce/multipleRefraction/GTPMultipleRefraction.material (added)
• GTPAdvancedEnvMap/multibounce/multipleRefraction2L (added)
• GTPAdvancedEnvMap/multibounce/multipleRefraction2L/GTPMultipleRefraction2L.hlsl (added)
• GTPAdvancedEnvMap/multibounce/multipleRefraction2L/GTPMultipleRefraction2L.material (added)
• GTPAdvancedEnvMap/multibounce/multipleRefractionMinMax (added)
• GTPAdvancedEnvMap/multibounce/multipleRefractionPhotonMap (added)
• GTPAdvancedEnvMap/multibounce/multipleRefractionPhotonMapMinMax (added)
• GTPBasic/GTPBasic.program (modified) (2 diffs)
• GTPBasic/GTPBasic_VS.hlsl (modified) (2 diffs)
• GTPCaustic/GTPCaustic.hlsl (modified) (1 diff)
• GTPCaustic/GTPCaustic.material (modified) (4 diffs)
• GTPEnvMap/GTPEnvMap.hlsl (modified) (5 diffs)
• GTPEnvMap/GTPEnvMap.material (modified) (2 diffs)
• GTPParticles/GTP_Particles.material (modified) (1 diff)
• GTPParticles/GTP_Sprite.hlsl (modified) (2 diffs)
• GTPShaded (added)
• GTPShaded/GTPShaded.hlsl (added)
• programs/GameTools_DepthShadow.hlsl (modified) (3 diffs)
• programs/GameTools_Diffuse.hlsl (modified) (2 diffs)
• programs/MetalTeapotNew.hlsl (modified) (3 diffs)
• scripts/GameTools.material (modified) (1 diff)
• scripts/colorcube.material (modified) (1 diff)
• scripts/difflab.material (modified) (1 diff)
• scripts/kupola.material (modified) (2 diffs)

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

@@ -50 +50 @@
    entry_point VPos
    target vs_1_1
+}
+
+vertex_program GTP/Basic/MPos_VS hlsl
+{
+   source GTPBasic_VS.hlsl
+   entry_point MPos
+   target vs_1_1
+}   
+
+vertex_program GTP/Basic/MPos_NoTransform_VS hlsl
+{
+   source GTPBasic_VS.hlsl
+   entry_point MPos_NoTransform
+   target vs_1_1
 }   
 
@@ -56 +70 @@
    source GTPBasic_VS.hlsl
    entry_point CPos
+   target vs_1_1
+}
+
+vertex_program GTP/Basic/Shaded_CPos_VS hlsl
+{
+   source GTPBasic_VS.hlsl
+   entry_point Shaded_CPos_VS
    target vs_1_1
 }

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

@@ -153 +153 @@
 }
 
+struct MPos_OUT
+{
+ float4 VPos : POSITION;
+ float4 MPos : TEXCOORD0;
+};
+
+MPos_OUT MPos(float4 position : POSITION0,
+              uniform float4x4 WorldViewProj)
+{
+ MPos_OUT OUT;
+ OUT.VPos = mul(WorldViewProj, position);
+ OUT.MPos = position;
+ return OUT;
+}
+
+MPos_OUT MPos_NoTransform(float4 position : POSITION0)
+{
+ MPos_OUT OUT;
+ OUT.VPos = position;
+ OUT.MPos = position;
+ return OUT;
+}
 
 struct CPos_OUT
@@ -168 +190 @@
  OUT.CPos = mul(WorldView, position);
  return OUT;
+}
+
+struct Shaded_CPos_OUT
+{
+ float4 vPos : POSITION;
+ float4 wNormal : TEXCOORD0;
+ float4 wPos    : TEXCOORD1; 
+ float4 CPos    : TEXCOORD2;
+};
+
+Shaded_CPos_OUT Shaded_CPos_VS(float4 position : POSITION,
+                               float4 normal : NORMAL,
+                               uniform float4x4 WorldViewProj,
+                               uniform float4x4 World,
+                                       uniform float4x4 WorldView,
+                               uniform float4x4 WorldInv)
+{
+ Shaded_CPos_OUT OUT;
+ OUT.vPos = mul(WorldViewProj, position);
+ OUT.wPos = mul(World, position);
+ OUT.CPos = mul(WorldView, position);
+ OUT.wNormal = mul(normal, WorldInv);
+ return OUT; 
 }
 

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

@@ -256 +256 @@
 
         if(mydist > dist + EPSILON) caustic = 0;
-        //caustic.rgb *= max(attenuation - mydist, 0.0) / attenuation;
+        
+        caustic.rgb *= max(attenuation - mydist, 0.0) / attenuation;
                         
         Color = caustic;
-        Color += attenuation;
-        Color.a = 1;    
+        //Color += attenuation * 0.000000000001;
+        Color.a = 1;
+
         return Color;
 }

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

@@ -40 +40 @@
      param_named_auto WorldView     worldview_matrix
      param_named_auto Proj          projection_matrix
-     param_named CauSpriteSize      float 20.0
+     param_named CauSpriteSize      float 20
    } 
    fragment_program_ref GTP/Caustic/CauCube_PointSprite_PS
    {
-     param_named CausticColor float4          0.7 0.7 0.5 0.15
+     param_named CausticColor float4          0.7 0.7 0.5 0.3
    }
    texture_unit
@@ -96 +96 @@
                         {
                                 update_interval         0
-                                update_all_face true
-                                distance_calc true 3.5                                  
+                                update_all_face true                                                                    
                         }
                         RenderTechnique DistanceCubeMap
                         {
                                 update_interval         0
-                                update_all_face true
-                                distance_calc true 3.5                                          
+                                update_all_face true                                                                            
                         }
                         RenderTechnique CausticCaster
                         {
-                                attenuation     0
+                                attenuation     1000
                                 photonmap_resolution 32
                                 caustic_cubemap_resolution 256
@@ -118 +116 @@
                         
                  }      
-             vertex_program_ref GTP/Basic/ShadedTex_VS
+         vertex_program_ref GTP/Basic/ShadedTex_VS
          {       
             param_named_auto WorldViewProj worldviewproj_matrix 
@@ -124 +122 @@
             param_named_auto WorldInv inverse_world_matrix
          } 
-             fragment_program_ref GTP/EnvMap/Localized_Refraction_PS
+         fragment_program_ref GTP/EnvMap/Localized_Refraction_PS
          { 
                     param_named_auto cameraPos camera_position

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

@@ -25 +25 @@
 
         // iteration
-        for( int i = 0; i < SECANT_ITERATIONCOUNT; i++ )
+        for( int i = 0; i < SECANT_ITERATIONCOUNT ; i++ )
         {
                 float llp = length( l ) / readDistanceCubeMap( mp, l);          // |l|/|l’|
@@ -43 +43 @@
 }
 
-struct ShadedTex_OUT
+
+struct Shaded_OUT
 {
  float4 vPos : POSITION;
- float4 texCoord : TEXCOORD0;
- float4 wNormal : TEXCOORD1;
- float4 wPos    : TEXCOORD2;  
+ float4 wNormal : TEXCOORD0;
+ float4 wPos    : TEXCOORD1; 
 };
 
-float4 EnvMap_Default_PS(ShadedTex_OUT IN,
+
+float4 EnvMap_Default_PS(Shaded_OUT IN,
                                                 uniform samplerCUBE CubeMap : register(s0),
                                                 uniform float3 cameraPos) : COLOR0
@@ -62 +63 @@
 }
 
-float4  EnvMap_Localized_Reflection_PS( ShadedTex_OUT IN,
+float4  EnvMap_Localized_Reflection_PS( Shaded_OUT IN,
                                                                                 uniform samplerCUBE CubeMap : register(s0),
                                                                                 uniform samplerCUBE DistanceMap : register(s1),
@@ -82 +83 @@
 }
 
-float4  EnvMap_Localized_Refraction_PS( ShadedTex_OUT IN,
+float4  EnvMap_Localized_Refraction_PS( Shaded_OUT IN,
                                                                                 uniform samplerCUBE CubeMap : register(s0),
                                                                                 uniform samplerCUBE DistanceMap : register(s1),
@@ -111 +112 @@
 
 
-float4 EnvMap_LocalizedMetal_PS(  ShadedTex_OUT IN,
+float4 EnvMap_LocalizedMetal_PS(  Shaded_OUT IN,
                                                                         uniform samplerCUBE CubeMap : register(s0),
                                                                         uniform samplerCUBE DistanceMap : register(s1),

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

@@ -140 +140 @@
                                 update_interval         0
                                 update_all_face true
-                                distance_calc true 3.5                                  
+                                distance_calc false                                     
+                                face_angle_calc false
                         }
                         RenderTechnique DistanceCubeMap
@@ -146 +147 @@
                                 update_interval         0
                                 update_all_face true
-                                distance_calc true 3.5                                          
+                                distance_calc false
+                                face_angle_calc false
                         }                       
                  }      

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

@@ -31 +31 @@
    technique 
    { 
-        pass 
+    pass 
     {    
-         IllumTechniques
-                 { 
+        IllumTechniques
+        { 
                 RenderTechnique SphericalBillboard
-                        {
+                {
                                 texture_unit_id         1                                       
-                        }
-                 }        
-                 scene_blend src_alpha one
-                 //scene_blend src_alpha one_minus_src_alpha
-                 depth_write off
-                 depth_check off        
-                 vertex_program_ref GTP/Particles/SB_Sprite_VS
-             {       
-                param_named_auto worldView worldview_matrix
-                    param_named_auto Proj projection_matrix
-                    param_named_auto width viewport_width       
-                    param_named_auto height viewport_height 
-                 } 
-                 fragment_program_ref  GTP/Particles/SB_Sprite_PS
-             { 
-                param_named_auto farplane far_clip_distance       
-                    param_named_auto nearplane near_clip_distance
-                 }
-                 texture_unit
-                 {
-                   anim_texture smokealpha.tga 32 2.0
-                   //texture flare.png
-                 }
-                 //scene depth texture
-                 texture_unit
-                 {
-                   filtering none
-                 }      
-                 texture_unit
-                 {
-                   texture planck.tga
-                 }
+                }
+        }         
+        scene_blend src_alpha one
+        //scene_blend src_alpha one_minus_src_alpha
+        depth_write off
+        depth_check off 
+        vertex_program_ref GTP/Particles/SB_Sprite_VS
+        {       
+            param_named_auto worldView worldview_matrix
+            param_named_auto Proj projection_matrix
+            param_named_auto width viewport_width       
+            param_named_auto height viewport_height 
+        } 
+        fragment_program_ref  GTP/Particles/SB_Sprite_PS
+        { 
+            param_named_auto farplane far_clip_distance   
+            param_named_auto nearplane near_clip_distance
+            param_named color float4 3 3 3 1
+         }
+         texture_unit
+         {
+           anim_texture smokealpha.tga 32 2.0
+           //texture flare.png
+         }
+         //scene depth texture
+         texture_unit
+         {
+           filtering none
+         }      
+         texture_unit
+         {
+           texture planck.tga
+         }
     }
    }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPParticles/GTP_Sprite.hlsl

@@ -100 +100 @@
             uniform float nearplane,
             uniform float farplane,
-                uniform sampler2D colorTexture : register(s0),
-                uniform sampler2D DepthMap : register(s1),
-                uniform sampler2D PlanckMap : register(s2)
+            uniform float4 color,
+            uniform sampler2D colorTexture : register(s0),
+            uniform sampler2D DepthMap : register(s1),
+            uniform sampler2D PlanckMap : register(s2)
                 ) : COLOR
 {
@@ -137 +138 @@
         Color.rgb = tex2D( PlanckMap, Color.aa).rgb;
         
-        return Color; 
+        return Color * color; 
 }
 

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

@@ -113 +113 @@
 
 
+
 VS_OUT_SHADOW distShadowVS(float4 position : POSITION,  
                                                         uniform float4x4 worldViewProj,
@@ -128 +129 @@
 }
 
-
+/*
 float4 distShadowPS(VS_OUT_SHADOW IN,
                                         uniform float4x4 lightViewProj,
@@ -173 +174 @@
         
         return shadow + (1 - shadow) * light;
-}
-
+}*/
+
+float4 distShadowPS(VS_OUT_SHADOW IN,
+                                        uniform float4x4 lightViewProj,
+                                        uniform float lightFarPlane,
+                                        uniform sampler2D depthShadowMap : register(s0)
+                                        ):COLOR
+{       
+        float bias = 0.001;
+        float epsilon = 0.001;
+        float4 light = float4(1,1,1,1);
+        float4 shadow = float4(0.85,0.85,0.85,1);
+        
+        if(IN.lPosition.z > 0.0)
+        {
+                float4 pos = (IN.lPosition / IN.lPosition.w);
+                
+                float d = length(pos.xy);
+                        
+                light = saturate((1.0 - d)/0.05);
+                
+                if(d <= 1.0)
+                {
+                        float dist = length(IN.lVPosition.xyz) / lightFarPlane;
+                        pos.xy = (pos.xy + 1.0) / 2.0;
+                        pos.y = 1.0 - pos.y;
+                        float4 storedDist = tex2D(depthShadowMap, pos.xy);
+                        
+                light = storedDist.r + dist*0.000000000001;
+        
+                }
+                
+        }
+        else
+                light = 0;      
+        
+        return shadow + (1 - shadow) * light;
+}
 
 /*

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

@@ -1 +1 @@
 float REDUCED_CUBEMAP_SIZE;
+int CUBEMAP_SIZE = 128;
+int RATE = 32;
 
 float4 readCubeMap(samplerCUBE cm, float3 coord)                
@@ -13 +15 @@
         if(dist == 0) dist = 1000000; ///sky
         return dist;
+}
+
+
+/////
+/// Reduce cube map shader
+/////
+struct MPos_OUT
+{
+ float4 VPos : POSITION;
+ float4 MPos : TEXCOORD0;
+};
+
+float4 ReduceCubeMap_PS(MPos_OUT IN,
+                                                uniform int nFace,
+                                                uniform samplerCUBE EnvironmentMapSampler : register(s0) ) : COLOR
+{  
+   RATE = 32;
+   CUBEMAP_SIZE = 128;
+   float4 color = 0;
+   float3 dir;
+  
+   for (int i = 0; i < RATE; i++)
+     for (int j = 0; j < RATE; j++)
+    {
+                float2 pos;
+                pos.x = IN.mPos.x + (2*i + 1)/(float)CUBEMAP_SIZE;
+                pos.y = IN.mPos.y - (2*j + 1)/(float)CUBEMAP_SIZE;      // y=-u
+
+                // "scrambling"
+                if (nFace == 0) dir = float3(1, pos.y, -pos.x);
+                if (nFace == 1) dir = float3(-1, pos.y, pos.x);
+                if (nFace == 2) dir = float3(pos.x, 1, -pos.y);
+                if (nFace == 3) dir = float3(pos.x, -1, pos.y);
+                if (nFace == 4) dir = float3(pos.x, pos.y, 1);
+                if (nFace == 5) dir = float3(-pos.x, pos.y,-1);
+
+                color += texCUBE( EnvironmentMapSampler, dir);
+    }
+ 
+        return color / (RATE*RATE);             
 }
 

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

@@ -413 +413 @@
         return I;
 }
-
+/*
 float4 mainPS(VertOut IN,
                                                         uniform float3 cameraPos,
@@ -448 +448 @@
    return Color;
 }
-
-/*
+*/
+
 float4 mainPS(VertOut IN,
                                                         uniform float3 cameraPos,
@@ -486 +486 @@
          
         return Color;
-}*/
-
-/*
-float4 mainPS(VertOut IN,
-                                                        uniform float3 cameraPos,
-                                                        uniform samplerCUBE CubeMap : register(s0),
-                                                        uniform samplerCUBE DistanceMap : register(s1),
-                                                        uniform samplerCUBE NormDistMap1 : register(s2),
-                                                        uniform samplerCUBE NormDistMap2 : register(s3),
-                                                        uniform float3 lastCenter,
-                                                        uniform float SingleBounce,
-                                                        uniform float refIndex,
-                                                        uniform float4 min,
-                                                        uniform float4 min1,
-                                                        uniform float4 min2,
-                                                        uniform float4 max,
-                                                        uniform float4 max1,
-                                                        uniform float4 max2
-                                                        ):COLOR
-{
-  float2 miniMaxi1;
-  miniMaxi1.x = min1.a;
-  miniMaxi1.y = max1.a;
-   
-  float4 I = float4(0,0,0,0);
-                
-  float3 N = normalize(IN.mNormal);
-  float3 x = IN.wPos - lastCenter;
-  float3 V  = normalize(IN.wPos - cameraPos);
-  float3 R = normalize(reflect(V, N)); 
-         
-  float3 p;
-  float dl, dp, llp, ppp;   
-  linearSearch( x, R, N, NormDistMap1, miniMaxi1, p, dl, dp, llp, ppp);
-  if( dot(p, p) != 0 )
-  {
-    //secantSearch(x, R, NormDistMap1, dl, dp, llp, ppp, p);
-    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;     
-}*/
+}

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/scripts/GameTools.material

@@ -261 +261 @@
    technique 
    { 
-      scene_blend none
-
-      pass 
-      { 
-                cull_hardware anticlockwise
-                //cull_hardware none
+      
+      pass 
+      { 
+        scene_blend none
+
+        cull_hardware anticlockwise
+        //cull_hardware none
+        //cull_hardware clockwise
                 
-                vertex_program_ref GameTools/ShadowMap/DistVS
+        vertex_program_ref GameTools/ShadowMap/DistVS
         {       
           param_named_auto worldViewProj worldviewproj_matrix
           param_named_auto worldView worldview_matrix          
-            } 
-                fragment_program_ref  GameTools/ShadowMap/DistPS
+        } 
+        fragment_program_ref  GameTools/ShadowMap/DistPS
         { 
-                        param_named_auto farPlane far_clip_distance
+          param_named_auto farPlane far_clip_distance
         }
         

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/scripts/colorcube.material

@@ -6 +6 @@
                 {
                         //lighting off
-                        
+                        IllumTechniques
+                        {
+                                
+                                RenderTechnique CausticReciever
+                                {
+                                        max_caster_count        10                                      
+                                }                               
+                                RenderTechnique DepthShadowReciever
+                                {
+                                   max_light_count 1
+                                   vertex_program_name GameTools/ShadowMap/ShadowDistVS
+                                   fragment_program_name GameTools/ShadowMap/ShadowDistPS
+                                   set_light_view true
+                                   set_light_farplane true
+                                }
+                        }
+
                         texture_unit
                         {
                                 texture roomc.PNG
                                 tex_coord_set 0
-                                colour_op replace
+                                colour_op modulate
                         }
                 }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/scripts/difflab.material

@@ -192 +192 @@
                                         set_light_farplane true
                                 }
+                                RenderTechnique CausticReciever
+                                {
+                                        max_caster_count        3
+                                }       
                         }
                         

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/scripts/kupola.material

@@ -11 +11 @@
                 {
                         
-                        //RenderTechnique CausticReciever
-                        //{
-                        //      max_caster_count        10
-                        //}
+                        RenderTechnique CausticReciever
+                        {
+                                max_caster_count        10
+                        }
                         //RenderTechnique DepthShadowReciever
                         //{
@@ -65 +65 @@
                         {
                                 
-                                //RenderTechnique CausticReciever
-                                //{
-                                //      max_caster_count        10
-                                //}
+                                RenderTechnique CausticReciever
+                                {
+                                        max_caster_count        10
+                                }
                                 //RenderTechnique DepthShadowReciever
                                 //{