added PXQ_GFX_LETTERBOX extension

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4529 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_screen.c b/cl_screen.c
index 4ac0ff0983429f029a256329ad6a264e26733887..7e191f524158332a6591cacfc3731e9db2530e69 100644 (file)
--- 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 584acfdc60677e9a398c1a25878605950f4accd7..59074cc401496b85998b1a5b3a6491e1d9b6c871 100644 (file)
--- 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 89702b386e6848762f597237cda710224fbf8e5e..b0e55bb2d9225b54f3b78a1118acac3637c4cf16 100644 (file)
--- 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 12ca524bfe462ef19d253e3708bb5dc68a7fa316..bf5018bb46cb7d35caa71d12a9282bd516f418b3 100644 (file)
--- 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 27b64bf8951be5ee380af01157a3434bac3add32..cc1c26c1636cc2243979d6148563318ef274f868 100644 (file)
--- 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