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

Timestamp:

12/15/06 12:36:42 (18 years ago)

Author:

szirmay

Message:

 

File:

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

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

@@ -89 +89 @@
  dt = 1.0 / dt;
   
- float t = 0.01;//dt;
+ float t = 0.01;
  if(min > length(x))
  {
+ 
         float a = 1;
         float b = 2 * dot(R, x);
@@ -97 +98 @@
         
         float dis = b*b - 4*a*c;
-        float t1 = (-b + sqrt(dis))/ 2 * a;
-        float t2 = (-b - sqrt(dis))/ 2 * a;
+        float t1 = (-b + sqrt(dis))/ 2.0 * a;
+        float t2 = (-b - sqrt(dis))/ 2.0 * a;
         
         if(t1 > 0 && (t2 < 0 || t1 < t2))
-         t =  t1 / ( a + t1);
+         t =  1.0;//t1 / ( a + t1);
         else if(t2 > 0)
-         t =  t2 / ( a + t2);   
+         t =  1.0;//t2 / ( a + t2);
+         //t = 0.011;
   }
  
@@ -173 +175 @@
            samplerCUBE mp3Color,
            samplerCUBE mp3Dist,
+           float min,
            float min1,
                    float min2,             
@@ -192 +195 @@
  if(!valid1 && ! valid2)
  {
-    linearSearch(x, R, N, mp3Dist, 0, p, dl, dp, llp, ppp);
+    linearSearch(x, R, N, mp3Dist, min, p, dl, dp, llp, ppp);
     Il.a = 1; 
     secantSearch(x, R, mp3Dist, dl, dp, llp, ppp, p);
@@ -252 +255 @@
                                                         uniform float3 lastCenter,
                                                         uniform float refIndex,
+                                                        float min,
                                                         float min1,
                                                         float min2
@@ -276 +280 @@
  float3 Nl;
  float4 Il;
- float3 l = Hit(x, R, N, NormDistMap1, NormDistMap2, CubeMap, DistanceMap, min1, min2, Il, Nl);
+ float3 l = Hit(x, R, N, NormDistMap1, NormDistMap2, CubeMap, DistanceMap, min, min1, min2, Il, Nl);
  if(Il.a == 0)
   Il = readCubeMap(CubeMap, l);
@@ -293 +297 @@
                                                         uniform float3 lastCenter,
                                                         uniform float refIndex,
+                                                        float min,
                                                         float min1,
                                                         float min2)
@@ -318 +323 @@
            float3 Nl;
            float4 Il;
-           l = Hit(x, R, N, NormDistMap1, NormDistMap2, CubeMap, DistanceMap, min1, min2, Il, Nl);
+           l = Hit(x, R, N, NormDistMap1, NormDistMap2, CubeMap, DistanceMap, min, min1, min2, Il, Nl);
            if(Il.a == 0)
            {
@@ -333 +338 @@
            
         }
-        if(I.a == 0)
-           I = readCubeMap(CubeMap, l);
+/*      if(I.a == 0)
+           I = readCubeMap(CubeMap, l);*/
         Irefl = I;
         
@@ -363 +368 @@
                    float3 Nl;
                    float4 Il;
-                   l = Hit(x, R, N, NormDistMap1, NormDistMap2, CubeMap, DistanceMap, min1, min2, Il, Nl);
+                   l = Hit(x, R, N, NormDistMap1, NormDistMap2, CubeMap, DistanceMap, min, min1, min2, Il, Nl);
                    if(Il.a == 0)
                    {
@@ -396 +401 @@
                                                         uniform float SingleBounce,
                                                         uniform float refIndex,
+                                                        uniform float4 min,
                                                         uniform float4 min1,
                                                         uniform float4 min2
                                                         ):COLOR
 {
-    min1.x = 1.0 / min1.x;
-    min2.x = 1.0 / min2.x;
+   // min1.x = 1.0 / min1.x;
+   // min2.x = 1.0 / min2.x;
         float4 Color = 1.0;
         if(SingleBounce == 1)
-         Color = SingleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex, min1.x, min2.x);
+         Color = SingleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex, min.w, min1.w, min2.w);
         else
-         Color = MultipleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex, min1.x, min2.x);
+         Color = MultipleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex, min.w, min1.w, min2.w);
          
         return Color;