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

Timestamp:

12/07/06 20:27:30 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• programs/MetalTeapotNew.hlsl (modified) (7 diffs)
• scripts/MetalTeapot.material (modified) (1 diff)

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

@@ -13 +13 @@
 }
 
-#define MAX_LIN_ITERATIONCOUNT 80
-#define MIN_LIN_ITERATIONCOUNT 30
+#define MAX_LIN_ITERATIONCOUNT 40  //80
+#define MIN_LIN_ITERATIONCOUNT 20  //60
 #define SECANT_ITERATIONCOUNT 2
-#define MAX_RAY_DEPTH 4
-
+#define MAX_RAY_DEPTH 5
+
+/*
 void linearSearch(  float3 x, float3 R, float3 N, samplerCUBE mp,
                     out float3 p,
@@ -61 +62 @@
    t += dt;  
  }
- 
+
  if(!overshoot)
   p = float3(0,0,0);
-/* else if(t == 2 * dt)
+}
+*/
+
+
+void linearSearch(  float3 x, float3 R, float3 N, samplerCUBE mp,
+                    out float3 p,
+                    out float dl,
+                    out float dp,
+                    out float llp,
+                    out float ppp)
+{
+ float3 Ra = abs(R), xa = abs(x);
+ float xm =  max(max(xa.x,xa.y),xa.z);
+ float Rm = max(max(Ra.x,Ra.y),Ra.z);
+ float a = xm / Rm;
+ 
+ int shootL = 0, shootP = 0;          
+ bool found = false; 
+ 
+ float dt =  length(x / xm - R / Rm) * MAX_LIN_ITERATIONCOUNT;
+ dt = max(dt, MIN_LIN_ITERATIONCOUNT);
+ dt = 1.0 / dt;
+    
+ float t = 0.01;//dt;
+ float pa;
+ 
+ //Linear iteration
+ while(t <= 1.0 && !found)
  {
-         float3 hitp = pa * normalize(p);
-    if(dot(normalize(hitp - x), N) < 0.1f)
-           p = float3(0,0,0);
- }*/
-}
+   dp = a * t / (1 - t);
+   p = x + R * dp;
+   pa = readDistanceCubeMap(mp, p);
+      
+   if(pa > 0)
+   {
+    ppp = length(p) / pa;
+    if(ppp < 1)
+      shootP = -1;
+    else 
+      shootP = 1;      
+    if(shootL * shootP == -1)
+      found = true;
+    else
+    {
+      shootL = shootP;
+      dl = dp;
+      llp = ppp;
+    }
+   }
+   else
+     shootL = 0;
+      
+   t += dt;  
+ }
+
+ if(!found)
+  p = float3(0,0,0);
+}
+
 
 void secantSearch(float3 x, float3 R, samplerCUBE mp, 
@@ -220 +273 @@
          float4 I = float4(0,0,0,0);
                         
-         float3 N = normalize(IN.mNormal);// * refIndex;
-         float3 newTexCoord;    
+         float3 N = normalize(IN.mNormal);
          float3 x = IN.wPos - lastCenter;
          float3 V  = (IN.wPos - cameraPos);
@@ -231 +283 @@
          while(depth < MAX_RAY_DEPTH)
          {
-           float3 R;
-          // float refIndex = length(N);
-          // refIndex = 1.0 / refIndex;
-          // N = normalize(N);
-           
-           //if(refIndex > 100.0)
-            R = normalize(reflect( V, N));
-          // else
-          //  R = normalize(refract( V, N, refIndex));
+           float3 R;  
+           //  R = normalize(reflect( V, N));     
+          
+          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;
@@ -246 +301 @@
            if(Il.a == 0)
            {
-                   depth += 1;
-                  // I = float4(0.2,0.2,0.2,1.0);
+                   depth += 1;           
            }
            else
@@ -256 +310 @@
            x = l;          
            N = normalize(Nl);
-           V = R;
-           
-          //if(refIndex <= 100.0)
-            if(dot(N, V) > 0) N = -N;
+           V = R;                  
         }
+        /*
+        N = normalize(IN.mNormal);
+        x = IN.wPos - lastCenter;
+        V  = (IN.wPos - cameraPos);
+        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 * 0.2 + I * 0.8;
+                   depth = MAX_RAY_DEPTH;
+           }
+           x = l;          
+           N = Nl;
+           V = R;   
+        }*/
         
         //if(I.a == 0)
@@ -282 +359 @@
          Color = SingleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex);
         else
-         Color = MultipleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap2,NormDistMap2,lastCenter,refIndex);
+         Color = MultipleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex);
          
         return Color;

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

@@ -196 +196 @@
                         param_named F0 float3 0.95 0.95 0.95
                         param_named SingleBounce float 0.0
-                        param_named refIndex float 200                  
+                        param_named refIndex float 0.909                        
                 }