18.09.2020

+ Textures
~ Changed 2D coordnate system to lower right as XY+
This commit is contained in:
Michel Fedde 2020-09-19 15:04:04 +02:00
parent 589d131246
commit a603ecc417
26 changed files with 267 additions and 16 deletions

View file

@ -1,8 +1,12 @@
#version 330
in vec2 vTexture;
uniform vec4 Tint;
uniform sampler2D Texture;
layout(location = 0) out vec4 color;
void main() {
color = vec4(1,1,1,1) + Tint;
color = Tint * texture(Texture, vTexture);
}

View file

@ -1,9 +1,14 @@
#version 330
layout(location = 0) in vec3 aPos;
layout(location = 1) in vec2 aTex;
uniform mat4 MVP;
uniform mat4 ModelMatrix;
out vec2 vTexture;
void main() {
vTexture = aTex;
gl_Position = MVP * ModelMatrix * vec4(aPos, 1);
}