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

Timestamp:

09/28/06 11:21:44 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• GameTools_Diffuse.hlsl (modified) (4 diffs)
• GameTools_Localized_EnvMap.hlsl (modified) (2 diffs)

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

@@ -3 +3 @@
 float4 readCubeMap(samplerCUBE cm, float3 coord)                
 {
-        float4 color = texCUBE( cm, float3(coord.xy, - coord.z) );
+        float4 color = texCUBE( cm, float3(coord.xy, -coord.z) );
         color.a = 1;
         return color;
@@ -48 +48 @@
 ///////////////////
 
-float4 GetContibution(float3 L, float3 pos, float3 N, float3 V, samplerCUBE SmallEnvMapSampler, samplerCUBE DistanceEnvMapSampler)      // Phong-Blinn
-// L: a hossza lényeges (az egységkocka faláig ér)
-{
-    REDUCED_CUBEMAP_SIZE = 4;
+float4 GetContibution(float3 L1, float3 L2, float3 L3, float3 L4, float3 pos, float3 N, samplerCUBE SmallEnvMapSampler, float d)
+{
+/*
+        L1 = readDistanceCubeMap(DistanceEnvMapSampler, L1) * normalize(L1);
+        L2 = readDistanceCubeMap(DistanceEnvMapSampler, L2) * normalize(L2);
+        L3 = readDistanceCubeMap(DistanceEnvMapSampler, L3) *  normalize(L3);
+        L4 = readDistanceCubeMap(DistanceEnvMapSampler, L4) * normalize(L4);
+*/      
+
+        L1 = d * normalize(L1);
+        L2 = d * normalize(L2);
+        L3 = d *  normalize(L3);
+        L4 = d * normalize(L4);
+        
+        
+    float3 r1 = normalize(L1 - pos);    
+    float3 r2 = normalize(L2 - pos);
+    float3 r3 = normalize(L3 - pos);
+    float3 r4 = normalize(L4 - pos);
+   
     
         float kd = 0.3; // 0.3
-        float ks = 0.0; // 0.5
-        float shininess = 10;
-        
-        float l = length(L);
-        L = normalize(L);
-
-        //dw
-        float dw = 4 / (REDUCED_CUBEMAP_SIZE*REDUCED_CUBEMAP_SIZE*l*l*l + 4/3.1416f);
-        //Lin
-        float4 Lin = readCubeMap(SmallEnvMapSampler, L);
-        //r
-        float doy = readDistanceCubeMap(DistanceEnvMapSampler, L);
-        float dxy = length(L * doy - pos);      
-
-        //dws
-        float dws = (doy*doy * dw) / (dxy*dxy*(1 - dw/3.1416f) + doy*doy*dw/3.1416f);   // localization:
-        //float dws = dw;
-        
-        //L = L * doy - pos;    // L: x->y, az objektumtól induljon, ne a középpontból
-        L = normalize(L);
-        float3 H = normalize(L + V);    // felezõvektor
-
-        float a = kd * max(dot(N,L),0) + 
-                          ks * pow(max(dot(N,H),0), shininess); // diffuse + specular
-
-        // 1.: eddigi
-        //return Lin * a * dws;
-        
-        float ctheta_in = dot(N,L);
-        float ctheta_out = dot(N,V);    
-        
-        return Lin * a * dws;   
+        
+        float tri1 = acos(dot(r1, r2)) * dot(cross(r1, r2), N);
+        float tri2 = acos(dot(r2, r3)) * dot(cross(r2, r3), N);
+        float tri3 = acos(dot(r3, r4)) * dot(cross(r3, r4), N);
+        float tri4 = acos(dot(r4, r1)) * dot(cross(r4, r1), N);
+        
+        return max(tri1 + tri2 + tri3 + tri4, 0);       
 }
 
@@ -122 +113 @@
 {
     REDUCED_CUBEMAP_SIZE = 4;
-        
+        float width = 1.0 /REDUCED_CUBEMAP_SIZE;
+   
     //V = /*-*/normalize( V );
     float3 V = normalize(IN.wPos - cameraPos);  // 
-    float3 N = mul( float4(IN.mNormal,1), world_IT).xyz;
+        float3 N = mul( float4(IN.mNormal,1), world_IT).xyz;
     //float3 N = IN.mNormal;
     N = normalize( N ); 
@@ -132 +124 @@
      
     float4 intens = 0;
-   // intens = readCubeMap(SmallEnvMapSampler, pos);
+    //intens = readCubeMap(SmallEnvMapSampler, pos);
         
-        for (int x = 0; x < REDUCED_CUBEMAP_SIZE; x++)                  // az envmap minden texelére
-         for (int y = 0; y < REDUCED_CUBEMAP_SIZE; y++)
-         {
-                // intenzitás kiolvasása az adott texelbol 
-                
-                float2 p, tpos; 
-            tpos.x = x/(float)REDUCED_CUBEMAP_SIZE;     // 0..1
-            tpos.y = y/(float)REDUCED_CUBEMAP_SIZE;     // 0..1
-            tpos.xy += float2(0.5/REDUCED_CUBEMAP_SIZE, 0.5/REDUCED_CUBEMAP_SIZE);      // az adott texel középpont uv koordinátái
-            
-            p.x = tpos.x; 
-            p.y = 1-tpos.y;
-            p.xy = 2*p.xy - 1;  // -1..1        // az adott texel középpont pozíciója
-            
-            float3 L;
-            
+        float3 L1, L2, L3, L4, L;
+        float4 Le;
+        float d;
+           
+        for (int x = 0; x < REDUCED_CUBEMAP_SIZE - 1; x++)                      // az envmap minden texelére
+         for (int y = 0; y < REDUCED_CUBEMAP_SIZE - 1; y++)
+         {
+                float2 p, tpos; 
+            tpos.x = (x + 0.5) /(float)REDUCED_CUBEMAP_SIZE;    // 0..1
+            tpos.y = (y + 0.5) /(float)REDUCED_CUBEMAP_SIZE;    // 0..1
+            
+            p.x = tpos.x; 
+            p.y = 1-tpos.y;
+            p.xy = 2 * p.xy - 1;        // -1..1        // az adott texel középpont pozíciója
+                    
+                L1 = float3(p.x - width, p.y - width, 1);       
+                L2 = float3(p.x + width, p.y - width, 1);       
+                L3 = float3(p.x + width, p.y + width, 1);       
+                L4 = float3(p.x - width, p.y + width, 1);
                 L = float3(p.x, p.y, 1);
-                intens += GetContibution( L, pos, N, V, SmallEnvMapSampler, DistanceEnvMapSampler);
-                
+                Le = readCubeMap(SmallEnvMapSampler, L);
+                d = readDistanceCubeMap(DistanceEnvMapSampler, L);      
+                intens += 0.5 * Le * GetContibution( L1, L2, L3, L4, pos, N, SmallEnvMapSampler, d);
+        }       
+        
+        for (int x = 0; x < REDUCED_CUBEMAP_SIZE - 1; x++)                      // az envmap minden texelére
+         for (int y = 0; y < REDUCED_CUBEMAP_SIZE - 1; y++)
+         {
+                float2 p, tpos; 
+            tpos.x = (x + 0.5) /(float)REDUCED_CUBEMAP_SIZE;    // 0..1
+            tpos.y = (y + 0.5) /(float)REDUCED_CUBEMAP_SIZE;    // 0..1
+            
+            p.x = tpos.x; 
+            p.y = 1-tpos.y;
+            p.xy = 2 * p.xy - 1;        // -1..1        // az adott texel középpont pozíciója
+                
+                L4 = float3(p.x - width, p.y - width, -1);      
+                L3 = float3(p.x + width, p.y - width, -1);      
+                L2 = float3(p.x + width, p.y + width, -1);      
+                L1 = float3(p.x - width, p.y + width, -1);
                 L = float3(p.x, p.y, -1);
-                intens += GetContibution( L, pos, N, V, SmallEnvMapSampler, DistanceEnvMapSampler);
-                
+                Le = readCubeMap(SmallEnvMapSampler, L);
+                d = readDistanceCubeMap(DistanceEnvMapSampler, L);      
+                intens += 0.5 * Le * GetContibution( L1, L2, L3, L4, pos, N, SmallEnvMapSampler, d);
+        }
+        
+        for (int x = 0; x < REDUCED_CUBEMAP_SIZE - 1; x++)                      // az envmap minden texelére
+         for (int y = 0; y < REDUCED_CUBEMAP_SIZE - 1; y++)
+         {
+                float2 p, tpos; 
+            tpos.x = (x + 0.5) /(float)REDUCED_CUBEMAP_SIZE;    // 0..1
+            tpos.y = (y + 0.5) /(float)REDUCED_CUBEMAP_SIZE;    // 0..1
+            
+            p.x = tpos.x; 
+            p.y = 1-tpos.y;
+            p.xy = 2 * p.xy - 1;        // -1..1        // az adott texel középpont pozíciója
+                
+                L4 = float3(p.x - width, 1, p.y - width);
+                L3 = float3(p.x + width, 1, p.y - width);       
+                L2 = float3(p.x + width, 1, p.y + width);       
+                L1 = float3(p.x - width, 1, p.y + width);                       
                 L = float3(p.x, 1, p.y);
-                intens += GetContibution( L, pos, N, V, SmallEnvMapSampler, DistanceEnvMapSampler);
-                
+                Le = readCubeMap(SmallEnvMapSampler, L);
+                d = readDistanceCubeMap(DistanceEnvMapSampler, L);      
+                intens += 0.5 * Le * GetContibution( L1, L2, L3, L4, pos, N, SmallEnvMapSampler, d);
+        }
+        
+        for (int x = 0; x < REDUCED_CUBEMAP_SIZE - 1; x++)                      // az envmap minden texelére
+         for (int y = 0; y < REDUCED_CUBEMAP_SIZE - 1; y++)
+         {
+                float2 p, tpos; 
+            tpos.x = (x + 0.5) /(float)REDUCED_CUBEMAP_SIZE;    // 0..1
+            tpos.y = (y + 0.5) /(float)REDUCED_CUBEMAP_SIZE;    // 0..1
+            
+            p.x = tpos.x; 
+            p.y = 1-tpos.y;
+            p.xy = 2 * p.xy - 1;        // -1..1        // az adott texel középpont pozíciója
+                
+                L1 = float3(p.x - width, -1, p.y - width);
+                L2 = float3(p.x + width, -1, p.y - width);      
+                L3 = float3(p.x + width, -1, p.y + width);      
+                L4 = float3(p.x - width, -1, p.y + width);                      
                 L = float3(p.x, -1, p.y);
-                intens += GetContibution( L, pos, N, V, SmallEnvMapSampler, DistanceEnvMapSampler);
-                
+                Le = readCubeMap(SmallEnvMapSampler, L);
+                d = readDistanceCubeMap(DistanceEnvMapSampler, L);      
+                intens += 0.5 * Le * GetContibution( L1, L2, L3, L4, pos, N, SmallEnvMapSampler, d);
+        }
+        
+        for (int x = 0; x < REDUCED_CUBEMAP_SIZE - 1; x++)                      // az envmap minden texelére
+         for (int y = 0; y < REDUCED_CUBEMAP_SIZE - 1; y++)
+         {
+                float2 p, tpos; 
+            tpos.x = (x + 0.5) /(float)REDUCED_CUBEMAP_SIZE;    // 0..1
+            tpos.y = (y + 0.5) /(float)REDUCED_CUBEMAP_SIZE;    // 0..1
+            
+            p.x = tpos.x; 
+            p.y = 1-tpos.y;
+            p.xy = 2 * p.xy - 1;        // -1..1        // az adott texel középpont pozíciója
+                
+                L1 = float3(1, p.x - width, p.y - width);
+                L2 = float3(1, p.x + width, p.y - width);       
+                L3 = float3(1, p.x + width, p.y + width);       
+                L4 = float3(1, p.x - width, p.y + width);       
                 L = float3(1, p.x, p.y);
-                intens += GetContibution( L, pos, N, V, SmallEnvMapSampler, DistanceEnvMapSampler);
-                
+                Le = readCubeMap(SmallEnvMapSampler, L);
+                d = readDistanceCubeMap(DistanceEnvMapSampler, L);      
+                intens += 0.5 * Le * GetContibution( L1, L2, L3, L4, pos, N, SmallEnvMapSampler, d);
+        }
+        
+        for (int x = 0; x < REDUCED_CUBEMAP_SIZE - 1; x++)                      // az envmap minden texelére
+         for (int y = 0; y < REDUCED_CUBEMAP_SIZE - 1; y++)
+         {
+                float2 p, tpos; 
+            tpos.x = (x + 0.5) /(float)REDUCED_CUBEMAP_SIZE;    // 0..1
+            tpos.y = (y + 0.5) /(float)REDUCED_CUBEMAP_SIZE;    // 0..1
+            
+            p.x = tpos.x; 
+            p.y = 1-tpos.y;
+            p.xy = 2 * p.xy - 1;        // -1..1        // az adott texel középpont pozíciója
+                
+                L4 = float3(-1, p.x - width, p.y - width);
+                L3 = float3(-1, p.x + width, p.y - width);      
+                L2 = float3(-1, p.x + width, p.y + width);      
+                L1 = float3(-1, p.x - width, p.y + width);      
                 L = float3(-1, p.x, p.y);
-                intens += GetContibution( L, pos, N, V, SmallEnvMapSampler, DistanceEnvMapSampler);
-        } 
-
+                Le = readCubeMap(SmallEnvMapSampler, L);
+                d = readDistanceCubeMap(DistanceEnvMapSampler, L);      
+                intens += 0.5 * Le * GetContibution( L1, L2, L3, L4, pos, N, SmallEnvMapSampler, d);
+        }       
+        
+        
         //return float4(pos, 1);
         return intens;

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

@@ -362 +362 @@
             
             float3 L;
-            
+           
                 L = float3(p.x, p.y, 1);
                 intens += GetContibution( L, pos, N, V, SmallEnvMapSampler, DistanceEnvMapSampler);
@@ -382 +382 @@
         }
 
-        return intens+0.0001*lastCenter.x;
-}
+        return intens;
+}