ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for instanced object with default material.

Browse Source
This commit is contained in:
vlj 2014-06-28 23:42:19 +02:00
parent d5c91dcfe4
commit fd5061057d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/shaders/instanced_object_pass.vert
View File

@ -18,6 +18,7 @@ layout (std140) uniform MatrixesData
#if __VERSION__ >= 330 #if __VERSION__ >= 330
layout(location = 0) in vec3 Position; layout(location = 0) in vec3 Position;
layout(location = 1) in vec3 Normal; layout(location = 1) in vec3 Normal;
layout(location = 2) in vec4 Color;
layout(location = 3) in vec2 Texcoord; layout(location = 3) in vec2 Texcoord;
layout(location = 7) in vec3 Origin; layout(location = 7) in vec3 Origin;
@ -26,6 +27,7 @@ layout(location = 9) in vec3 Scale;
#else #else
in vec3 Position; in vec3 Position;
in vec3 Normal; in vec3 Normal;
in vec4 Color;
in vec2 Texcoord; in vec2 Texcoord;
in vec3 Origin; in vec3 Origin;
@ -35,6 +37,7 @@ in vec3 Scale;
out vec3 nor; out vec3 nor;
out vec2 uv; out vec2 uv;
out vec4 color;
mat4 getWorldMatrix(vec3 translation, vec3 rotation, vec3 scale); mat4 getWorldMatrix(vec3 translation, vec3 rotation, vec3 scale);
mat4 getInverseWorldMatrix(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.); gl_Position = ProjectionMatrix * ViewMatrix * ModelMatrix * vec4(Position, 1.);
nor = (TransposeInverseModelView * vec4(Normal, 0.)).xyz; nor = (TransposeInverseModelView * vec4(Normal, 0.)).xyz;
uv = Texcoord; uv = Texcoord;
color = Color.zyxw;
} }