ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2025-02-23 03:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bug 5034 - q3_ui: fill whole screen and allow cursor to move to edge in widescreen, patch by Zack Middleton

Browse source
This commit is contained in:
Thilo Schulz 2011-06-11 20:18:16 +00:00
parent 45f576bd99
commit fa3b3978f6
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/client/cl_scrn.c
View file

@ -480,11 +480,15 @@ This will be called twice if rendering in stereo mode
================== ==================
*/ */
void SCR_DrawScreenField( stereoFrame_t stereoFrame ) { void SCR_DrawScreenField( stereoFrame_t stereoFrame ) {
qboolean uiFullscreen;
re.BeginFrame( stereoFrame ); re.BeginFrame( stereoFrame );
uiFullscreen = VM_Call( uivm, UI_IS_FULLSCREEN );
// wide aspect ratio screens need to have the sides cleared // wide aspect ratio screens need to have the sides cleared
// unless they are displaying game renderings // unless they are displaying game renderings
if ( cls.state != CA_ACTIVE && cls.state != CA_CINEMATIC ) { if ( uiFullscreen || (cls.state != CA_ACTIVE && cls.state != CA_CINEMATIC) ) {
if ( cls.glconfig.vidWidth * 480 > cls.glconfig.vidHeight * 640 ) { if ( cls.glconfig.vidWidth * 480 > cls.glconfig.vidHeight * 640 ) {
re.SetColor( g_color_table[0] ); re.SetColor( g_color_table[0] );
re.DrawStretchPic( 0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight, 0, 0, 0, 0, cls.whiteShader ); re.DrawStretchPic( 0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight, 0, 0, 0, 0, cls.whiteShader );
@ -494,7 +498,7 @@ void SCR_DrawScreenField( stereoFrame_t stereoFrame ) {
// if the menu is going to cover the entire screen, we // if the menu is going to cover the entire screen, we
// don't need to render anything under it // don't need to render anything under it
if ( uivm && !VM_Call( uivm, UI_IS_FULLSCREEN )) { if ( uivm && !uiFullscreen ) {
switch( cls.state ) { switch( cls.state ) {
default: default:
Com_Error( ERR_FATAL, "SCR_DrawScreenField: bad cls.state" ); Com_Error( ERR_FATAL, "SCR_DrawScreenField: bad cls.state" );

8
code/q3_ui/ui_atoms.c
View file

@ -879,10 +879,10 @@ void UI_MouseEvent( int dx, int dy )
// update mouse screen position // update mouse screen position
uis.cursorx += dx; uis.cursorx += dx;
if (uis.cursorx < 0) if (uis.cursorx < -uis.bias)
uis.cursorx = 0; uis.cursorx = -uis.bias;
else if (uis.cursorx > SCREEN_WIDTH) else if (uis.cursorx > SCREEN_WIDTH+uis.bias)
uis.cursorx = SCREEN_WIDTH; uis.cursorx = SCREEN_WIDTH+uis.bias;
uis.cursory += dy; uis.cursory += dy;
if (uis.cursory < 0) if (uis.cursory < 0)

6
code/q3_ui/ui_credits.c
View file

@ -166,12 +166,6 @@ UI_CreditMenu
=============== ===============
*/ */
void UI_CreditMenu( void ) { void UI_CreditMenu( void ) {
/* This UI_FillRect() hack will blank the borders if you're in widescreen,
so you get a completely black background instead of stripes from the
previous frame on each side of the credits.. */
const float black[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
UI_FillRect(0 - uis.bias, 0, (640.0f / uis.xscale) * 2.0f, 480.0f / uis.yscale, black);
memset( &s_credits, 0 ,sizeof(s_credits) ); memset( &s_credits, 0 ,sizeof(s_credits) );
s_credits.menu.draw = UI_CreditMenu_Draw; s_credits.menu.draw = UI_CreditMenu_Draw;