Changeset 2345

Timestamp:

05/03/07 11:31:38 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• MORIA/bump.hlsl (modified) (3 diffs)
• MORIA/moria.material (modified) (3 diffs)
• materials/GTPPathMap/PathMap.hlsl (modified) (1 diff)
• materials/scripts/GameTools.program (modified) (1 diff)

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

@@ -35 +35 @@
         Light = normalize(Light);
         float3 Half = normalize(Light + View);
-        float4 Lighting = lit(dot(Normal, Light), dot(Normal, Half), 16);
+        float4 Lighting = lit(dot(Normal, Light), dot(Normal, Half), 120);
         float4 Color= tex2D(ColorMapSampler, tileTexCoord) * tex2D(DetailMapSampler, detailTexCoord2);
 
-        return Lighting.y * Color * (d < lightRange.x) / (lightRange.y + d * lightRange.z + d * d * lightRange.w) * lightPower;
+        return (Lighting.y * Color + Lighting.z * 0.5) * (d < lightRange.x) / (lightRange.y + d * lightRange.z + d * d * lightRange.w) * lightPower;
 }
 
@@ -116 +116 @@
         float3x3 ModelToTangent = TransfModelToTangent(IN.wTangent, IN.wBinormal, IN.wNormal );
     // get model space normal vector
-    //float3 tNormal = tex2D(BumpMapSampler, IN.TexNormalCoord).rgb;
-    float3 tNormal = float3(0,1,0);
+    float3 tNormal = tex2D(BumpMapSampler, IN.TexNormalCoord).rgb;
+    if(length(tNormal == 0))
+     tNormal = float3(0,0,1);
+    tNormal.xy = (tNormal.xy *2.0) - 1.0;
         // Normal vector should be transformed with the inverse transpose of TangentToModel
         // which is the transpose of ModelToTangent
@@ -130 +132 @@
      }
         // illumination calculation
-    return Illumination(mLight, IN.wNormal, mView, IN.TexCoord2, IN.TexCoord) * spotFalloff;    
+        float4 illum = Illumination(mLight, mNormal/*IN.wNormal*/, mView, IN.TexCoord2, IN.TexCoord) * spotFalloff;
+        return float4(illum.rgb, 0.7);  
     
 }

GTP/trunk/App/Demos/Illum/Ogre/Media/MORIA/moria.material

@@ -36 +36 @@
                                         world_param_name World          
                                 }
-                                RenderTechnique PathMap
+                                RenderTechnique PathMap
                                 {
-                            //pass_blending dest_colour one
-                             pass_blending none
+                              pass_blending dest_alpha one
+                             //pass_blending none
                              //pass_blending add
-                                }
+                                }                               
                                 
                         }
@@ -82 +82 @@
                                 texture greatpillardetail.png
                         }
+                        texture_unit displace
+                        {
+                                texture greatpillardisplace.dds
+                        }
                 }
         }
@@ -108 +112 @@
                         {
                                 texture greathallfloordetail.png
+                        }
+                        texture_unit displace
+                        {
+                                texture floornormal.jpg
                         }
                 }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPPathMap/PathMap.hlsl

@@ -55 +55 @@
         float3 color = tex2D(colorSampler, input.tex).rgb;
 
-return float4(col,1);
+//return float4(col,1);
         return float4(col * color, 1);
 

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/scripts/GameTools.program

@@ -47 +47 @@
         target ps_2_0
 } 
-
-vertex_program GameTools/CubeMap/VertexPrograms/ReduceVS hlsl
-{
-        source GameTools_ReduceCubeMap.hlsl
-        entry_point ReduceTextureVS
-        target vs_3_0
-}