From 45dc9d42becd23107cb0bf7ed4db66a03158c02d Mon Sep 17 00:00:00 2001 From: NaifBanana <30419422+NaifBanana@users.noreply.github.com> Date: Wed, 20 Nov 2024 20:53:34 -0600 Subject: [PATCH] Shader changes --- shaders/frag.fs | 4 ---- shaders/vert.vs | 14 ++++---------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/shaders/frag.fs b/shaders/frag.fs index 46954d0..c256e3b 100644 --- a/shaders/frag.fs +++ b/shaders/frag.fs @@ -1,11 +1,7 @@ #version 330 core in vec3 vertColor; -in vec3 baryPos; out vec4 FragColor; void main() { FragColor = vec4(vertColor, 1.0); - if (baryPos.x < 0.02 || baryPos.z < 0.02) { - FragColor = vec4(0.1, 0.1, 0.1, 1.0); - } } \ No newline at end of file diff --git a/shaders/vert.vs b/shaders/vert.vs index 7d6e3eb..1c00e02 100644 --- a/shaders/vert.vs +++ b/shaders/vert.vs @@ -1,15 +1,9 @@ #version 330 core -layout (location=0) in vec2 vPos; -layout (location=1) in vec3 bary; -layout (location=2) in vec2 iPos; -layout (location=3) in uint life; - -uniform mat4 look; +layout (location=0) in vec3 vPos; +layout (location=1) in vec3 vColor; out vec3 vertColor; -out vec3 baryPos; void main() { - baryPos = bary; - vertColor = vec3(1.0, 1.0, 1.0)*life; - gl_Position = look * vec4(iPos + vPos, 0.0, 1.0); + vertColor = vColor; + gl_Position = vec4(vPos, 1.0); } \ No newline at end of file