From e62817b8252974b8a98393275874ee303840bf13 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Fri, 12 May 2017 18:49:50 +0500 Subject: 2017-05-12 --- shaders/simple.fs | 12 ++++++++++++ shaders/simple.vs | 15 +++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 shaders/simple.fs create mode 100644 shaders/simple.vs (limited to 'shaders') diff --git a/shaders/simple.fs b/shaders/simple.fs new file mode 100644 index 0000000..fce2e07 --- /dev/null +++ b/shaders/simple.fs @@ -0,0 +1,12 @@ +#version 330 core +in vec2 TexCoord; + +out vec4 color; + +uniform sampler2D texture1; +uniform sampler2D texture2; + +void main() +{ + color = mix(texture(texture1, TexCoord), texture(texture2, TexCoord), 0.0); +} \ No newline at end of file diff --git a/shaders/simple.vs b/shaders/simple.vs new file mode 100644 index 0000000..7233efc --- /dev/null +++ b/shaders/simple.vs @@ -0,0 +1,15 @@ +#version 330 core +layout (location = 0) in vec3 position; +layout (location = 2) in vec2 texCoord; + +out vec2 TexCoord; + +uniform mat4 model; +uniform mat4 view; +uniform mat4 projection; + +void main() +{ + gl_Position = projection * view * model * vec4(position, 1.0f); + TexCoord = vec2(texCoord.x, texCoord.y); +} \ No newline at end of file -- cgit v1.2.3