Add a permanent post-processing cartoon effect (previously visible when you had the...

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 07285a28b8d0151acb1a953ee36d8f85cd00ca15..b4eb373a4d20c566ccdbc87f494cdae54b3cb7d0 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1152,7 +1152,8 @@ seta hud_damage_pain_threshold_lower_health 50 "at which health we start lowerin
 seta hud_damage_pain_threshold_pulsating_min 0.6 "minimum value when calculating the pulse: max(pulsating_min, fabs(sin(PI * time / period))"\r
 seta hud_damage_pain_threshold_pulsating_period 0.8 "one pulse every X seconds"\r
 \r
-seta hud_powerup 0 "power of the sharpen effect when owning the shield or strength powerups, default is 0.5"\r
+seta hud_cartoon 0 "cartoon effect, reverses when you own a powerup"\r
+seta hud_cartoon_tolerance 0.1 "where to apply the cartoon effect between bright and dark areas"\r
 \r
 seta hud_saturation 0 "saturation changes based on the amount of armor you have"\r
 \r

diff --git a/data/effects-high.cfg b/data/effects-high.cfg
index c99d62cac35884c0cde8016cd06b056b3bbd6e5a..ddf45dcc5ad8ebf2434a218e8ab008a39773d240 100644 (file)
--- a/data/effects-high.cfg
+++ b/data/effects-high.cfg
@@ -11,7 +11,7 @@ mod_q3bsp_nolightmaps 0
 r_bloom 1\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0.5\r
-hud_powerup 0.25\r
+hud_cartoon 1\r
 hud_saturation 0\r
 r_depthfirst 2\r
 r_drawdecals_drawdistance 500\r

diff --git a/data/effects-low.cfg b/data/effects-low.cfg
index 112f6c19d205f42df4b19451b2a9dd3a99e18e02..a627d960802a3bc00a75108fd430098f4a76c4c3 100644 (file)
--- a/data/effects-low.cfg
+++ b/data/effects-low.cfg
@@ -11,7 +11,7 @@ mod_q3bsp_nolightmaps 1
 r_bloom 0\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0\r
-hud_powerup 0\r
+hud_cartoon 0\r
 hud_saturation 0\r
 r_depthfirst 0\r
 r_drawdecals_drawdistance 200\r

diff --git a/data/effects-med.cfg b/data/effects-med.cfg
index 9de94c748c21539a8e17b7ac4c20933a85b86ae4..dc779547376db9f858f40f4d45d88491f578669d 100644 (file)
--- a/data/effects-med.cfg
+++ b/data/effects-med.cfg
@@ -11,7 +11,7 @@ mod_q3bsp_nolightmaps 0
 r_bloom 0\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0\r
-hud_powerup 0\r
+hud_cartoon 0\r
 hud_saturation 0\r
 r_depthfirst 0\r
 r_drawdecals_drawdistance 300\r

diff --git a/data/effects-normal.cfg b/data/effects-normal.cfg
index f244dbfaf081bda54d7c04258e40db81f0270a3a..b49270d2f48e57ff5705835daac83ee11654eb73 100644 (file)
--- a/data/effects-normal.cfg
+++ b/data/effects-normal.cfg
@@ -11,7 +11,7 @@ mod_q3bsp_nolightmaps 0
 r_bloom 0\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0\r
-hud_powerup 0\r
+hud_cartoon 0\r
 hud_saturation 0\r
 r_depthfirst 1\r
 r_drawdecals_drawdistance 300\r

diff --git a/data/effects-omg.cfg b/data/effects-omg.cfg
index 8b2b231bc2fa573c7bd79f3ff26ea6eab35fdaa0..0d59ff7a3fe3f4bd2e7d529f0b034cdd6f402f56 100644 (file)
--- a/data/effects-omg.cfg
+++ b/data/effects-omg.cfg
@@ -11,7 +11,7 @@ mod_q3bsp_nolightmaps 1
 r_bloom 0\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0\r
-hud_powerup 0\r
+hud_cartoon 0\r
 hud_saturation 0\r
 r_depthfirst 0\r
 r_drawdecals_drawdistance 100\r

diff --git a/data/effects-ultimate.cfg b/data/effects-ultimate.cfg
index 9f9020a7c1db0d74917ee538e6614c7267ccab0e..8f467f76e3938deae9c4d11cf322b849671abab9 100644 (file)
--- a/data/effects-ultimate.cfg
+++ b/data/effects-ultimate.cfg
@@ -11,7 +11,7 @@ mod_q3bsp_nolightmaps 0
 r_bloom 1\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0.5\r
-hud_powerup 0.25\r
+hud_cartoon 1\r
 hud_saturation 1\r
 r_depthfirst 2\r
 r_drawdecals_drawdistance 500\r

diff --git a/data/effects-ultra.cfg b/data/effects-ultra.cfg
index 7b2ba69b39f8d4847ef6729d3c2758f2ee583f53..0c7aafed1df8916b139022ad56ddc9cc8a6a06a6 100644 (file)
--- a/data/effects-ultra.cfg
+++ b/data/effects-ultra.cfg
@@ -11,7 +11,7 @@ mod_q3bsp_nolightmaps 0
 r_bloom 1\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0.5\r
-hud_powerup 0.25\r
+hud_cartoon 1\r
 hud_saturation 1\r
 r_depthfirst 2\r
 r_drawdecals_drawdistance 500\r

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index e5104c4e780cad88952b450b9a3024a8f96a2cc5..113d8c5423b290f4ca6ed6fd447cac7c92599481 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -253,7 +253,7 @@ float pickup_crosshair_time, pickup_crosshair_size, pickup_flash_time, vore_flas
 float spawnfov_current;\r
 float myhealth, myhealth_prev, myhealth_flash;\r
 float contentavgalpha, liquidalpha_prev;\r
-float old_blurradius, old_bluralpha, old_sharpen_intensity;\r
+float old_blurradius, old_bluralpha, old_cartoon_intensity;\r
 float stomachsplash_alpha;\r
 float volume_modify_1, volume_modify_2, volume_modify_default_1, volume_modify_default_2;\r
 float volume_modify_changed_1, volume_modify_changed_2;\r
@@ -882,8 +882,8 @@ void CSQC_UpdateView(float w, float h)
                // 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
+               if(cvar("r_glsl_postprocess_uservec2_enable") != (cvar("hud_cartoon") != 0))\r
+                       cvar_set("r_glsl_postprocess_uservec2_enable", ftos(cvar("hud_cartoon") != 0));\r
 \r
                // lets apply the postprocess effects from the previous two functions if needed\r
                if((damage_blurpostprocess_x || content_blurpostprocess_x) && cvar("chase_active") >= 0) // not while the event chase camera is active\r
@@ -904,26 +904,27 @@ void CSQC_UpdateView(float w, float h)
                        old_bluralpha = 0;\r
                }\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
-\r
-               if(cvar("hud_powerup") && sharpen_intensity > 0 && cvar("chase_active") >= 0) // not while the event chase camera is active\r
+               if(cvar("hud_cartoon"))\r
                {\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 != old_sharpen_intensity) // reduce cvar_set spam as much as possible\r
+                       // When having the strength or invincible powerups, cartoon lines will be white instead of black.\r
+                       // As powerup time goes under 5 seconds (warning time), lines will fade from white to nothing then from nothing back to black.\r
+                       float cartoon_intensity, cartoon_powerup;\r
+                       cartoon_intensity = -cvar("hud_cartoon");\r
+                       cartoon_powerup = bound(0, getstatf(STAT_STRENGTH_FINISHED) - time, 5) + bound(0, getstatf(STAT_INVINCIBLE_FINISHED) - time, 5);\r
+                       cartoon_powerup = bound(0, cartoon_powerup, 5);\r
+                       if (cartoon_powerup && cvar("chase_active") >= 0) // not while the event chase camera is active\r
+                               cartoon_intensity *= 1 - cartoon_powerup / 2.5; // cycle between -1 and 1\r
+\r
+                       if(cartoon_intensity != old_cartoon_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
-                               old_sharpen_intensity = sharpen_intensity;\r
+                               cvar_set("r_glsl_postprocess_uservec2", strcat("0 ", ftos(cartoon_intensity), " ", cvar_string("hud_cartoon_tolerance"), " 0"));\r
+                               old_cartoon_intensity = cartoon_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
+                       old_cartoon_intensity = 0;\r
                }\r
        }\r
 \r
@@ -934,7 +935,7 @@ void CSQC_UpdateView(float w, float h)
                cvar_set("r_glsl_postprocess_uservec1", "0 0 0 0");\r
                cvar_set("r_glsl_postprocess_uservec1_enable", "0");\r
        }\r
-       if(cvar("hud_postprocessing") && !cvar("hud_powerup"))\r
+       if(cvar("hud_postprocessing") && !cvar("hud_cartoon"))\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

diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index d14e43db736f3dc1c2851705d1c7906da37a1855..e18f9699e7be7dead24ba1f8bbc7133111e4981b 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_effects.c
+++ b/data/qcsrc/menu/voret/dialog_settings_effects.c
@@ -180,8 +180,8 @@ void fillVoretEffectsSettingsTab(entity me)
                        e.savedValue = 0.5; // default\r
                me.TD(me, 1, 2, s);\r
        me.TR(me);\r
+               me.TD(me, 1, 1, e = makeVoretCheckBoxEx(1, 0, "hud_cartoon", "Cartoon lines"));\r
                me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Damage & Water blur"));\r
-               me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.25, 0, "hud_powerup", "Powerup sharpen"));\r
                me.TD(me, 1, 1, e = makeVoretCheckBox(0, "hud_saturation", "Armor saturation"));\r
 \r
        me.gotoRC(me, me.rows - 1, 0);\r

diff --git a/docs/Release notes.txt b/docs/Release notes.txt
index 549f86bdf9771b3b99f74af01e7fadddef9f2629..cb9a67a37dbc0fa1353a5a1ae8b74b8fbe536126 100644 (file)
--- a/docs/Release notes.txt
+++ b/docs/Release notes.txt
@@ -283,3 +283,5 @@ Features:
 - Improvements to the vixen mesh. Models have been switched from zym to iqm (better and newer format), polygon count has been doubled, stomach bulges are more detailed, and the vixens are a bit more chubby and fluffy.\r
 \r
 - 4 new Nexuiz maps, including race.\r
+\r
+- Post-processing: Add a permenent cartoon effect to the menu, previously visible when having the Strength or Shield powerups. Instead, the effect is always visible now, but the cartoon lines are white instead of black while you own a powerup.\r