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

Timestamp:

11/07/06 14:28:17 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• GameTools_Localized_EnvMap.hlsl (modified) (9 diffs)
• MetalTeapot.hlsl (added)

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

@@ -31 +31 @@
 {
         float dist = texCUBE(dcm, float3(coord.xy, - coord.z)).r;
-        //if(dist == 0) dist = 1000; ///sky
+        if(dist == 0) dist = 1000; ///sky
         return dist;
 }
@@ -37 +37 @@
 
 
-#define LIN_ITERATIONCOUNT_L0 20
+#define LIN_ITERATIONCOUNT 6
+#define LIN_ITERATIONCOUNT_L0 5
 #define LIN_ITERATIONCOUNT_L1 5
 #define LIN_ITERATIONCOUNT_L2 3
@@ -57 +58 @@
         float3 p = R;
         
-        float LIN_ITERATIONCOUNT = LIN_ITERATIONCOUNT_L0;
         /*
         if(cameraDistance < 100)
@@ -73 +73 @@
         //linear iteration      
         float t = 0;
-        while(t < 1.0)
-        {
-                if(!overshoot)
-                {
+        while(t < 1.0 && !overshoot)
+        {
+                //if(!overshoot)
+                //{
                         dp = a * t / (1 - t);
                         p = x + R * dp;
@@ -97 +97 @@
                         else 
                                 undershoot = false;
-                }
+                //}
                 t += dt;                
         }
@@ -127 +127 @@
         return p;
 }
-                                
-/*
-float3 Hit(float3 x, float3 R, samplerCUBE mp)
-{
-        R = normalize(R);
-        float3 xNorm = normalize(x);
-        float3 dt = (R - xNorm) / (float) LIN_ITERATIONCOUNT;
-        float dx = length(cross(R,x));
-        
-        float3 pN = normalize(cross(R, xNorm));
-        float3 N = normalize(cross(pN,R));
-        float d = dot(x, N);    
-        
-        float3 under = xNorm * readDistanceCubeMap(mp, x);
-        float3 over = R * readDistanceCubeMap(mp, R);
-        
-        //linear iteration      
-        for(int i = 1; i < LIN_ITERATIONCOUNT; i++)
-        {
-                float3 dir = normalize(xNorm + dt * i);
-                float dist = readDistanceCubeMap( mp, dir);
-                float3 point = dir * dist;
-                                
-                if( dot(N, point) > d)//undershooting
-                {
-                        under = point;                  
-                }
-                else                            //overshooting
-                {
-                        over = point;                   
-                        i = LIN_ITERATIONCOUNT;
-                }       
-        }
-        return over;
-}
-*/
-
-/*
+/*                      
+
 float3 Hit( float3 x, float3 R, samplerCUBE mp )
 {
+        //return R  + 0.00000000001 * x;
         float rl = readDistanceCubeMap( mp, R);                         // |r|
         
@@ -175 +140 @@
 
         // iteration
-        for( int i = 0; i < SECANT_ITERATIONCOUNT; i++ )
+        for( int i = 0; i < 2; i++ )    // 2 !!!!!!!!!!!!!!!!!!!!!!!
         {
                 float llp = length( l ) / readDistanceCubeMap( mp, l);          // |l|/|l’|
@@ -194 +159 @@
 */
 
+/*
+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 < SECANT_ITERATIONCOUNT; i++ )
+        {
+                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
+}
+*/
+
 void LocalizedVS(float4 position : POSITION,
                 out float3 wPos : TEXCOORD1,                            
@@ -280 +275 @@
         newTexCoord = R;        
         
-        newTexCoord = Hit(mPos, R, DistanceMap, cameraDistace);
-        if(dot(newTexCoord,newTexCoord) == 0) 
+        newTexCoord = Hit(mPos, R, DistanceMap);
+        /*if(dot(newTexCoord,newTexCoord) == 0) 
                 Color = float4(0.5,0.5,0.5,1);
-        else
-                Color = readCubeMap(CubeMap, newTexCoord );     
+        else*/
+        Color = readCubeMap(CubeMap, newTexCoord );     
         
         float ctheta_in = dot(mNormal,R);