diff --git a/assets/shaders/ui_shader.frag b/assets/shaders/ui_shader.frag index d599f7c..d60b826 100644 --- a/assets/shaders/ui_shader.frag +++ b/assets/shaders/ui_shader.frag @@ -9,13 +9,13 @@ uniform bool is_shape; void main() { if(is_shape) { float tick = (u_time_end - u_time) / u_duration; - float blink = smoothstep(1.0, 0.5, tick); + float blink = mix(0.5, 1.0, tick); vec4 color = vec4(blink, blink, blink, 1.0); gl_FragColor = gl_Color * color; } else { vec4 pixel = texture2D(texture, gl_TexCoord[0].xy); float tick = (u_time_end - u_time) / u_duration; - float blink = smoothstep(1.0, 0.5, tick); + float blink = mix(0.5, 1.0, tick); vec4 color = vec4(blink, blink, blink, 1.0); gl_FragColor = gl_Color * color * pixel; } diff --git a/combat_ui.cpp b/combat_ui.cpp index 0be735e..75f4dfa 100644 --- a/combat_ui.cpp +++ b/combat_ui.cpp @@ -18,7 +18,7 @@ namespace gui { $gui.set(button, {"leather_pouch-128"}); // $gui.set(button, {}); $gui.set