diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2017-11-17 23:10:55 +0000 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-11-17 23:10:55 +0000 |
| commit | fbbfad54d6281c2e08aeb2ac51c68cb7ba293f7e (patch) | |
| tree | 1e77bcfa76d82371200bd7f1b34287772dc4b8be /resources | |
| parent | cf63bff8cd66b2c1640092d4f067b3073e53c4b7 (diff) | |
| download | YAGE-fbbfad54d6281c2e08aeb2ac51c68cb7ba293f7e.tar.gz YAGE-fbbfad54d6281c2e08aeb2ac51c68cb7ba293f7e.zip | |
Adding default shaders
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/default_shader.frag | 7 | ||||
| -rw-r--r-- | resources/defaultshader.frag | 16 | ||||
| -rw-r--r-- | resources/defaultshader.vert (renamed from resources/default_shader.vert) | 0 |
3 files changed, 16 insertions, 7 deletions
diff --git a/resources/default_shader.frag b/resources/default_shader.frag deleted file mode 100644 index 93db96da..00000000 --- a/resources/default_shader.frag +++ /dev/null @@ -1,7 +0,0 @@ -#version 130 - -in vec2 fragment_position; -in vec4 fragment_colour; -in vec2 fragment_uv; - -out vec4 colour; diff --git a/resources/defaultshader.frag b/resources/defaultshader.frag new file mode 100644 index 00000000..1d8219a5 --- /dev/null +++ b/resources/defaultshader.frag @@ -0,0 +1,16 @@ +#version 130 + +in vec2 fragment_position; +in vec4 fragment_colour; +in vec2 fragment_uv; + +out vec4 colour; + +uniform sampler2D texture_sampler; + +void main() +{ + vec4 texture_color = texture(texture_sampler, fragment_uv); + + colour = texture_color; +} diff --git a/resources/default_shader.vert b/resources/defaultshader.vert index d591e4bf..d591e4bf 100644 --- a/resources/default_shader.vert +++ b/resources/defaultshader.vert |