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

Timestamp:

10/27/06 17:40:02 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• programs/GameTools_Blur.hlsl (modified) (2 diffs)
• programs/GameTools_CauCube.hlsl (modified) (3 diffs)
• programs/GameTools_DepthShadow.hlsl (modified) (1 diff)
• programs/GameTools_Localized_EnvMap.hlsl (modified) (4 diffs)
• scripts/GameTools.material (modified) (2 diffs)
• scripts/GameTools.program (modified) (1 diff)
• scripts/GlassHead.material (modified) (4 diffs)
• scripts/kupola.material (modified) (2 diffs)

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

@@ -1 @@
-#define samplesU 5
-#define samplesV 5
+#define samplesU 3
+#define samplesV 3
 
 struct VS_INPUT {           
@@ -39 +39 @@
   return tex2D(Texture, uv);
 }
+
+VS_OUTPUT BlurCubeFaceVS(VS_INPUT IN) {
+        VS_OUTPUT OUT;
+    OUT.hPosition = IN.Position;   
+    OUT.Position = OUT.hPosition;
+    return OUT;
+}
+
+float4 BlurCubeFacePS(VS_OUTPUT IN,
+                        uniform samplerCUBE Texture : register(s0),
+                        uniform float width,
+                        uniform float height,
+                        uniform float face ) : COLOR
+{  
+
+  float2 pixel = float2(2.0 / width, 2.0 / height);
+  float2 uv = IN.Position + pixel * 0.5;
+
+  float4 sum = float4(0,0,0,0);
+
+        for(int i = 0; i < samplesU; i++)
+         for(int j = 0; j < samplesV; j++)
+         {
+                float3 dir;
+                float2 pos = uv + float2(i - samplesU * 0.5,j - samplesV * 0.5) * pixel;
+                if (face == 0) dir = float3(1, pos.y, -pos.x);
+                if (face == 1) dir = float3(-1, pos.y, pos.x);
+                if (face == 2) dir = float3(pos.x, 1, -pos.y);
+                if (face == 3) dir = float3(pos.x, -1, pos.y);
+                if (face == 4) dir = float3(pos.x, pos.y, 1);
+                if (face == 5) dir = float3(-pos.x, pos.y,-1);
+                
+                sum += texCUBE(Texture, dir);
+         }
+                
+
+  sum /= samplesU * samplesV;
+
+  return sum;
+  //return texCUBE(Texture, float3(uv, 1)) + face * 0.0000001;
+}

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

@@ -23 +23 @@
    {
                 OUT.color = float4(0,0,0,0);            
-                OUT.hPosition = float4(0, 0, 1000000, 1);
+                OUT.hPosition = float4(0, 0, -1000000, 1);
    }
    else
@@ -43 +43 @@
                         sumdist += dist;
                         valids++;
-                }
+                }                       
                 
                 float4 pos2 = tex2Dlod(PhotonHitMap, float4(uv + float2(-pixel, pixel),0,0));
@@ -68 +68 @@
                         valids++;
                 }
-                                
-                float avrdist = sumdist / 4;//valids;
-                float maxdist = 1;
-                intensity = max(maxdist - avrdist, 0.0) / maxdist;
-                
+                //if(valids == 0) sumdist = 100000;             
+                float avrdist = sumdist / valids;
+                //float maxdist = 10;
+                //intensity = max(maxdist - avrdist, 0.0) / maxdist;
+                intensity = 60.0 / (avrdist * avrdist * 3.14);
                 //intensity = valids / 4.0;//avrdist;
                 

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

@@ -80 +80 @@
         float bias = 0.001;
         float4 light = float4(1,1,1,1);
-        float4 shadow = float4(0.85,0.85,0.85,1);
+        float4 shadow = float4(0.25,0.25,0.25,1);
         //float4 shadow = float4(0,0,0,1);
         

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

@@ -47 +47 @@
 }*/
 
-
-
-
+#define LIN_ITERATIONCOUNT 8
+#define SECANT_ITERATIONCOUNT 3
+
+float3 Hit(float3 x, float3 R, samplerCUBE mp)
+{
+        R = normalize(R);
+        float3 xNorm = normalize(x);
+        float3 dt = (R - xNorm) / (float) LIN_ITERATIONCOUNT;
+        //float3 pN = normalize(cross(R, xNorm));
+        //float3 N = normalize(cross(pN,R));
+        //float d = dot(x, N);
+        
+        float3 under = x;
+        float3 over = R;
+        float dUnder = readDistanceCubeMap( mp, x);
+        float dOver = readDistanceCubeMap( mp, R);
+        
+        for(int i = 0; i < LIN_ITERATIONCOUNT; i++)
+        {
+                float3 dir = normalize(x + dt * i);
+                float dist = readDistanceCubeMap( mp, dir);
+                float3 point = dir * dist;
+                
+                float t = length(x) / dot(dir,xNorm);
+                
+                if(dist > t) //undershooting
+                {
+                        under = normalize(point);
+                        dUnder = dist;
+                }
+                else                            //overshooting
+                {
+                        over = normalize(point);
+                        dOver = dist;
+                        i = LIN_ITERATIONCOUNT;
+                }
+                
+        /*
+                
+                if( dot(N, point) > d)//undershooting
+                        under = normalize(point);
+                else                            //overshooting
+                {
+                        over = normalize(point);
+                        i = LIN_ITERATIONCOUNT;
+                }
+        */
+        }
+        
+        float r1 = length(x) * ctan(acos(dot(under, xNorm)));
+        float r2 = length(x) * ctan(acos(dot(over, xNorm)));
+        float rl = dUnder;
+        
+        float ppp = dOver /  readDistanceCubeMap( mp, x);                       // |p|/|p’|
+        float dun = 0, pun = ppp, dov = 0, pov = 0;
+        float dl = rl * ( 1 - ppp );                                                    // eq. 2
+        float3 l = x + R * dl;                                                                  // ray equation
+        
+        for( int i = 0; i < SECANT_ITERATIONCOUNT; i++ )
+        {
+                float llp = length( l ) / readDistanceCubeMap( mp, l);          // |l|/|l’|
+                if ( llp < 0.999f )                                                                     // undershooting
+                {
+                        dun = dl; pun = llp;                                                    // last undershooting
+                        dl += ( dov == 0 ) ? rl * ( 1 - llp ) :                 // eq. 2
+                                ( dl - dov ) * ( 1 - llp ) / ( llp - pov );     // eq. 3
+                } else if ( llp > 1.001f )                                                      // overshooting
+                {
+                        dov = dl; pov = llp;                                                    // last overshooting
+                        dl += ( dl -dun ) * ( 1 - llp ) / ( llp - pun );// eq. 3
+                }
+                l = x + R * dl;                                                                         // ray equation
+        }
+        
+        return (under + over)/2.0;
+}
+
+/*
 // This function is called several times.
 float3 Hit( float3 x, float3 R, samplerCUBE mp )
@@ -78 +153 @@
         return l;                                                                                               // computed hit point
 }
+*/
 
 void LocalizedVS(float4 position : POSITION,
@@ -163 +239 @@
         newTexCoord = R;        
         
-        //newTexCoord = Hit(mPos, R, DistanceMap);
-        
-        Color = readCubeMap(CubeMap, newTexCoord ) + lastCenter.x*0.000001;     
+        newTexCoord = Hit(mPos, R, DistanceMap);
+        
+        Color = readCubeMap(CubeMap, newTexCoord ) /*+ lastCenter.x*0.000001*/; 
         
         float ctheta_in = dot(mNormal,R);
@@ -235 +311 @@
         newTexCoord = Hit(mPos, R, DistanceMap);
                 
-        Color = float4(normalize(newTexCoord),1);
+        Color = float4(newTexCoord, 1);
         
         //Color = 0.0001 * Color +  float4(0,0,1,1);

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

@@ -116 +116 @@
                 pass
                 {
-                        ambient 0.3 0.3 0.4
-                        diffuse 0.9 0.9 1.0
+                        ambient 0.8 0.8 0.8
+                        diffuse 0.0 0.0 0.0
+                        specular 0.0 0.0 0.0
                         //lighting off
                         IllumTechniques
                         {                       
-                                //RenderTechnique CausticReciever
+                                RenderTechnique CausticReciever
+                                {
+                                        max_caster_count        10
+                                }
+                                //RenderTechnique DepthShadowReciever
                                 //{
-                                //      max_caster_count        10
-                                //}
-                                RenderTechnique DepthShadowReciever
-                                {
-                                }                               
-                        }               
+                                
+                                //}                     
+                        }
+                        texture_unit
+                        {
+                                texture rockWall.tga
+                        }
+                                
                 }
         }
@@ -302 +309 @@
 }
 
+material GameTools/BlurCubeFace
+{ 
+
+   technique 
+   { 
+      
+      pass 
+      {                 
+                vertex_program_ref GameTools/BlurCubeFaceVS
+        {       
+                     
+            } 
+                fragment_program_ref  GameTools/BlurCubeFacePS
+        { 
+                        param_named_auto width viewport_width
+                        param_named_auto height viewport_height
+                        param_named face float 0
+        }
+        texture_unit
+        {
+                        filtering bilinear
+        }
+        
+       }
+    }
+}
+
 vertex_program PhaseVS hlsl
 {

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

@@ -10 +10 @@
         source GameTools_Blur.hlsl
         entry_point BlurPS
+        target ps_3_0
+} 
+
+vertex_program GameTools/BlurCubeFaceVS hlsl
+{
+        source GameTools_Blur.hlsl
+        entry_point BlurCubeFaceVS
+        target vs_2_0
+} 
+
+fragment_program GameTools/BlurCubeFacePS hlsl
+{
+        source GameTools_Blur.hlsl
+        entry_point BlurCubeFacePS
         target ps_3_0
 } 

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

@@ -50 +50 @@
                     param_named_auto resolution viewport_width
                     //param_named CauSpriteSize float 10.0          
-                    param_named CauSpriteSize float 70.0            
+                    param_named CauSpriteSize float 20.0            
                 } 
                 fragment_program_ref  GameTools/CauPS
@@ -131 +131 @@
                         RenderTechnique ColorCubeMap
                         {
-                                update_interval         1
+                                update_interval         0
                                 update_all_face true
                                 distance_calc true 3.5                                  
@@ -137 +137 @@
                         RenderTechnique DistanceCubeMap
                         {
-                                update_interval         1
+                                update_interval         0
                                 update_all_face true
                                 distance_calc true 3.5                                          
@@ -144 +144 @@
                         {
                                 attenuation     0
-                                photonmap_resolution 32
-                                caustic_cubemap_resolution 512  
-                                //caustic_map_material          GameTools/CauTri
-                                //use_triangles true                            
+                                photonmap_resolution 128
+                                caustic_cubemap_resolution 256  
+                                caustic_map_material    GameTools/CauTri
+                                use_triangles   true
+                                blur_caustic_cubemap true                               
                         }
                         

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

@@ -15 +15 @@
                         //      max_caster_count        10
                         //}
-                        RenderTechnique DepthShadowReciever
-                        {
-                                
-                        }
+                        //RenderTechnique DepthShadowReciever
+                        //{
+                        //      
+                        //}
                 }
                 
@@ -69 +69 @@
                                 //      max_caster_count        10
                                 //}
-                                RenderTechnique DepthShadowReciever
-                                {
-                                        
-                                }
+                                //RenderTechnique DepthShadowReciever
+                                //{
+                                //      
+                                //}
                         }