Commits

David Rogers committed b6d2b8a

Fix a number of script compiler errors in the samples. The world view projection matrix is set in the individual programs referenced in the unified program. GLSL is the exception where it isn't necessary which was causing the errors.

Comments (0)

Files changed (6)

Samples/Media/materials/scripts/DepthShadowmap.material

 			// Really basic vertex program
 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTextureUnified
 			{
-                param_named_auto worldViewProj worldviewproj_matrix
 			}
 			fragment_program_ref Ogre/BasicFragmentPrograms/PassthroughFP
 			{
 			// Really basic vertex program
 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTextureUnified
 			{
-                param_named_auto worldViewProj worldviewproj_matrix
 				param_named ambient float4 1 1 1 1
 			}
 			fragment_program_ref Ogre/BasicFragmentPrograms/PassthroughFP
 			// Really basic vertex program
 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTextureUnified
 			{
-                param_named_auto worldViewProj worldviewproj_matrix
 			}
 			fragment_program_ref Ogre/BasicFragmentPrograms/PassthroughFP
 			{
 			// Really basic vertex program
 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTextureUnified
 			{
-                param_named_auto worldViewProj worldviewproj_matrix
 				param_named ambient float4 1 1 1 1
 			}
 			fragment_program_ref Ogre/BasicFragmentPrograms/PassthroughFP

Samples/Media/materials/scripts/Examples-Advanced.material

 			// be an issue
 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTextureUnified
 			{
-				param_named_auto worldViewProj worldviewproj_matrix
 				param_named_auto ambient ambient_light_colour
 			}
 			fragment_program_ref Ogre/BasicFragmentPrograms/PassthroughFP
 			// be an issue
 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTextureUnified
 			{
-				param_named_auto worldViewProj worldviewproj_matrix
 				param_named ambient float4 1 1 1 1
 			}
 			fragment_program_ref Ogre/BasicFragmentPrograms/PassthroughFP

Samples/Media/materials/scripts/Examples.material

 
 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTextureUnified
 			{
-				param_named_auto worldViewProj worldviewproj_matrix
 				param_named ambient float4 1 1 1 1
 			}
 			fragment_program_ref Examples/MorningSkyBoxHDRfp
 			// Really basic vertex program
 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTextureUnified
 			{
-				param_named_auto worldViewProj worldviewproj_matrix
   			}
 			fragment_program_ref Ogre/BasicFragmentPrograms/PassthroughFP
 			{
 		{
 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTextureUnified
 			{
-				param_named_auto worldViewProj worldviewproj_matrix
 			}
 			fragment_program_ref Examples/ShowUV_p
 			{

Samples/Media/materials/scripts/Examples.program

 
     default_params
     {
-        param_named_auto worldViewProj worldviewproj_matrix
         param_named_auto ambient ambient_light_colour
     }
 }

Samples/Media/materials/scripts/MRTtest.material

 		{
 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTextureUnified
 			{
-				param_named_auto worldViewProj worldviewproj_matrix
 				param_named ambient float4 1 1 1 1
 			}
 			fragment_program_ref Ogre/MRTtest/scenefp

Samples/Media/materials/scripts/OffsetMapping.material

 	      illumination_stage ambient
 		  vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTextureUnified
 		  {
-              param_named_auto worldViewProj worldviewproj_matrix
 		  }
 		  fragment_program_ref Ogre/BasicFragmentPrograms/PassthroughFP
 		  {
 	      illumination_stage ambient
 		  vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTextureUnified
 		  {
-              param_named_auto worldViewProj worldviewproj_matrix
 		  }
 		  
 	  }