Changeset 1859 for GTP/trunk/App/Demos/Illum

Timestamp:

12/06/06 12:56:11 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• programs/MetalTeapot.hlsl (modified) (6 diffs)
• programs/MetalTeapotNew.hlsl (added)
• scripts/MetalTeapot.material (modified) (1 diff)

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

@@ -37 +37 @@
     
         
-        bool overshoot = false, undershoot = true;
+        bool overshoot = false, undershoot = false;
         float dp, dl = 0, ppp, llp;
         float lR = readDistanceCubeMap(mp, R);
@@ -53 +53 @@
         ppp = length(p) / dist;
         */
-        t = 0;  
-                
-        while(t < 1.0 && !overshoot)
+        t = dt; 
+                
+        while(t <= 1.0 && !overshoot)
         {
                 dp = a * t / (1 - t);
@@ -75 +75 @@
                         }
                 }
-                else 
+                else
                         undershoot = false;
         
@@ -81 +81 @@
         }
         
-        if(t >= 1.0 && undershoot && dist)
-                overshoot = true;       
+        //if(t >= 1.0 && undershoot && dist)
+        //      overshoot = true;       
         
         if(overshoot)
@@ -249 +249 @@
                 float d1 = Hit(mPos, R, NormDistMap1, newDir1);
                 float3 normal1 = readCubeMap(NormDistMap1, newDir1);
-                bool valid1 = dot(normal1, R) < 0 && dot(newDir1,newDir1) != 0;
+                bool valid1 = /*dot(normal1, R) < 0 &&*/ dot(newDir1,newDir1) != 0;
                 if(valid1)
                         newDir1 = 0;
@@ -255 +255 @@
                 float d2 = Hit(mPos, R, NormDistMap2, newDir2);
                 float3 normal2 = readCubeMap(NormDistMap2, newDir2);
-                bool valid2 = dot(normal2, R) < 0 && dot(newDir2,newDir2) != 0;
+                bool valid2 = /*dot(normal2, R) < 0 &&*/ dot(newDir2,newDir2) != 0;
                 if(valid2)
                         newDir2 = 0;

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

@@ -119 +119 @@
 fragment_program MetalMultipleBouncePS hlsl
 {
-        source MetalTeapot.hlsl
-        entry_point MetalMultipleBouncePS
+        //source MetalTeapot.hlsl
+        //entry_point MetalMultipleBouncePS
+        source MetalTeapotNew.hlsl
+    entry_point mainPS
+
         target ps_3_0
         flow_control prefer