Changeset 1870 for GTP/trunk

Timestamp:

12/08/06 18:52:00 (18 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/App/Demos/Illum/Ogre/Media/materials/programs/MetalTeapotNew.hlsl (modified) (6 diffs)

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

@@ -13 +13 @@
 }
 
-#define MAX_LIN_ITERATIONCOUNT 40  //80
-#define MIN_LIN_ITERATIONCOUNT 20  //60
+#define MAX_LIN_ITERATIONCOUNT 80  //80
+#define MIN_LIN_ITERATIONCOUNT 60  //60
 #define SECANT_ITERATIONCOUNT 2
-#define MAX_RAY_DEPTH 5
+#define MAX_RAY_DEPTH 2
 
 /*
@@ -277 +277 @@
          float3 V  = (IN.wPos - cameraPos);
          
+         float Fp = 0.04;
+         float F = Fp + pow(1 - dot(N, -V), 5) * (1 - Fp);
+         
          V = normalize(V);
          float3 l;
-         
+         float4 Irefr;
          int depth = 0;
          while(depth < MAX_RAY_DEPTH)
          {
            float3 R;  
-           //  R = normalize(reflect( V, N));     
+           //R = normalize(reflect( V, N));
+             
           
           float ri = refIndex;
@@ -294 +298 @@
           }
           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;
@@ -312 +317 @@
            V = R;                  
         }
-        /*
+        if(I.a == 0)
+       I = readCubeMap(CubeMap, l);
+        Irefr = I;
+        
+        float4 Irefl;
         N = normalize(IN.mNormal);
         x = IN.wPos - lastCenter;
@@ -331 +340 @@
            else
            {
-                   I = Il * 0.2 + I * 0.8;
+                   I = Il;
                    depth = MAX_RAY_DEPTH;
            }
@@ -337 +346 @@
            N = Nl;
            V = R;   
-        }*/
+        }
         
-        //if(I.a == 0)
-      // I = readCubeMap(CubeMap, l);
-  
+        if(I.a == 0)
+       I = readCubeMap(CubeMap, l);
+    Irefl = I;
+    
+    I = Irefl * F + (1.0 - F) * Irefr;
         return I;
 }