From 445a385ecbdb58343cb202021c09551ec24e3c69 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Tue, 1 Mar 2011 17:32:48 +0200 Subject: [PATCH] Several other fixes to the blur / sharpen effects --- data/qcsrc/client/View.qc | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 7bf9b48a..b96fb7e0 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -712,32 +712,33 @@ void CSQC_UpdateView(float w, float h) { cvar_set("r_glsl_postprocess_uservec1", "0 0 0 0"); cvar_set("r_glsl_postprocess_uservec1_enable", "0"); + old_blurradius = 0; + old_bluralpha = 0; } - if(cvar("hud_powerup")) + float sharpen_intensity; + if (getstatf(STAT_STRENGTH_FINISHED) - time > 0) + sharpen_intensity += (getstatf(STAT_STRENGTH_FINISHED) - time); + if (getstatf(STAT_INVINCIBLE_FINISHED) - time > 0) + sharpen_intensity += (getstatf(STAT_INVINCIBLE_FINISHED) - time); + + if(cvar("hud_powerup") && sharpen_intensity > 0) { - float sharpen_intensity; - if (getstatf(STAT_STRENGTH_FINISHED) - time > 0) - sharpen_intensity += (getstatf(STAT_STRENGTH_FINISHED) - time); - if (getstatf(STAT_INVINCIBLE_FINISHED) - time > 0) - sharpen_intensity += (getstatf(STAT_INVINCIBLE_FINISHED) - time); sharpen_intensity = bound(0, sharpen_intensity, 5); // powerup warning time is 5 seconds, so fade the effect from there - if(sharpen_intensity > 0) + if(sharpen_intensity != old_sharpen_intensity) // reduce cvar_set spam as much as possible { - if(sharpen_intensity != old_sharpen_intensity) // reduce cvar_set spam as much as possible - { - cvar_set("r_glsl_postprocess_uservec2", strcat("0 ", ftos(-sharpen_intensity * cvar("hud_powerup")), " 0 0")); - cvar_set("r_glsl_postprocess_uservec2_enable", "1"); - old_sharpen_intensity = sharpen_intensity; - } - } - else if(cvar("r_glsl_postprocess_uservec2_enable")) // reduce cvar_set spam as much as possible - { - cvar_set("r_glsl_postprocess_uservec2", "0 0 0 0"); - cvar_set("r_glsl_postprocess_uservec2_enable", "0"); + cvar_set("r_glsl_postprocess_uservec2", strcat("0 ", ftos(-sharpen_intensity * cvar("hud_powerup")), " 0 0")); + cvar_set("r_glsl_postprocess_uservec2_enable", "1"); + old_sharpen_intensity = sharpen_intensity; } } + else if(cvar("r_glsl_postprocess_uservec2_enable")) // reduce cvar_set spam as much as possible + { + cvar_set("r_glsl_postprocess_uservec2", "0 0 0 0"); + cvar_set("r_glsl_postprocess_uservec2_enable", "0"); + old_sharpen_intensity = 0; + } } if(cvar("hud_postprocessing") && !cvar("hud_postprocessing_maxbluralpha")) -- 2.39.2