Redesign the material system

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

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index fda84de95fff74de5ec6fc11180a05bc6a872168..6a8ee8d8f63713260ff05b98879b8e7f30644505 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,6 +45,9 @@ 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;
@@ -73,6 +76,7 @@ layout(location=3) in vec4 color;
 layout(location=2) in vec3 normal;
 layout(location=4) in vec3 tangent;
 layout(location=5) in vec3 binormal;
+layout(location=12) in vec4 instance_transform[3];
 
 #pragma MSP stage(fragment)
 layout(location=0) out vec4 frag_color;