Fix uservec*_enable cvars getting set dynamically, causing hiccups. They will now...

[voretournament/voretournament.git] / data / qcsrc / client / View.qc

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 3e21c77e511f25ec928937d5af581c9dddcb3030..ef62afcbad2f315832e975313f07328a0946f140 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -695,6 +695,14 @@ void CSQC_UpdateView(float w, float h)
 \r
        if(cvar("hud_postprocessing"))\r
        {\r
+               // all of this should be done in the engine eventually\r
+\r
+               // enable or disable rendering types if they are used or not\r
+               if(cvar("r_glsl_postprocess_uservec1_enable") != (cvar("hud_postprocessing_maxbluralpha") != 0))\r
+                       cvar_set("r_glsl_postprocess_uservec1_enable", ftos(cvar("hud_postprocessing_maxbluralpha") != 0));\r
+               if(cvar("r_glsl_postprocess_uservec2_enable") != (cvar("hud_powerup") != 0))\r
+                       cvar_set("r_glsl_postprocess_uservec2_enable", ftos(cvar("hud_powerup") != 0));\r
+\r
                // lets apply the postprocess effects from the previous two functions if needed\r
                if(damage_blurpostprocess_x || content_blurpostprocess_x)\r
                {\r
@@ -703,50 +711,49 @@ void CSQC_UpdateView(float w, float h)
                        if(blurradius != old_blurradius || bluralpha != old_bluralpha) // reduce cvar_set spam as much as possible\r
                        {\r
                                cvar_set("r_glsl_postprocess_uservec1", strcat(ftos(blurradius), " ", ftos(bluralpha), " 0 0"));\r
-                               cvar_set("r_glsl_postprocess_uservec1_enable", "1");\r
                                old_blurradius = blurradius;\r
                                old_bluralpha = bluralpha;\r
                        }\r
                }\r
-               else if(cvar("r_glsl_postprocess_uservec1_enable")) // reduce cvar_set spam as much as possible\r
+               else if(cvar_string("r_glsl_postprocess_uservec1") != "0 0 0 0") // reduce cvar_set spam as much as possible\r
                {\r
                        cvar_set("r_glsl_postprocess_uservec1", "0 0 0 0");\r
-                       cvar_set("r_glsl_postprocess_uservec1_enable", "0");\r
+                       old_blurradius = 0;\r
+                       old_bluralpha = 0;\r
                }\r
 \r
-               if(cvar("hud_powerup"))\r
+               float sharpen_intensity;\r
+               if (getstatf(STAT_STRENGTH_FINISHED) - time > 0)\r
+                       sharpen_intensity += (getstatf(STAT_STRENGTH_FINISHED) - time);\r
+               if (getstatf(STAT_INVINCIBLE_FINISHED) - time > 0)\r
+                       sharpen_intensity += (getstatf(STAT_INVINCIBLE_FINISHED) - time);\r
+\r
+               if(cvar("hud_powerup") && sharpen_intensity > 0)\r
                {\r
-                       float sharpen_intensity;\r
-                       if (getstatf(STAT_STRENGTH_FINISHED) - time > 0)\r
-                               sharpen_intensity += (getstatf(STAT_STRENGTH_FINISHED) - time);\r
-                       if (getstatf(STAT_INVINCIBLE_FINISHED) - time > 0)\r
-                               sharpen_intensity += (getstatf(STAT_INVINCIBLE_FINISHED) - time);\r
                        sharpen_intensity = bound(0, sharpen_intensity, 5); // powerup warning time is 5 seconds, so fade the effect from there\r
 \r
-                       if(sharpen_intensity > 0)\r
+                       if(sharpen_intensity != old_sharpen_intensity) // reduce cvar_set spam as much as possible\r
                        {\r
-                               if(sharpen_intensity != old_sharpen_intensity) // reduce cvar_set spam as much as possible\r
-                               {\r
-                                       cvar_set("r_glsl_postprocess_uservec2", strcat("0 ", ftos(-sharpen_intensity * cvar("hud_powerup")), " 0 0"));\r
-                                       cvar_set("r_glsl_postprocess_uservec2_enable", "1");\r
-                                       old_sharpen_intensity = sharpen_intensity;\r
-                               }\r
-                       }\r
-                       else if(cvar("r_glsl_postprocess_uservec2_enable")) // reduce cvar_set spam as much as possible\r
-                       {\r
-                               cvar_set("r_glsl_postprocess_uservec2", "0 0 0 0");\r
-                               cvar_set("r_glsl_postprocess_uservec2_enable", "0");\r
+                               cvar_set("r_glsl_postprocess_uservec2", strcat("0 ", ftos(-sharpen_intensity * cvar("hud_powerup")), " 0 0"));\r
+                               old_sharpen_intensity = sharpen_intensity;\r
                        }\r
                }\r
+               else if(cvar_string("r_glsl_postprocess_uservec2") != "0 0 0 0") // reduce cvar_set spam as much as possible\r
+               {\r
+                       cvar_set("r_glsl_postprocess_uservec2", "0 0 0 0");\r
+                       old_sharpen_intensity = 0;\r
+               }\r
        }\r
 \r
-       if not(cvar("hud_damage") && cvar("hud_postprocessing"))\r
+       if(cvar("hud_postprocessing") && !cvar("hud_postprocessing_maxbluralpha"))\r
+       if(cvar("r_glsl_postprocess_uservec1_enable"))\r
        {\r
                // don't allow blur to get stuck on if we disable the cvar while damaged\r
                cvar_set("r_glsl_postprocess_uservec1", "0 0 0 0");\r
                cvar_set("r_glsl_postprocess_uservec1_enable", "0");\r
        }\r
-       if not(cvar("hud_powerup") && cvar("hud_postprocessing"))\r
+       if(cvar("hud_postprocessing") && !cvar("hud_powerup"))\r
+       if(cvar("r_glsl_postprocess_uservec2_enable"))\r
        {\r
                // don't allow sharpen to get stuck on if we disable the cvar while powered up\r
                cvar_set("r_glsl_postprocess_uservec2", "0 0 0 0");\r