Changeset 2417 for GTP/trunk/App/Demos/Illum/Ogre/Media/MORIA

Timestamp:

06/06/07 19:19:29 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• FPSArmColor.png (added)
• FPSArmColor2.png (added)
• FPSArmNormal.png (added)
• FPSArm_PS.hlsl (added)
• FPSarm.material (modified) (2 diffs)
• MoriaHallBase.hlsl (modified) (1 diff)
• SkinningVS.cg (added)
• bump.png (deleted)
• colortex.png (deleted)
• illum.hlsl (modified) (1 diff)
• moria.material (modified) (1 diff)
• troll.material (modified) (3 diffs)
• trollps.hlsl (modified) (2 diffs)
• trollvs.cg (deleted)

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

@@ +1 @@
+vertex_program FPSArmSkinning_VP cg
+{
+  source SkinningVS.cg
+  entry_point FPSArmSkinning_VP
+   profiles vs_2_0
+   includes_skeletal_animation true
+}
+
+vertex_program FPSArmSkinning_SMGen_VP cg
+{
+  source SkinningVS.cg
+  entry_point FPSArmSkinning_SMGen_VP
+  profiles vs_2_0
+  includes_skeletal_animation true
+}
+
+fragment_program FPSArm_PS hlsl
+{
+   source FPSArm_PS.hlsl
+   entry_point FPSArm_PS
+   target ps_2_0
+}
+
+material FPSArmShadowMapGen_POINT
+{
+        technique
+        {
+                pass
+                {
+                        vertex_program_ref FPSArmSkinning_SMGen_VP 
+                        {
+                                param_named_auto worldMatrix3x4Array[0] world_matrix_array_3x4
+                                param_named_auto viewProjectionMatrix viewproj_matrix
+                                param_named_auto viewMatrix view_matrix                         
+                        }
+                  fragment_program_ref GTP/Basic/CDistNorm_PS
+                   {    
+                    param_named_auto farPlane far_clip_distance
+                   }  
+                }
+        }
+}
+
+material FPSArmCameraDepth
+{
+        technique
+        {
+                pass
+                {
+                        vertex_program_ref FPSArmSkinning_SMGen_VP 
+                        {
+                                param_named_auto worldMatrix3x4Array[0] world_matrix_array_3x4
+                                param_named_auto viewProjectionMatrix viewproj_matrix
+                                param_named_auto viewMatrix view_matrix                         
+                        }                   
+                        fragment_program_ref GTP/Basic/CDepth_PS
+                    {
+                        param_named_auto farplane far_clip_distance
+                    }  
+                }
+        }
+}
+
 material phong3
 {
@@ -5 +68 @@
                 pass mainpass
                 {
-                        depth_write on
                         cull_hardware none
-                        
-                        vertex_program_ref GTP/Basic/ShadedTex_VS
-                        {
-                                param_named_auto WorldViewProj worldviewproj_matrix
-                                param_named_auto World world_matrix
-                                param_named_auto WorldInv inverse_world_matrix
-                        }
-                        fragment_program_ref GTP/Basic/Shaded/TexturedTwoLights_PS
-                        {
-                                param_named_auto lightPos1 light_position 0
-                                param_named_auto lightDir1 light_direction 0
-                                param_named_auto lightColor1 light_diffuse_colour 0
-                                param_named_auto lightPower1 light_power 0
-                                
-                                param_named_auto lightPos2 light_position 1
-                                param_named_auto lightDir2 light_direction 1
-                                param_named_auto lightColor2 light_diffuse_colour 1
-                                param_named_auto lightPower2 light_power 1
-                        }
-        
+                        IllumTechniques
+                        {
+                                RenderTechnique Triggers
+                                {
+                                        ILLUM_TRIGGER_SM_POINT FPSArmShadowMapGen_POINT
+                                        ILLUM_TRIGGER_CAMERADEPTH FPSArmCameraDepth
+                                }
+                        }
+                        vertex_program_ref FPSArmSkinning_VP 
+                        {
+                            param_named_auto worldMatrix3x4Array[0] world_matrix_array_3x4
+                            param_named_auto viewProjectionMatrix viewproj_matrix
+                            param_named_auto lightPos light_position 0
+                            param_named_auto cameraPos camera_position          
+                        }
+                        fragment_program_ref FPSArm_PS 
+                        {
+                            param_named_auto lightRange light_attenuation 0
+                            param_named_auto lightPower light_power 0
+                            param_named_auto lightColor light_diffuse_colour 0
+                            param_named specularity float 100
+                            param_named albedo float 0.1
+                            param_named specularColor float4 0 0 0 0                    
+                        }
                         texture_unit basetexture
                         {
-                                texture colortex.png                            
-                        }
-                }
-        }
-}
+                            texture FPSArmColor2.png
+                        }
+                        texture_unit bumptexture
+                        {
+                            texture FPSArmNormal.png
+                        }
+                }
+        }
+}
+
 
 vertex_program GTP/MoriaDemo/Sword_VS hlsl

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

@@ -129 +129 @@
         //do Path Map to gather indirect illumination
         
-//      float4 indirect = PathMapIndirect(PathMap, WeightIndexMap, WeightMap, IN.texCoord2.zw) * 1.2;
-//      indirect *= diffuseColor;
-//      Color = Color + indirect;
+        //float4 indirect = PathMapIndirect(PathMap, WeightIndexMap, WeightMap, IN.texCoord2.zw) * 1.2;
+        //indirect *= diffuseColor;
+        //Color = Color + indirect;
+        
+        Color += lightPower1 * diffuseColor * 0.0005;
         
         //gather caustics for all casters

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

@@ -79 +79 @@
                 float3 weight = tex2D(weightTex, float2((weightIndex + 0.5)/allClusterCount, 0.5)).rgb;
                 float3 val = tex2D(PMTex, prmTexPos).xyz;
-                if(length(val - float3(1,1,1))== 0)
-                val = 0;
+        //      if(length(val - float3(1,1,1))== 0)
+        //      val = 0;
                 col += val.xyz * weight;                
         }

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

@@ -23 +23 @@
                                 //RenderTechnique PathMap
                                 //{
-                            //  new_passes false
+                                //      pass_blending one zero
+                           //   new_passes false
                                 //      start_tex_id 3
                                 //}     

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

@@ -1 +1 @@
 vertex_program TrollSkinningOneWeight cg
 {
-   source trollvs.cg
+   source SkinningVS.cg
    entry_point trollSkinning_One_Weight_vp
    profiles vs_2_0
@@ -9 +9 @@
 vertex_program TrollSkinningSMGen cg
 {
-   source trollvs.cg
+   source SkinningVS.cg
    entry_point trollSkinning_SMGen_One_Weight_vp
    profiles vs_2_0
@@ -89 +89 @@
                             param_named_auto lightPower light_power 0
                             param_named_auto lightColor light_diffuse_colour 0
-                            param_named specularity float 1
-                            param_named specularColor float4 0.02 0.02 0.02 0.02                        
+                            param_named specularity float 200
+                            param_named albedo float 0.1
+                            param_named specularColor float4 0.0016 0.0015 0.001 0                      
                         }
                         texture_unit basetexture

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

@@ -15 +15 @@
 
 uniform float specularity;
+uniform float albedo;
 uniform float4 specularColor;
 
@@ -37 +38 @@
         float3 L = IN.L;
         
-        float4 diffuseColor = tex2D(colorTexture, IN.texCoord);
+        float4 diffuseColor = albedo * tex2D(colorTexture, IN.texCoord);
         
         Color = Illumination(N, L, V, lightColor * lightPower, lightRange, diffuseColor, specularity, specularColor);
         
-        float4 ret =  diffuseColor * 0.1 + Color;
+        float4 ret =  Color;
         return float4(ret.xyz, dist);
 }