Use celshading and celoutlines for the cartoon effect. Keep the old system for poweru...

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 7f65b00813ba966fd02705616fc13ed6f6c9218c..c39442dce452467f06c6e07477bb595f925f04eb 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -683,6 +683,7 @@ r_mipsprites 1
 r_mipskins 1\r
 r_shadow_realtime_world_lightmaps 1\r
 r_shadow_shadowmapping 1\r
+r_shadow_deferred 1\r
 seta r_ambient 4\r
 cl_decals_fadetime 1\r
 cl_decals_time 2\r
@@ -1188,8 +1189,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_cartoon 0 "cartoon effect, reverses when you own a powerup, default is 1.5"\r
-seta hud_cartoon_tolerance 0.15 "where to apply the cartoon effect between bright and dark areas"\r
+seta hud_powerup 0 "cartoon effect, reverses when you own a powerup, default is 1.5"\r
+seta hud_powerup_tolerance 0.15 "where to apply the cartoon effect between bright and dark areas"\r
 \r
 seta hud_saturation_armor 0 "saturation changes based on the amount of armor you have"\r
 seta hud_saturation_death 0 "black and white vision when dead"\r

diff --git a/data/effects-high.cfg b/data/effects-high.cfg
index 6c3504867ee03168c319e8bd1bb62c605cdb0144..4c7289b7a943558f4cf6a3d8f88c0ef9770b9ff6 100644 (file)
--- a/data/effects-high.cfg
+++ b/data/effects-high.cfg
@@ -10,7 +10,9 @@ mod_q3bsp_nolightmaps 0
 r_bloom 1\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0.5\r
-hud_cartoon 1.5\r
+hud_powerup 1\r
+r_celshading 1\r
+r_celoutlines 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 cc490865503b0fccf546376b6e0a5c93f3aefcab..23e4d2a9ab435b72f685f3908b482dbd124ad24e 100644 (file)
--- a/data/effects-low.cfg
+++ b/data/effects-low.cfg
@@ -10,7 +10,9 @@ mod_q3bsp_nolightmaps 1
 r_bloom 0\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0\r
-hud_cartoon 0\r
+hud_powerup 0\r
+r_celshading 0\r
+r_celoutlines 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 f7209c57332738bdb9457fec950fe2f6e442be5f..54c80931a199e4badbc6a6db912b31d387d666b6 100644 (file)
--- a/data/effects-med.cfg
+++ b/data/effects-med.cfg
@@ -10,7 +10,9 @@ mod_q3bsp_nolightmaps 0
 r_bloom 0\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0\r
-hud_cartoon 0\r
+hud_powerup 0\r
+r_celshading 0\r
+r_celoutlines 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 887f0e3576d9fa080774e07ddd788139d995ca5a..dbb49517a55583cc09debea7004449c16c6921dd 100644 (file)
--- a/data/effects-normal.cfg
+++ b/data/effects-normal.cfg
@@ -10,7 +10,9 @@ mod_q3bsp_nolightmaps 0
 r_bloom 0\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0\r
-hud_cartoon 0\r
+hud_powerup 0\r
+r_celshading 0\r
+r_celoutlines 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 c256e722ed68954f084124ff339900b9e0502e07..eb315912b098382a4c4bc3ff9e3748806115766b 100644 (file)
--- a/data/effects-omg.cfg
+++ b/data/effects-omg.cfg
@@ -10,7 +10,9 @@ mod_q3bsp_nolightmaps 1
 r_bloom 0\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0\r
-hud_cartoon 0\r
+hud_powerup 0\r
+r_celshading 0\r
+r_celoutlines 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 1fe14a833f6fa7fb177ff53c5cccf1515a2ad6ec..45db9ca22ebd67d1e66d4366b175133bbd54e0e8 100644 (file)
--- a/data/effects-ultimate.cfg
+++ b/data/effects-ultimate.cfg
@@ -10,7 +10,9 @@ mod_q3bsp_nolightmaps 0
 r_bloom 1\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0.5\r
-hud_cartoon 1.5\r
+hud_powerup 1\r
+r_celshading 1\r
+r_celoutlines 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 c487920089e43483783da9f66de152ff1a447496..d6985cb87208173acdd247113975a693054da242 100644 (file)
--- a/data/effects-ultra.cfg
+++ b/data/effects-ultra.cfg
@@ -10,7 +10,9 @@ mod_q3bsp_nolightmaps 0
 r_bloom 1\r
 r_coronas 1\r
 hud_postprocessing_maxbluralpha 0.5\r
-hud_cartoon 1.5\r
+hud_powerup 1\r
+r_celshading 1\r
+r_celoutlines 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 bd47712070c7091674e5f565b9da4397e1617d6b..b6eb14c10dc630d416110877b361795e4d4257c8 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -904,8 +904,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_cartoon") != 0))\r
-                       cvar_set("r_glsl_postprocess_uservec2_enable", ftos(cvar("hud_cartoon") != 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) && cvar("chase_active") >= 0) // not while the event chase camera is active\r
@@ -926,20 +926,24 @@ void CSQC_UpdateView(float w, float h)
                        old_bluralpha = 0;\r
                }\r
 \r
-               if(cvar("hud_cartoon"))\r
+               if(cvar("hud_powerup"))\r
                {\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
+                       // When having the strength or invincible powerups, enable white outlines\r
+                       // As powerup time goes under 5 seconds (warning time) the lines fade away\r
+                       float cartoon_intensity;\r
+\r
+                       if((getstatf(STAT_STRENGTH_FINISHED) >= time || getstatf(STAT_INVINCIBLE_FINISHED) >= time) && cvar("chase_active") >= 0)\r
+                       {\r
+                               // not while the event chase camera is active\r
+                               cartoon_intensity = bound(0, getstatf(STAT_STRENGTH_FINISHED) - time, 5) + bound(0, getstatf(STAT_INVINCIBLE_FINISHED) - time, 5);\r
+                               cartoon_intensity = cvar("hud_powerup") * bound(0, cartoon_intensity, 5);\r
+                       }\r
+                       else\r
+                               cartoon_intensity = 0;\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(cartoon_intensity), " ", cvar_string("hud_cartoon_tolerance"), " 0"));\r
+                               cvar_set("r_glsl_postprocess_uservec2", strcat("0 ", ftos(cartoon_intensity), " ", cvar_string("hud_powerup_tolerance"), " 0"));\r
                                old_cartoon_intensity = cartoon_intensity;\r
                        }\r
                }\r
@@ -957,7 +961,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_cartoon"))\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

diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index 313f8a1eef301308ba2f90baa4bf7014523512d3..97f7e983ec97c5f7751beab80b698b0086376cfd 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_effects.c
+++ b/data/qcsrc/menu/voret/dialog_settings_effects.c
@@ -162,7 +162,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.5, 0, "hud_cartoon", "Cartoon lines"));\r
+               me.TD(me, 1, 1, e = makeVoretCheckBoxEx(1, 0, "hud_powerup", "Cartoon"));\r
+               makeMulti(e, "r_celshading r_celoutlines");\r
                me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Content blur"));\r
                me.TD(me, 1, 1, e = makeVoretCheckBox(0, "hud_saturation_armor", "Saturation"));\r
                makeMulti(e, "hud_saturation_death");\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index cdae9fd8a03c165c6eeeeb4a695c983a809fcdd3..d5c41ad73fd5d0bd3b559d85a227f69a048e2084 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -251,3 +251,5 @@
 - 0.8 BUG: In player.sounds files, "tag female" is used for the male voices too\r
 \r
 - 0.8: Fix all the gmqcc warnings when using the default Xonotic parameters\r
+\r
+- 0.9: Port and default the Luminos HUD & menu style from Xonotic\r