diff --git a/data/shaders/instanced_object_pass.vert b/data/shaders/instanced_object_pass.vert index 57a2668f9..84274db61 100644 --- a/data/shaders/instanced_object_pass.vert +++ b/data/shaders/instanced_object_pass.vert @@ -18,6 +18,7 @@ layout (std140) uniform MatrixesData #if __VERSION__ >= 330 layout(location = 0) in vec3 Position; layout(location = 1) in vec3 Normal; +layout(location = 2) in vec4 Color; layout(location = 3) in vec2 Texcoord; layout(location = 7) in vec3 Origin; @@ -26,6 +27,7 @@ layout(location = 9) in vec3 Scale; #else in vec3 Position; in vec3 Normal; +in vec4 Color; in vec2 Texcoord; in vec3 Origin; @@ -35,6 +37,7 @@ in vec3 Scale; out vec3 nor; out vec2 uv; +out vec4 color; mat4 getWorldMatrix(vec3 translation, vec3 rotation, vec3 scale); mat4 getInverseWorldMatrix(vec3 translation, vec3 rotation, vec3 scale); @@ -46,4 +49,5 @@ void main(void) gl_Position = ProjectionMatrix * ViewMatrix * ModelMatrix * vec4(Position, 1.); nor = (TransposeInverseModelView * vec4(Normal, 0.)).xyz; uv = Texcoord; + color = Color.zyxw; }