Changeset 2550 for GTP/trunk/App/Demos/Illum/Ogre/Media/Towers

Timestamp:

09/05/07 10:54:23 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• parallax.hlsl (modified) (3 diffs)
• towers.material (modified) (2 diffs)

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

@@ -14 +14 @@
         float det = B2 * T2 - BT * BT;
 
-        return float3x3( (B2 * Tangent - BT * Binormal)/det, 
-                         (T2 * Binormal - BT * Tangent)/det, 
-                         Normal/N2 );
+        //return float3x3( (B2 * Tangent - BT * Binormal)/det, 
+        //                 (T2 * Binormal - BT * Tangent)/det, 
+        //                 Normal/N2 );
                                                         
         // simplified solution
         //return float3x3(Tangent/T2, Binormal/B2, Normal/N2); 
         // more simplified solution
-        //return float3x3(Tangent, Binormal, Normal);
+        return float3x3(Tangent, Binormal, Normal);
 }
 
@@ -89 +89 @@
      
     // performing parallax mapping
-    float2 ParallaxTex = PARALLAX_MAPPING_ITER(BumpMapSampler, IN.TexCoord, tView);
+    float2 ParallaxTex = PARALLAX_MAPPING_OFFSET_LIMIT(BumpMapSampler, IN.TexCoord, tView);
         DISCARD_BY_TEX(ParallaxTex);
         
     // get model space normal vector
+    //ParallaxTex = IN.TexCoord;
     float3 tNormal = tex2D(BumpMapSampler, ParallaxTex).rgb;
         // Normal vector should be transformed with the inverse transpose of TangentToModel
@@ -98 +99 @@
     float3 mNormal = normalize( mul( tNormal, ModelToTangent ) ); 
         //mNormal = normalize(IN.wNormal);
+
     // illumination calculation
+
     return Illumination(mLight, mNormal, mView, ParallaxTex, IN.TexCoord2);
 }

GTP/trunk/App/Demos/Illum/Ogre/Media/Towers/towers.material

@@ -37 +37 @@
                         fragment_program_ref GTP/Demo/ParallaxMapped_PS
                         {
-                         param_named HEIGHT_SCALE float 0.16
+                         param_named HEIGHT_SCALE float 0.20
                          param_named HEIGHT_BIAS float -0.04                    
-                         param_named textureRepeat float 6
+                         param_named textureRepeat float 10
                         }
                         texture_unit color
@@ -173 +173 @@
                                 {
                                         max_light_count 1
-                                        vertex_program_name GTP/Basic/LightVPos_VS
-                                        fragment_program_name GTP/Basic/SM/Depth_VSM_PS
+                                        vertex_program_name GTP/Basic/LightCPos_VS
+                                        fragment_program_name GTP/Basic/SM/CameraDepth_PS
                                         set_light_viewproj true
-                                        set_light_view false
+                                        set_light_view true
                                         set_light_farplane false
                                         world_view_proj_param_name WorldViewProj
                                         world_param_name World
                                         light_viewproj_param_name LightViewProj                 
+                                        light_view_param_name LightView 
+                                        pass_blending one zero
                                 }