void CSQC_Demo_Camera();\r
float Sbar_WouldDrawScoreboard ();\r
float last_health, last_spectatee;\r
-float view_set;\r
float camera_mode;\r
float reticle_type;\r
float chase_active_old;\r
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
float eventchase_current_distance;\r
float helper_pause, helper_health, helper_armor, helper_ammo, helper_speed, helper_stomachload;\r
+vector freeze_org, freeze_ang;\r
vector myhealth_gentlergb;\r
vector liquidcolor_prev;\r
vector damage_blurpostprocess, content_blurpostprocess;\r
\r
// helper system\r
if(cvar("cl_helper"))\r
+ if not(getstati(STAT_ARMOR) < g_power || time <= power_boot)\r
{\r
if(intermission || respawned || spectatee_status < 0 || getstati(STAT_HEALTH) <= 0 || getstati(STAT_VORE_EATEN))\r
{\r
// event chase camera\r
if(cvar("chase_active") <= 0) // greater than 0 means it's enabled manually, and this code is skipped\r
{\r
- if(!getstati(STAT_VORE_EATEN) && spectatee_status >= 0 && (cvar("cl_eventchase_death") && getstati(STAT_HEALTH) <= 0 && !intermission))\r
+ if(spectatee_status >= 0 && (cvar("cl_eventchase_death") && getstati(STAT_HEALTH) <= 0 && !intermission) || intermission)\r
{\r
+ // make special vector since we can't use view_origin (It is one frame old as of this code, it gets set later with the results this code makes.)\r
+ vector current_view_origin = getpropertyvec(VF_ORIGIN);\r
+ \r
// We must enable chase_active to get a third person view (weapon viewmodel hidden and own player model showing).\r
- // Ideally, there should be another way to enable third person cameras, such as through R_SetView()\r
+ // Ideally, there should be another way to enable third person cameras, such as through setproperty()\r
if(!cvar("chase_active"))\r
cvar_set("chase_active", "-1"); // -1 enables chase_active while marking it as set by this code, and not by the user (which would be 1)\r
\r
vector eventchase_target_origin;\r
makevectors(view_angles);\r
// pass 1, used to check where the camera would go and obtain the trace_fraction\r
- eventchase_target_origin = pmove_org - v_forward * eventchase_current_distance;\r
-\r
- traceline(pmove_org, eventchase_target_origin, MOVE_WORLDONLY, self);\r
+ eventchase_target_origin = current_view_origin - v_forward * eventchase_current_distance;\r
+ WarpZone_TraceLine(current_view_origin, eventchase_target_origin, MOVE_WORLDONLY, self);\r
// pass 2, also multiplying view_forward with trace_fraction, to prevent the camera from going through walls\r
// The 0.1 subtraction is to not limit the camera precisely at the wall surface, as that allows the view to poke through\r
- eventchase_target_origin = pmove_org - v_forward * eventchase_current_distance * (trace_fraction - 0.1);\r
+ eventchase_target_origin = current_view_origin - v_forward * eventchase_current_distance * (trace_fraction - 0.1);\r
+ WarpZone_TraceLine(current_view_origin, eventchase_target_origin, MOVE_WORLDONLY, self);\r
\r
- R_SetView(VF_ORIGIN, eventchase_target_origin);\r
- R_SetView(VF_ANGLES, view_angles);\r
+ setproperty(VF_ORIGIN, trace_endpos);\r
+ setproperty(VF_ANGLES, WarpZone_TransformVAngles(WarpZone_trace_transform, view_angles));\r
}\r
else if(cvar("chase_active") < 0) // time to disable chase_active if it was set by this code\r
{\r
}\r
}\r
\r
- // Render the Scene\r
- if(!intermission || !view_set)\r
+ float apply_fov;\r
+ if(cvar("cl_healthsize_fov") && frametime)\r
+ {\r
+ apply_fov = cvar("menu_fov");\r
+ if(g_healthsize_center && spectatee_status >= 0)\r
+ apply_fov += (g_healthsize_center - bound(g_healthsize_min, getstati(STAT_HEALTH), g_healthsize_max)) * cvar("cl_healthsize_fov");\r
+ if(cvar("gov") != apply_fov)\r
+ cvar_set("fov", ftos(apply_fov));\r
+ }\r
+\r
+ float apply_idlescale;\r
+ if(cvar("cl_vore_vieweffects_idlescale_prey") && frametime)\r
+ {\r
+ apply_idlescale += getstatf(STAT_VORE_PROGRESS_PREY) * cvar("cl_vore_vieweffects_idlescale_prey");\r
+ if(cvar("v_idlescale") != apply_idlescale)\r
+ cvar_set("v_idlescale", ftos(apply_idlescale));\r
+ }\r
+ if(cvar("cl_vore_vieweffects_idlescale_predator") && frametime)\r
+ {\r
+ apply_idlescale += getstatf(STAT_VORE_PROGRESS_PRED) * cvar("cl_vore_vieweffects_idlescale_predator");\r
+ if(cvar("v_idlescale") != apply_idlescale)\r
+ cvar_set("v_idlescale", ftos(apply_idlescale));\r
+ }\r
+ if(cvar("cl_vore_vieweffects_idlescale_stomach") && frametime)\r
+ {\r
+ apply_idlescale += getstati(STAT_VORE_EATEN) * cvar("cl_vore_vieweffects_idlescale_stomach");\r
+ if(cvar("v_idlescale") != apply_idlescale)\r
+ cvar_set("v_idlescale", ftos(apply_idlescale));\r
+ }\r
+\r
+ // do lockview after event chase camera so that it still applies whenever necessary.\r
+ if(intermission > 1)\r
{\r
- view_origin = pmove_org + vo;\r
- view_angles = input_angles;\r
- makevectors(view_angles);\r
- view_forward = v_forward;\r
- view_right = v_right;\r
- view_up = v_up;\r
- view_set = 1;\r
+ setproperty(VF_ORIGIN, freeze_org);\r
+ setproperty(VF_ANGLES, freeze_ang);\r
+ }\r
+ else\r
+ {\r
+ freeze_org = getpropertyvec(VF_ORIGIN);\r
+ freeze_ang = getpropertyvec(VF_ANGLES);\r
}\r
\r
+ // Render the Scene\r
+ view_origin = getpropertyvec(VF_ORIGIN);\r
+ view_angles = getpropertyvec(VF_ANGLES);\r
+ makevectors(view_angles);\r
+ view_forward = v_forward;\r
+ view_right = v_right;\r
+ view_up = v_up;\r
+\r
vid_width = w;\r
vid_height = h;\r
\r
// ALWAYS Clear Current Scene First\r
R_ClearScene();\r
\r
+ if(checkextension("DP_CSQC_ROTATEMOVES"))\r
+ {\r
+ setproperty(VF_ORIGIN, view_origin);\r
+ setproperty(VF_ANGLES, view_angles);\r
+ }\r
+\r
// Assign Standard Viewflags\r
// Draw the World (and sky)\r
R_SetView(VF_DRAWWORLD, 1);\r
fov *= spawnfov_current;\r
}\r
\r
+ if(respawned)\r
+ {\r
+ if(g_power_reboot_spawn)\r
+ power_boot = time + g_power_reboot;\r
+ else\r
+ power_boot = time;\r
+ }\r
+\r
R_SetView(VF_FOV, GetCurrentFov(fov));\r
\r
// Camera for demo playback\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
+ 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
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
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
cvar_set("r_glsl_saturation", "1");\r
}\r
\r
- // volume cutting\r
- if(cvar("cl_vore_cutvolume_sound") < 1 || cvar("cl_vore_cutvolume_music") < 1)\r
+ float target_volume;\r
+ if(cvar("cl_vore_cutvolume_sound") && frametime)\r
{\r
- float volume_modify_1_target, volume_modify_2_target, volume_modify_fade;\r
-\r
- if(volume_modify_changed_1 != cvar("menu_volume") || volume_modify_changed_2 != cvar("menu_bgmvolume"))\r
- {\r
- // An ugly hack to allow the cutvolume feature to work with the menu audio sliders.\r
- // Without it, adjusting the music or master sound sliders while fading that volume would have bad results.\r
- // This needs to be done in a better way! Currently, changing the volume sliders will just reset the fading.\r
-\r
- volume_modify_default_1 = cvar("menu_volume");\r
- volume_modify_default_2 = cvar("menu_bgmvolume");\r
-\r
- volume_modify_changed_1 = cvar("menu_volume");\r
- volume_modify_changed_2 = cvar("menu_bgmvolume");\r
- }\r
- else\r
- {\r
- if(spectatee_status == -1 || intermission)\r
- {\r
- volume_modify_1_target = volume_modify_default_1;\r
- volume_modify_2_target = volume_modify_default_2;\r
- }\r
- else 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 = volume_modify_default_1;\r
- volume_modify_2_target = volume_modify_default_2;\r
- }\r
- volume_modify_fade = cvar("cl_vore_cutvolume_fade") * frametime;\r
-\r
- 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_2_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
- }\r
+ // sound volume cutting\r
+ target_volume = 0;\r
+ if(getstatf(STAT_VORE_PROGRESS_PREY))\r
+ target_volume = getstatf(STAT_VORE_PROGRESS_PREY);\r
+ else if(getstati(STAT_VORE_EATEN))\r
+ target_volume = 1;\r
+ target_volume = cvar("menu_volume") * (1 - target_volume * cvar("cl_vore_cutvolume_sound"));\r
+\r
+ if(cvar("volume") != target_volume) // reduce cvar_set spam as much as possible\r
+ cvar_set("volume", ftos(target_volume));\r
+ }\r
+ if(cvar("cl_vore_cutvolume_music") && frametime)\r
+ {\r
+ // music volume cutting\r
+ target_volume = 0;\r
+ if(getstatf(STAT_VORE_PROGRESS_PREY))\r
+ target_volume = getstatf(STAT_VORE_PROGRESS_PREY);\r
+ else if(getstati(STAT_VORE_EATEN))\r
+ target_volume = 1;\r
+ target_volume = cvar("menu_bgmvolume") * (1 - target_volume * cvar("cl_vore_cutvolume_music"));\r
+\r
+ if(cvar("bgmvolume") != target_volume) // reduce cvar_set spam as much as possible\r
+ cvar_set("bgmvolume", ftos(target_volume));\r
}\r
\r
// Draw the mouse cursor\r
localcmd(strcat("bf ", cvar_string("cl_flash_respawn_color"), " ", cvar_string("cl_flash_respawn"), "\n"));\r
\r
if not(getstati(STAT_VORE_EATEN)) // crosshair is useless if we're in the stomach\r
+ if not(getstati(STAT_ARMOR) < g_power || time <= power_boot)\r
{\r
// crosshair goes VERY LAST\r
if(!scoreboard_active && !ons_showmap && !camera_active) {\r
projects / voretournament / voretournament.git / blobdiff