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

Timestamp:

11/09/06 17:04:55 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• GameTools_Diffuse.hlsl (modified) (2 diffs)
• MetalTeapot.hlsl (modified) (7 diffs)

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

@@ -3 +3 @@
 float4 readCubeMap(samplerCUBE cm, float3 coord)                
 {
-        float4 color = texCUBE( cm, float3(coord.xy, -coord.z) );
+        float4 color = texCUBElod( cm, float4(coord.xy, -coord.z, 1) );
         color.a = 1;
         return color;
@@ -10 +10 @@
 float readDistanceCubeMap(samplerCUBE dcm, float3 coord)                
 {
-        float dist = texCUBE(dcm, float3(coord.xy, - coord.z)).r;
+        float dist = texCUBElod(dcm, float4(coord.xy, - coord.z, 1)).r;
         if(dist == 0) dist = 1000000; ///sky
         return dist;
 }
 
-// This function is called several times.
-float3 Hit( float3 x, float3 R, samplerCUBE mp )
-{
-        float rl = readDistanceCubeMap( mp, R);                         // |r|
-        
-        float ppp = length( x ) /  readDistanceCubeMap( mp, x);                 // |p|/|p’|
-        float dun = 0, pun = ppp, dov = 0, pov = 0;
-        float dl = rl * ( 1 - ppp );                                                    // eq. 2
-        float3 l = x + R * dl;                                                                  // ray equation
-
-        // iteration
-        for( int i = 0; i < 2; i++ )    // 2 !!!!!!!!!!!!!!!!!!!!!!!
-        {
-                float llp = length( l ) / readDistanceCubeMap( mp, l);          // |l|/|l’|
-                if ( llp < 0.999f )                                                                     // undershooting
-                {
-                        dun = dl; pun = llp;                                                    // last undershooting
-                        dl += ( dov == 0 ) ? rl * ( 1 - llp ) :                 // eq. 2
-                                ( dl - dov ) * ( 1 - llp ) / ( llp - pov );     // eq. 3
-                } else if ( llp > 1.001f )                                                      // overshooting
-                {
-                        dov = dl; pov = llp;                                                    // last overshooting
-                        dl += ( dl -dun ) * ( 1 - llp ) / ( llp - pun );// eq. 3
-                }
-                l = x + R * dl;                                                                         // ray equation
-        }
-        return l;                                                                                               // computed hit point
-}
 
 /////////////////////

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

@@ -3 +3 @@
 float4 readCubeMap(samplerCUBE cm, float3 coord)                
 {
-        float4 color = texCUBE( cm, float3(coord.xy, - coord.z) );
+        float4 color = texCUBElod( cm, float4(coord.xy, - coord.z,0) );
         return color;
 }
@@ -9 +9 @@
 float readDistanceCubeMap(samplerCUBE dcm, float3 coord)                
 {
-        float dist = texCUBE(dcm, float3(coord.xy, - coord.z)).a;
+        float dist = texCUBElod(dcm, float4(coord.xy, - coord.z,0)).a;
         return dist;
 }
@@ -15 +15 @@
 
 
-#define LIN_ITERATIONCOUNT 2
+#define LIN_ITERATIONCOUNT 20
 #define SECANT_ITERATIONCOUNT 2
 
@@ -24 +24 @@
         float3 Ra = abs(R);
         float3 xa = abs(x);
-        float a = max(max(xa.x,xa.y),xa.z) / 
-                          max(max(Ra.x,Ra.y),Ra.z);
-        
-        bool overshoot = false, undershoot = false;
+        
+    float xm =  max(max(xa.x,xa.y),xa.z);
+    float Rm = max(max(Ra.x,Ra.y),Ra.z);
+    
+    float a = xm / Rm;
+    
+  
+    float dt =  length(x / xm - R / Rm) * 256.0 / 2.0;
+    dt = max(dt, 4);
+    dt = 1.0 / dt;
+    
+        
+        bool overshoot = false, undershoot = true;
         float dp, dl = 0, ppp, llp;
         float lR = readDistanceCubeMap(mp, R);
         //float3 p = R;
         float3 p = 0;
-                
-        float dt = 1.0 / LIN_ITERATIONCOUNT;
+        
+        
+        //float dt = 1.0 / LIN_ITERATIONCOUNT;
         
         //linear iteration      
-        float t = 0;
+        
+        float t = 0.9999999999999;
+        dp = a * t / (1 - t);
+        p = x + R * dp;
+        float dist = readDistanceCubeMap(mp, p);
+        ppp = length(p) / dist;
+        
+        t = 0;  
+                
         while(t < 1.0 && !overshoot)
         {
@@ -63 +81 @@
         }
         
-        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(t >= 1.0 && undershoot && dist)
+                overshoot = true;       
         
         if(overshoot)
@@ -102 +113 @@
                         
 /*
-float3 Hit( float3 x, float3 R, samplerCUBE mp )
+float Hit( float3 x, float3 R, samplerCUBE mp, out float3 newDir )
 {
         //return R  + 0.00000000001 * x;
@@ -128 +139 @@
                 l = x + R * dl;                                                                         // ray equation
         }
-        return l;                                                                                               // computed hit point
+        newDir = l;                                                                                             // computed hit point
+        
+        return dl;
 }
 */