Changeset 2186 for GTP/trunk/App/Demos/Illum/Ogre/Media/Demo

Timestamp:

03/02/07 19:07:56 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• black.bmp (added)
• bump.hlsl (modified) (1 diff)
• ground3.bmp (added)
• groundShape.mesh (added)
• groundbump.bmp (added)
• grounddetail.bmp (added)
• parallax.hlsl (modified) (3 diffs)
• pillarShape.mesh (added)
• pillarcolor.bmp (added)
• tower.material (deleted)
• towers.level (added)
• towers.material (added)

GTP/trunk/App/Demos/Illum/Ogre/Media/Demo/bump.hlsl

@@ -109 +109 @@
     return Illumination(mLight, mNormal, mView, IN.TexCoord, IN.TexCoord2);
     
+    
 }

GTP/trunk/App/Demos/Illum/Ogre/Media/Demo/parallax.hlsl

@@ -17 +17 @@
                          (T2 * Binormal - BT * Tangent)/det, 
                          Normal/N2 );
-/*                                                      
+                                                        
         // simplified solution
-        return float3x3(Tangent/T2, Binormal/B2, Normal/N2); 
-*/
+        //return float3x3(Tangent/T2, Binormal/B2, Normal/N2); 
+        // more simplified solution
+        //return float3x3(Tangent, Binormal, Normal);
 }
 
@@ -52 +53 @@
 }
 
-float2 PARALLAX_MAPPING_ITER(sampler2D heightMap, float3 TexCoord, float3 View)
+float2 PARALLAX_MAPPING_OFFSET_LIMIT(sampler2D heightMap, float2 TexCoord, float3 View)
+{
+    float4 Normal = tex2D(heightMap, TexCoord);
+    float h = Normal.a * HEIGHT_SCALE + HEIGHT_BIAS;
+    return TexCoord + h * View.xy;
+}
+
+float2 PARALLAX_MAPPING_ITER(sampler2D heightMap, float2 TexCoord, float3 View)
 {
     for(int i = 0; i < PARALLAX_ITERATION; i++) {
                 float4 Normal = tex2D(heightMap, TexCoord);
                 float h = Normal.a * HEIGHT_SCALE + HEIGHT_BIAS;
-                TexCoord += (h - TexCoord.z) * Normal.z * View;
+                TexCoord += h * Normal.z * View;
         }
         return TexCoord.xy;
@@ -81 +89 @@
      
     // performing parallax mapping
-    float2 ParallaxTex = PARALLAX_MAPPING_ITER(BumpMapSampler, float3(IN.TexCoord, 0), tView);
+    float2 ParallaxTex = PARALLAX_MAPPING_ITER(BumpMapSampler, IN.TexCoord, tView);
         DISCARD_BY_TEX(ParallaxTex);