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

Timestamp:

11/09/06 08:57:54 (18 years ago)

Author:

szirmay

Message:

 

File:

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

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

@@ -15 +15 @@
 
 
-#define LIN_ITERATIONCOUNT 5
+#define LIN_ITERATIONCOUNT 2
 #define SECANT_ITERATIONCOUNT 2
 
@@ -63 +63 @@
         }
         
+        if(t >= 1 && undershoot)
+        {
+                t = 0.9999999999999;
+                dp = a * t / (1 - t);
+                p = x + R * dp;
+                float dist = readDistanceCubeMap(mp, p);
+                ppp = length(p) / dist;
+                overshoot = true;
+        }
+        
         if(overshoot)
         {
@@ -171 +181 @@
         float3 R = normalize(reflect( V, IN.mNormal));
                 
-        newTexCoord = R + 0.00000001 * lastCenter.x;    
-        //newTexCoord = R;      
-        //Hit(mPos, R, DistanceMap, newTexCoord);
+        //newTexCoord = R + 0.00000001 * lastCenter.x;  
+        newTexCoord = R;        
+        Hit(mPos, R, DistanceMap, newTexCoord);
         Color = readCubeMap(CubeMap, newTexCoord );     
         
@@ -221 +231 @@
         float d1 = Hit(mPos, R, NormDistMap1, newDir1);
         float3 normal1 = readCubeMap(NormDistMap1, newDir1);
+        bool valid1 = dot(normal1, R) < 0 && dot(newDir1,newDir1) != 0;
+        if(valid1)
+                newDir1 = 0;
         float3 newDir2;
         float d2 = Hit(mPos, R, NormDistMap2, newDir2);
         float3 normal2 = readCubeMap(NormDistMap2, newDir2);
-                
-        if( dot(newDir2,newDir2) == 0.0 && dot(newDir1,newDir1) == 0.0 )
+        bool valid2 = dot(normal2, R) < 0 && dot(newDir2,newDir2) != 0;
+        if(valid2)
+                newDir2 = 0;
+                
+        if( !valid1 && !valid2)
         {
                 Hit(mPos, R, DistanceMap, newTexCoord); 
-                Color = readCubeMap(CubeMap, newTexCoord );                     
+                Color = readCubeMap(CubeMap, newTexCoord );
+                //Color = 1;                    
         }
         else
-        {
-                float3 newV;
-                float3 newR;
-                float3 newN = normal1;
-                float3 dir = newDir1;
-                float d = d1;
-                float3 newX;
-                //closer hit
-                if(d1 > d2)
-                {
-                        dir = newDir2;
-                        d = d2;
-                        newN = normal2;
+        {               
+                float d;
+                float3 newN;
+                
+                d = d2;
+                newN = normal2;
+                
+                Color = float4(0,0,1,1);
+                if( !valid2 || (valid1 && d1 < d2)  )
+                {
+                        d = d1;
+                        newN = normal1;
+                        Color = float4(0,1,0,1);
                 }
-                newV = R;
-                newX = mPos + R * d;
-                newR = normalize(reflect( newV, newN));
+                
+                float3 newV = R;
+                float3 newX = mPos + R * d;
+                float3 newR = normalize(reflect( newV, newN));
                 
                 Hit(newX, newR, DistanceMap, newTexCoord);      
-                Color = readCubeMap(CubeMap, newTexCoord );             
+                Color = readCubeMap(CubeMap, newTexCoord );
+                //Color = float4(newR,1);
+                //Color = float4(1,0,0,1);      
         }
          
-        //Color = float4(newDir2,1);
+        return;
         
         float ctheta_in = dot(IN.mNormal,R);