diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-02-24 19:29:27 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-02-24 19:29:27 +0000 |
| commit | 2c6257a4460de7b0c75723aebf96cf265e078530 (patch) | |
| tree | f1abacfc6f64b5718a7ef6398001655f0103bf04 /gfx/gl/shaders/basicShader.fs | |
| parent | Fixed up vector operator+ element (diff) | |
| download | ilt-2c6257a4460de7b0c75723aebf96cf265e078530.tar.bz2 ilt-2c6257a4460de7b0c75723aebf96cf265e078530.tar.xz ilt-2c6257a4460de7b0c75723aebf96cf265e078530.zip | |
Support for model colours mixed with textures
Diffstat (limited to 'gfx/gl/shaders/basicShader.fs')
| -rw-r--r-- | gfx/gl/shaders/basicShader.fs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gfx/gl/shaders/basicShader.fs b/gfx/gl/shaders/basicShader.fs index 9c4945b..93f0a3f 100644 --- a/gfx/gl/shaders/basicShader.fs +++ b/gfx/gl/shaders/basicShader.fs @@ -3,6 +3,7 @@ in vec3 FragPos; in vec2 TexCoords; in vec3 Normal; +in vec4 Colour; out vec4 gPosition; out vec4 gNormal; @@ -16,5 +17,5 @@ main() float clear = round(texture(texture0, TexCoords).a); gPosition = vec4(FragPos, clear); gNormal = vec4(Normal, clear); - gAlbedoSpec = texture(texture0, TexCoords); + gAlbedoSpec = mix(texture(texture0, TexCoords), vec4(Colour.rgb, 1), Colour.a); } |