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

Timestamp:

11/30/06 14:48:15 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• programs/MetalTeapot.hlsl (modified) (5 diffs)
• textures/Forest_BK.hdr (added)
• textures/Forest_DN.hdr (added)
• textures/Forest_FR.hdr (added)
• textures/Forest_LF.hdr (added)
• textures/Forest_RT.hdr (added)
• textures/Forest_UP.hdr (added)
• textures/rnl_cross.hdr (added)

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

@@ -15 +15 @@
 
 
-#define LIN_ITERATIONCOUNT 20
-#define SECANT_ITERATIONCOUNT 2
+#define MAX_LIN_ITERATIONCOUNT 20
+#define MIN_LIN_ITERATIONCOUNT 6
+#define SECANT_ITERATIONCOUNT 1
 
 float Hit(float3 x, float3 R, samplerCUBE mp, out float3 newDir)
@@ -31 +32 @@
     
   
-    float dt =  length(x / xm - R / Rm) * 256.0 / 2.0;
-    dt = max(dt, 4);
+    float dt =  length(x / xm - R / Rm) * MAX_LIN_ITERATIONCOUNT;
+    dt = max(dt, MIN_LIN_ITERATIONCOUNT);
     dt = 1.0 / dt;
     
@@ -41 +42 @@
         //float3 p = R;
         float3 p = 0;
-        
-        
-        //float dt = 1.0 / LIN_ITERATIONCOUNT;
-        
+                
         //linear iteration      
-        
-        float t = 0.9999999999999;
+        float t;
+        float dist = 0;
+        /*
+        t = 0.9999999999999;
         dp = a * t / (1 - t);
         p = x + R * dp;
-        float dist = readDistanceCubeMap(mp, p);
+        dist = readDistanceCubeMap(mp, p);
         ppp = length(p) / dist;
-        
+        */
         t = 0;  
                 
@@ -241 +241 @@
         //return;
         
+
         float3 newDir1;
         float d1 = Hit(mPos, R, NormDistMap1, newDir1);
@@ -285 +286 @@
                 //Color = float4(1,0,0,1);      
         }
-         
+        
+        /*
+        float3 newDir2;
+        float d2 = Hit(mPos, R, NormDistMap2, newDir2);
+        float3 normal2 = readCubeMap(NormDistMap2, newDir2);
+        bool valid2 = dot(normal2, R) < 0 && dot(newDir2,newDir2) != 0;
+        if(valid2)
+                newDir2 = 0;
+        if(valid2)
+        {
+                float d;
+                float3 newN;            
+                d = d2;
+                newN = normal2;
+                float3 newV = R;
+                float3 newX = mPos + R * d;
+                float3 newR = normalize(reflect( newV, newN));
+                
+                Hit(newX, newR, DistanceMap, newTexCoord);      
+                Color = readCubeMap(CubeMap, newTexCoord );
+        }
+        else
+        {
+                Hit(mPos, R, DistanceMap, newTexCoord); 
+                Color = readCubeMap(CubeMap, newTexCoord );
+        }
+        */      
         return;