diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-03-05 01:59:16 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-03-05 01:59:16 +0000 |
| commit | d4c073a18adaed73973f34c6c39fc15664d9211d (patch) | |
| tree | 44536af3af0284ab75eae79ef81a5e4452019269 /gfx/gl/shaders/basicShader.vs | |
| parent | Add helper operator to perform vec3*mat4 and perspective divide (diff) | |
| parent | Remove old hard coded asset factory test, run entirely from XML load and rend... (diff) | |
| download | ilt-d4c073a18adaed73973f34c6c39fc15664d9211d.tar.bz2 ilt-d4c073a18adaed73973f34c6c39fc15664d9211d.tar.xz ilt-d4c073a18adaed73973f34c6c39fc15664d9211d.zip | |
Merge branch 'model-factory'
Diffstat (limited to 'gfx/gl/shaders/basicShader.vs')
| -rw-r--r-- | gfx/gl/shaders/basicShader.vs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gfx/gl/shaders/basicShader.vs b/gfx/gl/shaders/basicShader.vs index bc7ea5d..ff9a401 100644 --- a/gfx/gl/shaders/basicShader.vs +++ b/gfx/gl/shaders/basicShader.vs @@ -3,10 +3,12 @@ in vec3 position; in vec2 texCoord; in vec3 normal; +in vec4 colour; out vec3 FragPos; out vec2 TexCoords; out vec3 Normal; +out vec4 Colour; uniform mat4 viewProjection; uniform mat4 model; @@ -19,6 +21,7 @@ main() FragPos = worldPos.xyz; TexCoords = texCoord; Normal = (model * vec4(normal, 0.0)).xyz; + Colour = colour; gl_Position = viewProjection * worldPos; } |