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

Timestamp:

09/26/06 09:47:54 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• GameTools_Cau.hlsl (modified) (1 diff)
• GameTools_CauCube.hlsl (modified) (3 diffs)
• GameTools_Localized_EnvMap.hlsl (modified) (2 diffs)

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

@@ -31 +31 @@
   float4 pos = tex2Dlod(PhotonHitMap, float4(position.x, 1.0 - position.y,0,0)).rgba;
 //      float4 pos = float4(0,0,-0.5,1);
+        
    if(pos.a == 0)//no photon hit
    {

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

@@ -16 +16 @@
      
   float4 cPosition;
-  float pixel = 1.0 / resolution;   
+  float pixel = 1.0 / 32.0;   
   float2 uv = float2(position.x, 1.0 - position.y);
   float4 pos = tex2Dlod(PhotonHitMap, float4(uv,0,0)).rgba;
@@ -23 +23 @@
    {
                 OUT.color = float4(0,0,0,0);            
-                OUT.hPosition = float4(0, 0, 100000000, 1);
+                OUT.hPosition = float4(0, 0, 1000000, 1);
    }
    else
@@ -31 +31 @@
                 OUT.hPosition = mul(Proj, cPosition);
                 
-                float intensity = 0.5;
+                float intensity = 0.25;
                 
                 //read four neighbours
-                float valids = 0;
                 float sumdist = 0;
                 float dist;
-                float4 pos1 = tex2Dlod(PhotonHitMap, float4(uv + float2(pixel, pixel),0,0)).rgba;
+                float valids = 0;
+                float4 pos1 = tex2Dlod(PhotonHitMap, float4(uv + float2(pixel, pixel),0,0));
                 if(pos1.a != 0)
                 {
                         dist = length(pos1.xyz - pos.xyz);
+                        sumdist += dist;
                         valids++;
-                        sumdist += dist;
                 }
-                float4 pos2 = tex2Dlod(PhotonHitMap, float4(uv + float2(-pixel, pixel),0,0)).rgba;
+                
+                float4 pos2 = tex2Dlod(PhotonHitMap, float4(uv + float2(-pixel, pixel),0,0));
                 if(pos2.a != 0)
                 {
                         dist = length(pos2.xyz - pos.xyz);
+                        sumdist += dist;
                         valids++;
-                        sumdist += dist;
                 }
-                float4 pos3 = tex2Dlod(PhotonHitMap, float4(uv + float2(pixel, -pixel),0,0)).rgba;
+                
+                float4 pos3 = tex2Dlod(PhotonHitMap, float4(uv + float2(pixel, -pixel),0,0));
                 if(pos3.a != 0)
                 {
                         dist = length(pos3.xyz - pos.xyz);
+                        sumdist += dist;
                         valids++;
-                        sumdist += dist;
                 }
-                float4 pos4 = tex2Dlod(PhotonHitMap, float4(uv + float2(-pixel, -pixel),0,0)).rgba;
+                
+                float4 pos4 = tex2Dlod(PhotonHitMap, float4(uv + float2(-pixel, -pixel),0,0));
                 if(pos4.a != 0)
                 {
                         dist = length(pos4.xyz - pos.xyz);
+                        sumdist += dist;
                         valids++;
-                        sumdist += dist;
                 }
-                
-                float avrdist = sumdist / valids;
-                float maxdist = 0.1;
+                                
+                float avrdist = sumdist / 4;//valids;
+                float maxdist = 1;
                 intensity = max(maxdist - avrdist, 0.0) / maxdist;
                 
-                OUT.color = float4(1,1,1,intensity);
+                //intensity = valids / 4.0;//avrdist;
+                
+                //OUT.color = float4(1,1,1,intensity);
+                OUT.color = intensity;
         }  
    

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

@@ -128 +128 @@
         
         float cos_theta = -dot(V, mNormal);
-        float sFresnel = 0.5;
+        float sFresnel = 0.1;
         float F = (sFresnel + pow(1-cos_theta, 5.0f) * (1-sFresnel));
     
@@ -229 +229 @@
         float3 V = normalize(wPos - cameraPos);
                 
-        float3 R = refract(V, mNormal, 0.9);            
+        float3 R = refract(V, mNormal, 0.85);           
         //float3 R = V; 
         newTexCoord = R;