From 71b1d8bea34f72f5fb220a1816f6c9bfaee522e1 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 22 Nov 2021 09:57:58 +0800 Subject: *misc --- Data/Resources/Shaders/Editor-Text.glsl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Data/Resources/Shaders') diff --git a/Data/Resources/Shaders/Editor-Text.glsl b/Data/Resources/Shaders/Editor-Text.glsl index 7db820c..79f4d5d 100644 --- a/Data/Resources/Shaders/Editor-Text.glsl +++ b/Data/Resources/Shaders/Editor-Text.glsl @@ -9,14 +9,13 @@ CMD_END uniform mat4 gamelab_mat_mvp; uniform sampler2D gamelab_main_tex; uniform vec2 gamelab_ui_position; +uniform vec4 gamelab_color; VSH_BEGIN layout (location = 0) in vec2 vPos; layout (location = 1) in vec2 vUV; -layout (location = 2) in vec4 vColor; out vec2 uv; -out vec4 color; void main() { @@ -24,20 +23,18 @@ void main() vec4 clip = gamelab_mat_mvp * vec4(pos, -1, 1.0); gl_Position = clip; uv = vUV; - color = vColor; } VSH_END FSH_BEGIN in vec2 uv; -in vec4 color; out vec4 FragColor; void main() { vec4 sampled = vec4(1,1,1,texture(gamelab_main_tex, uv).r); - sampled *= color; + sampled *= gamelab_color; FragColor = sampled; } FSH_END -- cgit v1.1-26-g67d0