Changeset 1862 for GTP/trunk/App/Demos/Illum/Ogre/Media/materials

Timestamp:

12/07/06 16:38:48 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• programs/MetalTeapot.hlsl (modified) (9 diffs)
• programs/MetalTeapotNew.hlsl (modified) (6 diffs)
• scripts/MetalTeapot.material (modified) (3 diffs)
• scripts/colorcube.material (added)
• scripts/terito.material (added)
• textures/blueChecker.tga (added)
• textures/bluewall.tga (added)
• textures/redChecker.tga (added)
• textures/roomc.PNG (added)

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

@@ -53 +53 @@
         ppp = length(p) / dist;
         */
-        t = dt; 
+        t = 0.01;       
                 
         while(t <= 1.0 && !overshoot)
@@ -62 +62 @@
                 if(dist > 0)
                 {
-                        ppp = length(p) / dist;
+                        bool us = false;
+                        
+                        ppp = length(p) / dist;                 
                         if(ppp < 1)
+                        us = true;
+                                
+                        us = !us;
+                        
+                        if(us)
                         {
                                 dl = dp;
@@ -225 +232 @@
                 out float4 Color :COLOR0)
 {
-        if(SingleBounce == 1)
-         Color = Metal1BouncePS(IN,cameraPos,CubeMap,DistanceMap,lastCenter);
-        else
-        {
+        //if(SingleBounce == 1)
+        // Color = Metal1BouncePS(IN,cameraPos,CubeMap,DistanceMap,lastCenter);
+        //else
+        //{
                 Color = float4(1,1,1,1);
                 
@@ -242 +249 @@
                 newTexCoord = R;
                 
-                //Color = readCubeMap(NormDistMap1, mPos );
+                //Color = readCubeMap(NormDistMap2, mPos );
                 //return;
                 
@@ -248 +255 @@
                 float3 newDir1;
                 float d1 = Hit(mPos, R, NormDistMap1, newDir1);
-                float3 normal1 = readCubeMap(NormDistMap1, newDir1);
+                float3 normal1 = readCubeMap(NormDistMap1, newDir1).rgb;
                 bool valid1 = /*dot(normal1, R) < 0 &&*/ dot(newDir1,newDir1) != 0;
                 if(valid1)
@@ -254 +261 @@
                 float3 newDir2;
                 float d2 = Hit(mPos, R, NormDistMap2, newDir2);
-                float3 normal2 = readCubeMap(NormDistMap2, newDir2);
+                float3 normal2 =  readCubeMap(NormDistMap2, newDir2).rgb;
                 bool valid2 = /*dot(normal2, R) < 0 &&*/ dot(newDir2,newDir2) != 0;
                 if(valid2)
@@ -261 +268 @@
                 if( !valid1 && !valid2)
                 {
-                        Hit(mPos, R, DistanceMap, newTexCoord); 
-                        Color = readCubeMap(CubeMap, newTexCoord );
+                //      Hit(mPos, R, DistanceMap, newTexCoord); 
+                //      Color = readCubeMap(CubeMap, newTexCoord );
                         //Color = 1;                    
                 }
@@ -309 +316 @@
                 
                 Color = Color * float4(F,1);    */
-        }
+        //}
 }
 
@@ -317 +324 @@
  float4 Color = float4(0, 0, 0, 0);
  //return Color;
- Color = float4(normalize(IN.mNormal) * refIndex, length(IN.cPos));
+ Color = float4(normalize(IN.mNormal)/* * refIndex*/, length(IN.cPos));
  return Color;
 }

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

@@ -13 +13 @@
 }
 
-#define MAX_LIN_ITERATIONCOUNT 20
-#define MIN_LIN_ITERATIONCOUNT 6
-#define SECANT_ITERATIONCOUNT 1
-#define MAX_RAY_DEPTH 3
+#define MAX_LIN_ITERATIONCOUNT 80
+#define MIN_LIN_ITERATIONCOUNT 30
+#define SECANT_ITERATIONCOUNT 2
+#define MAX_RAY_DEPTH 4
 
 void linearSearch(  float3 x, float3 R, float3 N, samplerCUBE mp,
@@ -191 +191 @@
 
 float3 R;          
-if(refIndex > 100.0)
+//if(refIndex > 100.0)
     R = normalize(reflect( V, N));
-else
-{
-        refIndex = 1.0 / refIndex;
-    R = normalize(refract( V, N, refIndex));
-}
+//else
+//{
+//      refIndex = 1.0 / refIndex;
+//    R = normalize(refract( V, N, refIndex));
+//}
                         
  float3 Nl;
@@ -220 +220 @@
          float4 I = float4(0,0,0,0);
                         
-         float3 N = normalize(IN.mNormal) * refIndex;
+         float3 N = normalize(IN.mNormal);// * refIndex;
          float3 newTexCoord;    
          float3 x = IN.wPos - lastCenter;
@@ -232 +232 @@
          {
            float3 R;
-           float refIndex = length(N);
-           refIndex = 1.0 / refIndex;
-           N = normalize(N);
+          // float refIndex = length(N);
+          // refIndex = 1.0 / refIndex;
+          // N = normalize(N);
            
-           if(refIndex > 100.0)
+           //if(refIndex > 100.0)
             R = normalize(reflect( V, N));
-           else
-            R = normalize(refract( V, N, refIndex));
+          // else
+          //  R = normalize(refract( V, N, refIndex));
                                 
            float3 Nl;
@@ -258 +258 @@
            V = R;
            
-          if(refIndex <= 100.0)
+          //if(refIndex <= 100.0)
             if(dot(N, V) > 0) N = -N;
         }
         
-//      if(I.a == 0)
- //      I = readCubeMap(CubeMap, l);
+        //if(I.a == 0)
+      // I = readCubeMap(CubeMap, l);
   
         return I;
@@ -282 +282 @@
          Color = SingleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex);
         else
-         Color = MultipleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex);
+         Color = MultipleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap2,NormDistMap2,lastCenter,refIndex);
          
         return Color;

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/scripts/MetalTeapot.material

@@ -89 +89 @@
     fragment_program_ref NormalDistancePS
     { 
-                param_named refIndex float 1.6          
+                param_named refIndex float 200          
         } 
   }
@@ -111 +111 @@
     fragment_program_ref NormalDistancePS
     { 
-                param_named refIndex float 1.6          
+                param_named refIndex float 200  
         } 
   }
@@ -196 +196 @@
                         param_named F0 float3 0.95 0.95 0.95
                         param_named SingleBounce float 0.0
-                        param_named refIndex float 1.6                  
+                        param_named refIndex float 200                  
                 }