]> de.git.xonotic.org Git - voretournament/voretournament.git/blobdiff - data/qcsrc/client/View.qc
First step toward repairing the volume adjusters with the cutsound feature. It was...
[voretournament/voretournament.git] / data / qcsrc / client / View.qc
index 07321ed6228c6922a20e1309ce94d50228a84b69..0e4167c83fff54e70f9dbb7bff3e2c9aa5b1a41b 100644 (file)
@@ -255,8 +255,11 @@ float artwork_fade;
 float pickup_crosshair_time, pickup_crosshair_size;\r
 float myhealth, myhealth_prev, myhealth_flash;\r
 float contentavgalpha, liquidalpha_prev;\r
+float stomachsplash_alpha, stomachsplash_remove_at_respawn;\r
+float volume_modify_1, volume_modify_2, volume_modify_default_1, volume_modify_default_2;\r
 vector myhealth_gentlergb;\r
 vector liquidcolor_prev;\r
+vector damage_blurpostprocess, content_blurpostprocess;\r
 string artwork_image;\r
 string intermission_song;\r
 string NextFrameCommand;\r
@@ -459,32 +462,41 @@ void CSQC_UpdateView(float w, float h)
        {\r
                float contentalpha_temp, incontent, liquidalpha, contentfadetime;\r
                vector liquidcolor;\r
-               \r
-               switch(pointcontents(view_origin))\r
+\r
+               if (getstati(STAT_VORE_EATEN))\r
                {\r
-                       case CONTENT_WATER:\r
-                               liquidalpha = cvar("hud_contents_water_alpha");\r
-                               liquidcolor = stov(cvar_string("hud_contents_water_color"));\r
-                               incontent = 1;\r
-                               break;\r
-                               \r
-                       case CONTENT_LAVA:\r
-                               liquidalpha = cvar("hud_contents_lava_alpha");\r
-                               liquidcolor = stov(cvar_string("hud_contents_lava_color"));\r
-                               incontent = 1;\r
-                               break;  \r
-                                                       \r
-                       case CONTENT_SLIME:\r
-                               liquidalpha = cvar("hud_contents_slime_alpha");\r
-                               liquidcolor = stov(cvar_string("hud_contents_slime_color"));\r
-                               incontent = 1;\r
-                               break;\r
-                               \r
-                       default:\r
-                               liquidalpha = 0;\r
-                               liquidcolor = '0 0 0';\r
-                               incontent = 0;\r
-                               break;\r
+                       liquidalpha = cvar("hud_contents_stomach_alpha");\r
+                       liquidcolor = stov(cvar_string("hud_contents_stomach_color"));\r
+                       incontent = 1;\r
+               }\r
+               else\r
+               {\r
+                       switch(pointcontents(view_origin))\r
+                       {\r
+                               case CONTENT_WATER:\r
+                                       liquidalpha = cvar("hud_contents_water_alpha");\r
+                                       liquidcolor = stov(cvar_string("hud_contents_water_color"));\r
+                                       incontent = 1;\r
+                                       break;\r
+                                       \r
+                               case CONTENT_LAVA:\r
+                                       liquidalpha = cvar("hud_contents_lava_alpha");\r
+                                       liquidcolor = stov(cvar_string("hud_contents_lava_color"));\r
+                                       incontent = 1;\r
+                                       break;  \r
+                                                               \r
+                               case CONTENT_SLIME:\r
+                                       liquidalpha = cvar("hud_contents_slime_alpha");\r
+                                       liquidcolor = stov(cvar_string("hud_contents_slime_color"));\r
+                                       incontent = 1;\r
+                                       break;\r
+                                       \r
+                               default:\r
+                                       liquidalpha = 0;\r
+                                       liquidcolor = '0 0 0';\r
+                                       incontent = 0;\r
+                                       break;\r
+                       }\r
                }\r
                \r
                if(incontent) // fade in/out at different speeds so you can do e.g. instant fade when entering water and slow when leaving it.\r
@@ -501,6 +513,31 @@ void CSQC_UpdateView(float w, float h)
                \r
                if(contentavgalpha)\r
                        drawfill('0 0 0', '1 0 0' * vid_conwidth + '0 1 0' * vid_conheight, liquidcolor_prev, contentavgalpha * liquidalpha_prev, DRAWFLAG_NORMAL);\r
+\r
+               if(cvar("hud_postprocessing"))\r
+               {\r
+                       if(cvar("hud_contents_liquid_blur"))\r
+                       {\r
+                               // when inside the stomach, we use different blur settings than when we're inside other fluids\r
+                               content_blurpostprocess_x = 1;\r
+                               if(getstati(STAT_VORE_EATEN))\r
+                               {\r
+                                       content_blurpostprocess_y = contentavgalpha * cvar("hud_contents_stomach_blur");\r
+                                       content_blurpostprocess_z = contentavgalpha * cvar("hud_contents_stomach_blur_alpha");\r
+                               }\r
+                               else\r
+                               {\r
+                                       content_blurpostprocess_y = contentavgalpha * cvar("hud_contents_liquid_blur");\r
+                                       content_blurpostprocess_z = contentavgalpha * cvar("hud_contents_liquid_blur_alpha");\r
+                               }\r
+                       }\r
+                       else\r
+                       {\r
+                               content_blurpostprocess_x = 0;\r
+                               content_blurpostprocess_y = 0;\r
+                               content_blurpostprocess_z = 0;\r
+                       }\r
+               }\r
        }\r
 \r
        if(cvar("hud_damage"))\r
@@ -562,6 +599,150 @@ void CSQC_UpdateView(float w, float h)
                }\r
                else\r
                        drawpic('0 0 0', "gfx/blood", '1 0 0' * vid_conwidth + '0 1 0' * vid_conheight, stov(cvar_string("hud_damage_color")), bound(0, myhealth_flash_temp, 1) * cvar("hud_damage"), DRAWFLAG_NORMAL);\r
+\r
+               if(cvar("hud_postprocessing"))\r
+               {\r
+                       if(cvar("hud_damage_blur"))\r
+                       {\r
+                               damage_blurpostprocess_x = 1;\r
+                               damage_blurpostprocess_y = bound(0, myhealth_flash_temp, 1) * cvar("hud_damage_blur");\r
+                               damage_blurpostprocess_z = bound(0, myhealth_flash_temp, 1) * cvar("hud_damage_blur_alpha");\r
+                       }\r
+                       else\r
+                       {\r
+                               damage_blurpostprocess_x = 0;\r
+                               damage_blurpostprocess_y = 0;\r
+                               damage_blurpostprocess_z = 0;\r
+                       }\r
+               }\r
+       }\r
+\r
+       if(cvar("hud_stomach"))\r
+       {\r
+               if(getstati(STAT_VORE_EATEN))\r
+               {\r
+                       if(stomachsplash_alpha < cvar("hud_stomach"))\r
+                               stomachsplash_alpha += cvar("hud_stomach_fade_in") * frametime;\r
+                       else\r
+                               stomachsplash_alpha = cvar("hud_stomach");\r
+               }\r
+               else if(getstati(STAT_HEALTH) > 0)\r
+               {\r
+                       if(stomachsplash_alpha > 0)\r
+                               stomachsplash_alpha -= cvar("hud_stomach_fade_out") * frametime;\r
+                       else\r
+                               stomachsplash_alpha = 0;\r
+               }\r
+               if(getstati(STAT_HEALTH) <= 0)\r
+                       stomachsplash_remove_at_respawn = 1; // schedule the effect to be removed next respawn\r
+\r
+               if(getstati(STAT_HEALTH) > 0 && stomachsplash_remove_at_respawn)\r
+                       stomachsplash_alpha = stomachsplash_remove_at_respawn = 0; // we respawned, remove the effect\r
+               if(spectatee_status == -1)\r
+                       stomachsplash_alpha = 0;\r
+\r
+               stomachsplash_alpha = bound(0, stomachsplash_alpha, 1);\r
+               drawpic('0 0 0', "gfx/food", '1 0 0' * vid_conwidth + '0 1 0' * vid_conheight, stov(cvar_string("hud_stomach_color")), stomachsplash_alpha, DRAWFLAG_NORMAL);\r
+       }\r
+\r
+       if(cvar("hud_postprocessing"))\r
+       {\r
+               // lets apply the postprocess effects from the previous two functions if needed\r
+               if(damage_blurpostprocess_x || content_blurpostprocess_x)\r
+               {\r
+                       float blurradius = bound(0, damage_blurpostprocess_y + content_blurpostprocess_y, cvar("hud_postprocessing_maxblurradius"));\r
+                       float bluralpha = bound(0, damage_blurpostprocess_z + content_blurpostprocess_z, cvar("hud_postprocessing_maxbluralpha"));\r
+                       cvar_set("r_glsl_postprocess_uservec1", strcat(ftos(blurradius), " ", ftos(bluralpha), " 0 0"));\r
+                       cvar_set("r_glsl_postprocess_uservec1_enable", "1");\r
+               }\r
+               else\r
+               {\r
+                       cvar_set("r_glsl_postprocess_uservec1", "0 0 0 0");\r
+                       cvar_set("r_glsl_postprocess_uservec1_enable", "0");\r
+               }\r
+\r
+               if(cvar("hud_powerup"))\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
+                       {\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
+                       }\r
+                       else\r
+                       {\r
+                               cvar_set("r_glsl_postprocess_uservec2", "0 0 0 0");\r
+                               cvar_set("r_glsl_postprocess_uservec2_enable", "0");\r
+                       }\r
+               }\r
+       }\r
+\r
+       if not(cvar("hud_damage") && cvar("hud_postprocessing"))\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
+       {\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
+               cvar_set("r_glsl_postprocess_uservec2_enable", "0");\r
+       }\r
+\r
+       if(cvar("cl_vore_cutvolume_sound") < 1 || cvar("cl_vore_cutvolume_music") < 1)\r
+       {\r
+               float volume_modify_1_target, volume_modify_2_target, volume_modify_fade;\r
+               if(getstati(STAT_VORE_EATEN))\r
+               {\r
+                       volume_modify_1_target = volume_modify_default_1 * cvar("cl_vore_cutvolume_sound");\r
+                       volume_modify_2_target = volume_modify_default_2 * cvar("cl_vore_cutvolume_music");\r
+               }\r
+               else\r
+               {\r
+                       volume_modify_1_target = 1;\r
+                       volume_modify_2_target = 1;\r
+               }\r
+               volume_modify_fade = cvar("cl_vore_cutvolume_fade") * frametime;\r
+\r
+               if(spectatee_status == -1 || intermission)\r
+               {\r
+                       // no volume fading is currently taking place, so if we change the volume settings, update the initial volume\r
+                       volume_modify_default_1 = cvar("volume");\r
+                       volume_modify_default_2 = cvar("bgmvolume");\r
+               }\r
+               else if(volume_modify_1 != volume_modify_1_target || volume_modify_2 != volume_modify_2_target)\r
+               {\r
+                       if (volume_modify_1 > volume_modify_1_target + volume_modify_fade)\r
+                               volume_modify_1 -= volume_modify_fade;\r
+                       else if (volume_modify_1 < volume_modify_1_target - volume_modify_fade)\r
+                               volume_modify_1 += volume_modify_fade;\r
+                       else\r
+                               volume_modify_1 = volume_modify_1_target;\r
+\r
+                       if (volume_modify_2 > volume_modify_2_target + volume_modify_fade)\r
+                               volume_modify_2 -= volume_modify_fade;\r
+                       else if (volume_modify_2 < volume_modify_2_target - volume_modify_fade)\r
+                               volume_modify_2 += volume_modify_fade;\r
+                       else\r
+                               volume_modify_2 = volume_modify_1_target;\r
+\r
+                       cvar_set("volume", ftos(volume_modify_1));\r
+                       cvar_set("bgmvolume", ftos(volume_modify_2));\r
+                       // TODO: Setting the "volume" cvar is a bad way to go, and modifies the menu slider! We need a better way\r
+               }\r
+               else if(cvar("volume") != volume_modify_default_1 || cvar("bgmvolume") != volume_modify_default_2)\r
+               {\r
+                       // no volume fading is currently taking place, so if we change the volume settings, update the initial volume\r
+                       volume_modify_default_1 = cvar("volume");\r
+                       volume_modify_default_2 = cvar("bgmvolume");\r
+               }\r
        }\r
 \r
        // Draw the mouse cursor\r