diff options
author | Yann Herklotz <git@yannherklotz.com> | 2020-12-30 11:25:31 +0000 |
---|---|---|
committer | Yann Herklotz <git@yannherklotz.com> | 2020-12-30 11:25:31 +0000 |
commit | 36558a69e0d373aae8e62a4b8104790114ee2cce (patch) | |
tree | 62530fc3d208eff9f135ff174ab1e7cb11661a82 /shaders | |
parent | d70a491c93e061a5e196a1a27191c6e884ffd9d2 (diff) | |
download | Vivant-36558a69e0d373aae8e62a4b8104790114ee2cce.tar.gz Vivant-36558a69e0d373aae8e62a4b8104790114ee2cce.zip |
Add cube to renderable items
Diffstat (limited to 'shaders')
-rw-r--r-- | shaders/triangle.frag | 4 | ||||
-rw-r--r-- | shaders/triangle.vert | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/shaders/triangle.frag b/shaders/triangle.frag index 2d290fd..23f2f59 100644 --- a/shaders/triangle.frag +++ b/shaders/triangle.frag @@ -2,8 +2,10 @@ uniform vec4 ourColour; +in vec4 colour; + out vec4 fragColor; void main() { - fragColor = ourColour; + fragColor = vec4(1.0, 0.5, 1.0, 1.0); } diff --git a/shaders/triangle.vert b/shaders/triangle.vert index 3c61307..939f4a4 100644 --- a/shaders/triangle.vert +++ b/shaders/triangle.vert @@ -6,7 +6,10 @@ uniform mat4 model; uniform mat4 view; uniform mat4 projection; +out vec4 colour; + void main() { gl_Position = projection * view * model * vec4(position, 1.0); + colour = vec4(position, 1.0); } |