From 6f4a3c93f20e79b6ee1c8566c2455cef3a607b05 Mon Sep 17 00:00:00 2001 From: Cameron Reikes Date: Sun, 25 Jun 2023 05:45:03 -0700 Subject: [PATCH] Transparent grass, alpha blend in engine. Blender is broken --- art/art.blend | 4 ++-- art/gigatexture.png | 4 ++-- threedee.glsl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/art/art.blend b/art/art.blend index 4f13051..8d00a76 100644 --- a/art/art.blend +++ b/art/art.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24dbe9ec576d75af9b979a731cd6d2f4c82c2e848c4977351ff16c974b86b8ba -size 1068444 +oid sha256:3a59e4241eaf2a973e026c2e271b9112d3ba7a50c191c26d540256e16754c995 +size 1069020 diff --git a/art/gigatexture.png b/art/gigatexture.png index 32bc01e..56f700b 100644 --- a/art/gigatexture.png +++ b/art/gigatexture.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be4fded5dea3b3d453f5f7fd42903791b75799734c23a3c902cd101575a1fb18 -size 2299401 +oid sha256:144900eab8da94f5a7b343d1a7ecfbcd3d5ba329da82c6f09f68250f6d129845 +size 1801687 diff --git a/threedee.glsl b/threedee.glsl index 6d696b1..d70c0f9 100644 --- a/threedee.glsl +++ b/threedee.glsl @@ -26,7 +26,7 @@ in vec2 uv; out vec4 frag_color; void main() { - frag_color = vec4(texture(tex, uv).rgb, 1.0); + frag_color = texture(tex, uv); } @end