Changeset 2095 for GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPAdvancedEnvMap/multibounce/GTPMultipleReflection.hlsl

Timestamp:

02/05/07 17:43:39 (17 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPAdvancedEnvMap/multibounce/GTPMultipleReflection.hlsl (modified) (4 diffs)

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPAdvancedEnvMap/multibounce/GTPMultipleReflection.hlsl

@@ -11 +11 @@
 }
 
-#define MAX_LIN_ITERATIONCOUNT 30  //80
-#define MIN_LIN_ITERATIONCOUNT 20  //60
+#define MAX_LIN_ITERATIONCOUNT 50  //80
+#define MIN_LIN_ITERATIONCOUNT 15  //60
 #define SECANT_ITERATIONCOUNT 1
-#define MAX_RAY_DEPTH 2
+#define MAX_RAY_DEPTH 4
 
 void linearSearch(  float3 x, float3 R, float3 N, samplerCUBE mp,
@@ -219 +219 @@
           V = normalize(V);
          
-         float F = sFresnel + pow(1 - dot(N, -V), 5) * (1 - sFresnel);   
-        
-         float3 l;
-         float4 Irefl;
+         float F;
          int depth = 0;
-        
-         while(depth < MAX_RAY_DEPTH)
-         {
-            float3 R;  
-           R = normalize(reflect( V, N));         
-                
-           float3 Nl;
-           float4 Il;
-           l = Hit(x, R, N, NormDistMap1, NormDistMap2, CubeMap, DistanceMap, Il, Nl);
-           if(Il.a == 0)
-           {
-                   depth += 1;           
-           }
-           else
-           {
-                   I = Il;
-                   depth = MAX_RAY_DEPTH;
-           }
-           x = l;          
-           N = Nl;
-           V = R;   
-           
-        }
-        if(I.a == 0)
-           I = readCubeMap(CubeMap, l);
-        Irefl = I;
-        
-        {
-        float4 Irefr;
-        N = normalize(IN.wNormal.xyz);
-        x = IN.wPos.xyz - lastCenter;
-        V  = (IN.wPos.xyz - cameraPos);
-        depth = 0;
+        F = sFresnel + pow(1 - dot(N, -V), 5) * (1 - sFresnel);  
         
         while(depth < MAX_RAY_DEPTH)
         {
           float3 R;  
-          
-          float ri = refIndex;
-         
+                 
+          float ri = refIndex;   
           if(dot(V,N) > 0)
           {
@@ -270 +234 @@
           }
           R = refract( V, N, ri);
-          if(dot(R,R) == 0) R = reflect( V, N); 
-                                        
+          if(dot(R,R) == 0) R = reflect( V, N);
+                                                
+          float3 Nl;
+          float4 Il;
+          float3 l = Hit(x, R, N, NormDistMap1, NormDistMap2, CubeMap, DistanceMap, Il, Nl);
+          if(Il.a == 0)
+          {
+                  //I = readCubeMap(CubeMap, l);
+                   depth += 1;           
+          }
+          else
+          {
+                   I = Il;
+                   depth = MAX_RAY_DEPTH;
+          }
+          x = l;           
+          N = normalize(Nl);
+          V = R;                   
+        }  
+            
+        I *= (1.0 - F); 
+    
+        return I;
+}
+
+float4 MultipleRefractionPhotonMap_PS(Shaded_OUT IN,
+                                                                        uniform samplerCUBE DistanceMap  : register(s0),
+                                                                        uniform samplerCUBE NormDistMap1 : register(s1),
+                                                                        uniform samplerCUBE NormDistMap2 : register(s2),
+                                                                        uniform samplerCUBE CubeMap      : register(s3), //NOT USED
+                                                                        uniform float3 cameraPos,
+                                                                        uniform float3 lastCenter,
+                                                                        uniform float refIndex) : COLOR0
+{
+         float4 I = 0;          
+         float3 N = normalize(IN.wNormal.xyz);
+         float3 x = IN.wPos.xyz - lastCenter;
+         float3 V  = (IN.wPos.xyz - cameraPos);
+         V = normalize(V);
+         
+        int depth = 0;
+        float3 l;
+        
+        while(depth < MAX_RAY_DEPTH)
+        {
+          float3 R;  
+                 
+          float ri = refIndex;   
+          if(dot(V,N) > 0)
+          {
+                ri = 1.0 / ri;
+                N = -N;     
+          }
+          R = refract( V, N, ri);
+          if(dot(R,R) == 0) R = reflect( V, N);
+                                                
           float3 Nl;
           float4 Il;
@@ -277 +295 @@
           if(Il.a == 0)
           {
-                   depth += 1;           
+                  depth += 1;            
           }
           else
           {
-                   I = Il;
-                   depth = MAX_RAY_DEPTH;
+                  I = Il;
+                  depth = MAX_RAY_DEPTH;
           }
           x = l;           
           N = normalize(Nl);
           V = R;                   
-        }
-        
+        }  
         if(I.a == 0)
-           I = readCubeMap(CubeMap, l);
-        Irefr = I;
-            
-        I = Irefl * F + (1.0 - F) * Irefr;      
-    }
-        return I;
-}
-
-float4 MultipleRefractionPhotonMap_PS(Shaded_OUT IN,
-                                                                        uniform samplerCUBE DistanceMap : register(s0),
-                                                                        uniform samplerCUBE NormDistMap1 : register(s1),
-                                                                        uniform samplerCUBE NormDistMap2 : register(s2),
-                                                                        uniform float3 cameraPos,
-                                                                        uniform float3 lastCenter,
-                                                                        uniform float refIndex) : COLOR0
-{
-        float4 I = float4(0,0,0,0);
-                 
-        float3 N = normalize(IN.wNormal.xyz);
-        float3 x = IN.wPos.xyz - lastCenter;
-        float3 V  = (IN.wPos.xyz - cameraPos);
-        V = normalize(V);
-        float3 l;
-        int depth = 0;
-                
-        while(depth < MAX_RAY_DEPTH)
-        {
-          float3 R;  
-          
-          float ri = refIndex;
-         
-          if(dot(V,N) > 0)
-          {
-                ri = 1.0 / ri;
-                N = -N;     
-          }
-          R = refract( V, N, ri);
-          if(dot(R,R) == 0) R = reflect( V, N); 
-                                        
-          float3 Nl;
-          float4 Il;
-          l = Hit(x, R, N, NormDistMap1, NormDistMap2, DistanceMap, DistanceMap, Il, Nl);
-          if(Il.a == 0)
-          {
-                   depth += 1;           
-          }
-          else
-          {
-                   I = Il;
-                   depth = MAX_RAY_DEPTH;
-          }
-          x = l;           
-          N = normalize(Nl);
-          V = R;                   
-        }
-        
-        return float4(l,1);
-}
+                I = 0;
+        else
+                I = float4(l,1);
+        
+        return I;
+}