From 946b0f6826047585b551278c674053b2869b0dff Mon Sep 17 00:00:00 2001 From: havoc Date: Mon, 20 Sep 2004 05:51:21 +0000 Subject: [PATCH] added PXQ_GFX_LETTERBOX extension git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4529 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_screen.c | 5 ++++- gl_backend.c | 4 ++-- pr_cmds.c | 1 + r_crosshairs.c | 4 ++++ screen.h | 1 + 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/cl_screen.c b/cl_screen.c index 4ac0ff09..7e191f52 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -23,6 +23,7 @@ cvar_t scr_screenshot_jpeg_quality = {CVAR_SAVE, "scr_screenshot_jpeg_quality"," cvar_t scr_screenshot_name = {0, "scr_screenshot_name","dp"}; cvar_t cl_avidemo = {0, "cl_avidemo", "0"}; cvar_t r_textshadow = {0, "r_textshadow", "0"}; +cvar_t r_letterbox = {0, "r_letterbox", "0"}; int jpeg_supported = false; @@ -481,6 +482,7 @@ void CL_Screen_Init(void) Cvar_RegisterVariable (&scr_screenshot_jpeg_quality); Cvar_RegisterVariable (&cl_avidemo); Cvar_RegisterVariable (&r_textshadow); + Cvar_RegisterVariable (&r_letterbox); Cmd_AddCommand ("sizeup",SCR_SizeUp_f); Cmd_AddCommand ("sizedown",SCR_SizeDown_f); @@ -993,7 +995,8 @@ void CL_UpdateScreen(void) SCR_DrawNet (); SCR_DrawTurtle (); SCR_DrawPause (); - Sbar_Draw(); + if (!r_letterbox.value) + Sbar_Draw(); SHOWLMP_drawall(); SCR_CheckDrawCenterString(); } diff --git a/gl_backend.c b/gl_backend.c index 584acfdc..59074cc4 100644 --- a/gl_backend.c +++ b/gl_backend.c @@ -1293,7 +1293,7 @@ void SCR_DrawScreen (void) if (r_stereo_sidebyside.integer) { r_refdef.width = vid.realwidth * size / 2.5; - r_refdef.height = vid.realheight * size / 2.5; + r_refdef.height = vid.realheight * size / 2.5 * (1 - bound(0, r_letterbox.value, 100) / 100); r_refdef.x = (vid.realwidth - r_refdef.width * 2.5) * 0.5; r_refdef.y = (vid.realheight - r_refdef.height)/2; if (r_stereo_side) @@ -1302,7 +1302,7 @@ void SCR_DrawScreen (void) else { r_refdef.width = vid.realwidth * size; - r_refdef.height = vid.realheight * size; + r_refdef.height = vid.realheight * size * (1 - bound(0, r_letterbox.value, 100) / 100); r_refdef.x = (vid.realwidth - r_refdef.width)/2; r_refdef.y = (vid.realheight - r_refdef.height)/2; } diff --git a/pr_cmds.c b/pr_cmds.c index 89702b38..b0e55bb2 100644 --- a/pr_cmds.c +++ b/pr_cmds.c @@ -153,6 +153,7 @@ char *ENGINE_EXTENSIONS = "KRIMZON_SV_PARSECLIENTCOMMAND " "NEH_CMD_PLAY2 " "NEH_RESTOREGAME " +"PXQ_GFX_LETTERBOX " "TENEBRAE_GFX_DLIGHTS " "TW_SV_STEPCONTROL " ; diff --git a/r_crosshairs.c b/r_crosshairs.c index 12ca524b..bf5018bb 100644 --- a/r_crosshairs.c +++ b/r_crosshairs.c @@ -62,6 +62,8 @@ void R_DrawWorldCrosshair(void) vec3_t v1, v2, spriteorigin; vec_t spritescale; vec4_t color; + if (r_letterbox.value) + return; if (crosshair_static.integer) return; num = crosshair.integer; @@ -93,6 +95,8 @@ void R_Draw2DCrosshair(void) int num; cachepic_t *pic; vec4_t color; + if (r_letterbox.value) + return; if (!crosshair_static.integer) return; num = crosshair.integer; diff --git a/screen.h b/screen.h index 27b64bf8..cc1c26c1 100644 --- a/screen.h +++ b/screen.h @@ -50,6 +50,7 @@ extern cvar_t crosshair_static; extern cvar_t scr_conspeed; extern cvar_t scr_conalpha; extern cvar_t scr_conbrightness; +extern cvar_t r_letterbox; #endif -- 2.39.2