Changeset 1959 for GTP

Timestamp:

01/09/07 13:08:46 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Demos/Illum/Ogre

Files:

• Media/materials/programs/MetalTeapotNew.hlsl (modified) (6 diffs)
• Media/materials/scripts/MetalTeapot.material (modified) (4 diffs)
• Media/models/happybudha.mesh (added)
• Media/models/happybudhalow.mesh (added)
• bin/Debug/GameToolsRaytraceDemo.exe (modified) (previous)
• bin/Debug/ReflectionTest.exe (modified) (previous)
• bin/Release/GameToolsRaytraceDemo.exe (modified) (previous)
• bin/Release/ReflectionTest.exe (modified) (previous)

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

@@ -13 +13 @@
 }
 
-#define MAX_LIN_ITERATIONCOUNT 5  //80
-#define MIN_LIN_ITERATIONCOUNT 4  //60
-#define SECANT_ITERATIONCOUNT 2
+#define MAX_LIN_ITERATIONCOUNT 30  //80
+#define MIN_LIN_ITERATIONCOUNT 25  //60
+#define SECANT_ITERATIONCOUNT 1
 #define MAX_RAY_DEPTH 2
 
@@ -132 +132 @@
  }
  
+ int iterationNeeded = MIN_LIN_ITERATIONCOUNT;// + (dot(normalize(x), R) + 1.0) / 2.0 * (MAX_LIN_ITERATIONCOUNT - MIN_LIN_ITERATIONCOUNT);
  float pa;
- float dt = (maxT - minT) / MAX_LIN_ITERATIONCOUNT;
+ float dt = (maxT - minT) / (float) iterationNeeded ;
  dp = minT;
  //Linear iteration
@@ -412 +413 @@
         return I;
 }
-/*
+
 float4 mainPS(VertOut IN,
                                                         uniform float3 cameraPos,
@@ -428 +429 @@
 {
    float2 miniMaxi1;
-   miniMaxi1.x = 1.0 / minmax.x;
-   miniMaxi1.y = minmax.y;
+   miniMaxi1.x = 1.0 / minmax.x / 1.8;
+   miniMaxi1.y = minmax.y * 1.8;
    
    float2 miniMaxi2;
-   miniMaxi2.x = 1.0 / minmax1.x;
-   miniMaxi2.y = minmax1.y;
+   miniMaxi2.x = 1.0 / minmax1.x / 1.8;
+   miniMaxi2.y = minmax1.y * 1.8;
    
    float2 miniMaxi3;
-   miniMaxi3.x = 1.0 / minmax2.x;
-   miniMaxi3.y = minmax2.y;
-
-        float4 Color = 1.0;
-        if(SingleBounce == 1)
-         Color = SingleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex, miniMaxi1, miniMaxi2, miniMaxi3);
-        else
-         Color = MultipleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex, miniMaxi1, miniMaxi2, miniMaxi3);
-         
-        return Color;
-}*/
-
-
-
-float4 mainPS(VertOut IN,
-                                                        uniform float3 cameraPos,
-                                                        uniform samplerCUBE CubeMap : register(s0),
-                                                        uniform samplerCUBE DistanceMap : register(s1),
-                                                        uniform samplerCUBE NormDistMap1 : register(s2),
-                                                        uniform samplerCUBE NormDistMap2 : register(s3),
-                                                        uniform float3 lastCenter,
-                                                        uniform float SingleBounce,
-                                                        uniform float refIndex,
-                                                        uniform float4 min,
-                                                        uniform float4 min1,
-                                                        uniform float4 min2,
-                                                        uniform float4 max,
-                                                        uniform float4 max1,
-                                                        uniform float4 max2
-                                                        ):COLOR
-{
-   float2 miniMaxi1;
-   miniMaxi1.x = min.a;
-   miniMaxi1.y = max.a;
+   miniMaxi3.x = 1.0 / minmax2.x / 1.8;
+   miniMaxi3.y = minmax2.y * 1.8;
+
+   float4 Color = 1.0;
+   if(SingleBounce == 1)
+     Color = SingleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex, miniMaxi1, miniMaxi2, miniMaxi3);
+   else
+      Color = MultipleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex, miniMaxi1, miniMaxi2, miniMaxi3);
    
-   float2 miniMaxi2;
-   miniMaxi2.x = min1.a;
-   miniMaxi2.y = max1.a;
-   
-   float2 miniMaxi3;
-   miniMaxi3.x = min2.a;
-   miniMaxi3.y = max2.a;
-
-        float4 Color = 1.0;
-        if(SingleBounce == 1)
-         Color = SingleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex, miniMaxi1, miniMaxi2, miniMaxi3);
-        else
-         Color = MultipleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex, miniMaxi1, miniMaxi2, miniMaxi3);
-         
-        return Color;
+   return Color;
 }
 
@@ -506 +467 @@
                                                         ):COLOR
 {
+   float2 miniMaxi1;
+   miniMaxi1.x = min.a;
+   miniMaxi1.y = max.a;
+   
+   float2 miniMaxi2;
+   miniMaxi2.x = min1.a;
+   miniMaxi2.y = max1.a;
+   
+   float2 miniMaxi3;
+   miniMaxi3.x = min2.a;
+   miniMaxi3.y = max2.a;
+
+        float4 Color = 1.0;
+        if(SingleBounce == 1)
+         Color = SingleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex, miniMaxi1, miniMaxi2, miniMaxi3);
+        else
+         Color = MultipleReflectionPS(IN,cameraPos, CubeMap, DistanceMap, NormDistMap1,NormDistMap2,lastCenter,refIndex, miniMaxi1, miniMaxi2, miniMaxi3);
+         
+        return Color;
+}*/
+
+/*
+float4 mainPS(VertOut IN,
+                                                        uniform float3 cameraPos,
+                                                        uniform samplerCUBE CubeMap : register(s0),
+                                                        uniform samplerCUBE DistanceMap : register(s1),
+                                                        uniform samplerCUBE NormDistMap1 : register(s2),
+                                                        uniform samplerCUBE NormDistMap2 : register(s3),
+                                                        uniform float3 lastCenter,
+                                                        uniform float SingleBounce,
+                                                        uniform float refIndex,
+                                                        uniform float4 min,
+                                                        uniform float4 min1,
+                                                        uniform float4 min2,
+                                                        uniform float4 max,
+                                                        uniform float4 max1,
+                                                        uniform float4 max2
+                                                        ):COLOR
+{
   float2 miniMaxi1;
-  miniMaxi1.x = min2.a;
-  miniMaxi1.y = max2.a;
+  miniMaxi1.x = min1.a;
+  miniMaxi1.y = max1.a;
    
   float4 I = float4(0,0,0,0);
@@ -519 +519 @@
   float3 p;
   float dl, dp, llp, ppp;   
-  linearSearch( x, R, N, NormDistMap2, miniMaxi1, p, dl, dp, llp, ppp);
+  linearSearch( x, R, N, NormDistMap1, miniMaxi1, p, dl, dp, llp, ppp);
   if( dot(p, p) != 0 )
   {
-    secantSearch(x, R, NormDistMap2, dl, dp, llp, ppp, p);
-    I = readCubeMap(NormDistMap2, p);
+    //secantSearch(x, R, NormDistMap1, dl, dp, llp, ppp, p);
+    I = readCubeMap(NormDistMap1, p);
   }
-
+ I = max1 + 0.000000001 * x.x;
   //I = readCubeMap(NormDistMap1, R)+0.00000000001*x.x; 
   return I;     

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

@@ -131 +131 @@
   { 
     cull_hardware clockwise
-    scene_blend max
+    scene_blend_op max
     depth_test off
     polygon_mode points
@@ -156 +156 @@
   { 
     cull_hardware anticlockwise
-    scene_blend max
+    scene_blend_op max
     depth_test off
     polygon_mode points
@@ -185 +185 @@
 } 
 
-material MetalTeapotMultipleBounce_0
+material MetalTeapotMultipleBounce
 { 
    technique 
@@ -328 +328 @@
 
 
-material MetalTeapotMultipleBounce
+material MetalTeapotMultipleBounce_0
 { 
    technique