Changeset 2157

Timestamp:

02/22/07 23:12:59 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• bump.hlsl (modified) (1 diff)
• tower.material (modified) (3 diffs)

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

@@ -76 +76 @@
                 OUT.mLight = wLightPos.xyz - wPos * wLightPos.w;
 
-                OUT.wTangent = normalize(mul(WorldI,float4(IN.Tangent, 1)));
-                OUT.wNormal = normalize(mul(WorldI,float4(IN.Normal, 1)));              
+                OUT.wTangent = normalize(mul(float4(IN.Tangent, 1),WorldI));
+                OUT.wNormal = normalize(mul(float4(IN.Normal, 1),WorldI));              
                 OUT.wBinormal = cross(OUT.wTangent, OUT.wNormal);               
                 

GTP/trunk/App/Demos/Illum/Ogre/Media/Demo/tower.material

@@ -26 +26 @@
             pass
                 {
-                        lighing off
-                        ambient 1 1 1 1
-                        diffuse 1 1 1 1
-                        specular 0 0 0 0
-                        emissive 0 0 0
-                        
                         vertex_program_ref GTP/Demo/BumpMapped_VS
                         {
@@ -40 +34 @@
                           param_named_auto wCamPos camera_position
                           param_named textureRepeat float 6
-                        } 
+                        }
                         fragment_program_ref GTP/Demo/ParallaxMapped_PS
                         {
@@ -69 +63 @@
         }
 }
+
+material towermaterialBump
+{
+        technique
+        {
+            pass
+                {
+                        vertex_program_ref GTP/Demo/BumpMapped_VS
+                        {
+                          param_named_auto WorldViewProj worldviewproj_matrix  
+                          param_named_auto World world_matrix
+                          param_named_auto WorldI inverse_world_matrix
+                          param_named_auto wLightPos light_position 0
+                          param_named_auto wCamPos camera_position
+                          param_named textureRepeat float 6
+                        } 
+                        fragment_program_ref GTP/Demo/BumpMapped_PS
+                        {
+                        }
+                        texture_unit
+                        {
+                         texture stone.bmp
+                         tex_coord_set 0
+                         colour_op replace
+                        }
+                        texture_unit
+                        {
+                         texture towerwall.bmp
+                         tex_coord_set 1
+                         colour_op modulate
+                        }
+                        texture_unit
+                        {
+                         texture stoneNormal.dds
+                         tex_coord_set 0
+                        }
+                        
+                }
+        
+        }
+}
+
+material towermaterialNoBump
+{
+        technique
+        {
+            pass
+                {
+                        ambient 1 1 1 1
+                        diffuse 1 1 1 1
+                        specular 0 0 0 0
+                        emissive 0 0 0                  
+                        
+                        texture_unit
+                        {
+                         texture stone.bmp
+                         tex_coord_set 0                         
+                        }
+                        texture_unit
+                        {
+                         texture towerwall.bmp
+                         tex_coord_set 1
+                         colour_op modulate
+                        }                       
+                }
+        
+        }
+}