diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-14 18:03:34 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-14 18:03:34 +0100 |
| commit | 5776a36b454fac04617313da011d7aa2b0e834d3 (patch) | |
| tree | 1eb96d07e9a17a51e5763f397fc003f762cd2e75 /gfx/gl/shaders/landmassShader.vs | |
| parent | Merge branch 'model-factory-textures' (diff) | |
| parent | Add an asset template and use it to define all the foliage assets in the plan... (diff) | |
| download | ilt-5776a36b454fac04617313da011d7aa2b0e834d3.tar.bz2 ilt-5776a36b454fac04617313da011d7aa2b0e834d3.tar.xz ilt-5776a36b454fac04617313da011d7aa2b0e834d3.zip | |
Merge branch 'assimp'
Diffstat (limited to 'gfx/gl/shaders/landmassShader.vs')
| -rw-r--r-- | gfx/gl/shaders/landmassShader.vs | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gfx/gl/shaders/landmassShader.vs b/gfx/gl/shaders/landmassShader.vs index 30c4ef4..0cc8153 100644 --- a/gfx/gl/shaders/landmassShader.vs +++ b/gfx/gl/shaders/landmassShader.vs @@ -1,14 +1,7 @@ #version 330 core -in vec3 position; -in vec2 texCoord; -in vec3 normal; -in vec4 colour; - -out vec3 FragPos; -out vec2 TexCoords; -out vec3 Normal; -out vec4 Colour; +include(`meshIn.glsl') +include(`materialInterface.glsl') uniform mat4 viewProjection; @@ -19,6 +12,7 @@ main() TexCoords = texCoord; Normal = normal; Colour = colour; + Material = material; gl_Position = viewProjection * vec4(position, 1.0); } |