Naming tweaks in builtin shaders

[libs/gl.git] / shaderlib / msp_interface.glsl

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index 5f391bb5fa882ca39897509974aba622c2b587c2..c90ab5aaac995aabe99f62f43b5a6112fef6746e 100644 (file)
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -5,12 +5,13 @@ struct LightSourceParameters
        vec4 specular;
 };
 
-struct MaterialParameters
+struct BasicMaterialParameters
 {
-       vec4 ambient;
        vec4 diffuse;
        vec4 specular;
+       vec4 emission;
        float shininess;
+       float reflectivity;
 };
 
 struct ClipPlane
@@ -26,10 +27,9 @@ uniform Transform
        mat4 projection_matrix;
 };
 
-uniform Material
+uniform BasicMaterial
 {
-       MaterialParameters material;
-       float reflectivity;
+       BasicMaterialParameters basic_material;
 };
 
 uniform Lighting
@@ -45,16 +45,19 @@ uniform Lighting
 };
 
 uniform sampler2D diffuse_map;
+uniform sampler2D specular_map;
+uniform sampler2D shininess_map;
+uniform sampler2D emission_map;
 uniform sampler2D normal_map;
 
-uniform sampler2DShadow shadow;
+uniform sampler2DShadow shadow_map;
 uniform ShadowMap
 {
        float shadow_darkness;
        mat4 shd_eye_matrix;
 };
 
-uniform samplerCube environment;
+uniform samplerCube environment_map;
 uniform EnvMap
 {
        mat3 env_eye_matrix;