From 08958e832e930a1efafcf1dfd503585a3729b6b1 Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Sun, 25 Oct 2020 09:46:11 -0500 Subject: [PATCH] moved planet colors uniform to fragment shader --- res/shaders/planet_frag.glsl | 6 ++++-- res/shaders/planet_vert.glsl | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/res/shaders/planet_frag.glsl b/res/shaders/planet_frag.glsl index 6363dc4..eed53c3 100644 --- a/res/shaders/planet_frag.glsl +++ b/res/shaders/planet_frag.glsl @@ -2,9 +2,11 @@ precision mediump float; -in vec4 planet_color; +uniform vec4 u_planet_colors[4]; + +in float planet_color_idx; out vec4 fragColor; void main() { - fragColor = planet_color; + fragColor = u_planet_colors[int(planet_color_idx)]; } diff --git a/res/shaders/planet_vert.glsl b/res/shaders/planet_vert.glsl index 83962d9..ee7ccde 100644 --- a/res/shaders/planet_vert.glsl +++ b/res/shaders/planet_vert.glsl @@ -7,13 +7,12 @@ layout(location = 1) in vec2 a_obj_pos; layout(location = 2) in float a_mass; layout(location = 3) in float a_planet_color_idx; -uniform vec4 u_planet_colors[4]; -out vec4 planet_color; +out float planet_color_idx; uniform mat4 u_proj; void main() { gl_Position = u_proj * vec4(a_shape_pos * a_mass + a_obj_pos, 0, 1); - planet_color = u_planet_colors[int(a_planet_color_idx)]; + planet_color_idx = a_planet_color_idx; } \ No newline at end of file -- 2.25.1