X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fmsp_interface.glsl;h=860b0c794d23a4b6edd0bd61859f8e2f1dfd82ae;hb=07a69fb2c913d489510e384599ae63ed9e045c60;hp=e35b984845cf318fc0ec70b9b18042719ab6f12e;hpb=82282de52e8e8f3bbafefaf92bf76f53f2c2495e;p=libs%2Fgl.git diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl index e35b9848..860b0c79 100644 --- a/shaderlib/msp_interface.glsl +++ b/shaderlib/msp_interface.glsl @@ -11,10 +11,12 @@ struct ClipPlane uniform mat4 world_obj_matrix; uniform mat3 world_obj_normal_matrix; -uniform Transform +uniform CameraTransform { mat4 eye_world_matrix; + mat4 world_eye_matrix; mat4 clip_eye_matrix; + mat4 eye_clip_matrix; }; uniform Lighting @@ -41,7 +43,7 @@ layout(location=0) in vec4 vertex; layout(location=1) in vec4 color; layout(location=2) in vec3 normal; layout(location=3) in vec3 tangent; -layout(location=4) in vec4 group; +layout(location=4) in ivec4 group; layout(location=5) in vec4 weight; layout(location=6) in vec4 texcoord; layout(location=7) in vec4 texcoord1;