diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-05-17 15:55:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-17 15:55:37 -0400 |
| commit | 90aadf3844386824140a20d7fbb847bc16009a94 (patch) | |
| tree | 6f83fce90e71abb22b1a8f3e09c79963b2a34d5d /shaders/fill.fragment | |
| parent | bc63fa57ced1c7329f7fdcfd168eaf7e290158bc (diff) | |
| parent | 86f0106d0523825549f1e74b835688c78a10cf6c (diff) | |
| download | therapy-90aadf3844386824140a20d7fbb847bc16009a94.tar.gz therapy-90aadf3844386824140a20d7fbb847bc16009a94.tar.bz2 therapy-90aadf3844386824140a20d7fbb847bc16009a94.zip | |
Merge pull request #7 from hatkirby/es-rewrite
The ECS rewrite exceeds the original branch in functionality, so it is time to merge it in.
Diffstat (limited to 'shaders/fill.fragment')
| -rw-r--r-- | shaders/fill.fragment | 4 |
1 files changed, 2 insertions, 2 deletions
| diff --git a/shaders/fill.fragment b/shaders/fill.fragment index ab7d9c9..81443c4 100644 --- a/shaders/fill.fragment +++ b/shaders/fill.fragment | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | #version 330 core | 1 | #version 330 core |
| 2 | 2 | ||
| 3 | out vec3 color; | 3 | out vec4 color; |
| 4 | 4 | ||
| 5 | uniform vec3 vecColor; | 5 | uniform vec3 vecColor; |
| 6 | 6 | ||
| 7 | void main() | 7 | void main() |
| 8 | { | 8 | { |
| 9 | color = vecColor; | 9 | color = vec4(vecColor, 1.0); |
| 10 | } | 10 | } |