diff options
Diffstat (limited to 'src/shaders')
-rw-r--r-- | src/shaders/default.frag | 10 | ||||
-rw-r--r-- | src/shaders/default.vert | 11 | ||||
-rw-r--r-- | src/shaders/ui.frag | 10 | ||||
-rw-r--r-- | src/shaders/ui.vert | 10 |
4 files changed, 38 insertions, 3 deletions
diff --git a/src/shaders/default.frag b/src/shaders/default.frag index 9a5018d..d5d37c7 100644 --- a/src/shaders/default.frag +++ b/src/shaders/default.frag @@ -1,8 +1,14 @@ #version 330 core -out vec4 frag_color; +in VSOUT { + vec2 texc; +} vsout; + +out vec4 fcolor; + +uniform sampler2D tex0; void main(void) { - frag_color = vec4(1.0); + fcolor = texture(tex0, vsout.texc); } diff --git a/src/shaders/default.vert b/src/shaders/default.vert index 637c7c1..a7b5e08 100644 --- a/src/shaders/default.vert +++ b/src/shaders/default.vert @@ -1,9 +1,18 @@ #version 330 core layout(location = 0) in vec3 apos; +layout(location = 1) in vec2 atexc; +out VSOUT { + vec2 texc; +} vsout; + +uniform mat4 proj; +uniform mat4 view; uniform mat4 model; void main(void) { - gl_Position = model*vec4(apos, 1.0); + vsout.texc = atexc; + + gl_Position = proj*view*model*vec4(apos, 1.0); } diff --git a/src/shaders/ui.frag b/src/shaders/ui.frag new file mode 100644 index 0000000..bd0bc85 --- /dev/null +++ b/src/shaders/ui.frag @@ -0,0 +1,10 @@ +#version 330 core + +out vec4 fcolor; + +uniform vec4 color; + +void main(void) +{ + fcolor = color; +} diff --git a/src/shaders/ui.vert b/src/shaders/ui.vert new file mode 100644 index 0000000..ad5d46a --- /dev/null +++ b/src/shaders/ui.vert @@ -0,0 +1,10 @@ +#version 330 core +layout(location = 0) in vec3 apos; + +uniform mat4 proj; +uniform mat4 model; + +void main(void) +{ + gl_Position = proj*model*vec4(apos, 1.0); +} |