diff options
| author | Yann Herklotz <git@yannherklotz.com> | 2020-12-27 16:29:16 +0000 |
|---|---|---|
| committer | Yann Herklotz <git@yannherklotz.com> | 2020-12-27 16:29:16 +0000 |
| commit | df9d7726541c0e3dcb65bb0294a528fe9732d350 (patch) | |
| tree | a10bfe1b1f51f6ef0180c323ed374cc63aad74ee | |
| parent | 86257e8cc8bf33a335bc46a40ffd4b18c5b8bddc (diff) | |
| download | Vivant-df9d7726541c0e3dcb65bb0294a528fe9732d350.tar.gz Vivant-df9d7726541c0e3dcb65bb0294a528fe9732d350.zip | |
Fix fragment shader and nix file
| -rw-r--r-- | default.nix | 4 | ||||
| -rw-r--r-- | shaders/triangle.frag | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/default.nix b/default.nix index bbb75e8..9f02659 100644 --- a/default.nix +++ b/default.nix @@ -8,6 +8,6 @@ let npkgs = if nixpkgs == null then import pinnedPkg {} else import nixpkgs {}; - learnopengl = npkgs.pkgs.haskellPackages.callCabal2nix "learnopengl-haskell" (./.) {}; + vivant = npkgs.pkgs.haskellPackages.callCabal2nix "vivant" (./.) {}; in -learnopengl +vivant diff --git a/shaders/triangle.frag b/shaders/triangle.frag index 40e6511..244d850 100644 --- a/shaders/triangle.frag +++ b/shaders/triangle.frag @@ -1,5 +1,7 @@ #version 120 -void main(void) { - gl_FragColor = vec4((gl_FragCoord.x / 640), (gl_FragCoord.y / 480), 0, 1); +uniform vec4 ourColour; + +void main() { + gl_FragColor = ourColour.yyzw; } |