Commit 58402faa authored by Elias Broschin's avatar Elias Broschin
Browse files

Merge branch 'develop' into feature/physics/movement

parents 8d837ef0 cd73dde1
......@@ -9,8 +9,9 @@ out vec2 texcoord_;
uniform mat4 projection;
uniform mat4 view;
uniform mat4 model;
void main() {
gl_Position = projection * view * vec4(_position, 1.f);
gl_Position = projection * view * model * vec4(_position, 1.f);
texcoord_ = _texcoord;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment