Skip to content

RVL: Add an overscan option for screen width #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sbeeds wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

RVL: Add an overscan option for screen width #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion source/wii/gx/gxquake.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,8 @@ extern cvar_t r_overbright;
extern cvar_t gl_max_size;
extern cvar_t gl_playermip;

extern cvar_t vid_tvborder;
extern cvar_t vid_overscan_height;
extern cvar_t vid_overscan_width;
extern cvar_t vid_retromode;

extern cvar_t r_part_muzzleflash;
Expand Down
18 changes: 8 additions & 10 deletions source/wii/gx/video_gx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ static float vid_gamma = 1.0;
Mtx44 perspective;
Mtx view, model, modelview;

cvar_t vid_tvborder = {"vid_tvborder", "0", (qboolean)true};
cvar_t vid_overscan_height = {"vid_overscan_height", "0", (qboolean)true};
cvar_t vid_overscan_width = {"vid_overscan_width", "0", (qboolean)true};
cvar_t vid_conmode = {"vid_conmode", "0", (qboolean)true};

void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
Expand Down Expand Up @@ -235,16 +236,12 @@ GL_BeginRendering
void GL_BeginRendering (int *x, int *y, int *width, int *height)
{
// ELUTODO: lol at the * 2 on height
*x = 0;
*y = vid_tvborder.value * 200;
*x = vid_overscan_width.value * 200;
*y = vid_overscan_height.value * 200;
*width = scr_width;
*height = scr_height - (vid_tvborder.value * 400);
*height = scr_height - (vid_overscan_height.value * 400);

GX_SetScissor(*x,*y,*width > 640 ? 640 : *width,*height);

// ELUTODO: really necessary?
//GX_InvVtxCache();
//GX_InvalidateTexAll();
GX_SetScissor(*x,*y,*width > 640 ? 640 - (vid_overscan_width.value * 360) : *width - (vid_overscan_width.value * 360),*height);
Copy link
Copy Markdown
Member

@MotoLegacy MotoLegacy Feb 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain what we're doing here? Is this adding a border/shrinking our render resolution?

Copy link
Copy Markdown
Collaborator Author

@sbeeds sbeeds Feb 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It adjusts the view scissor based on vid_overscan_width value. When this value is increased, the start value (normally 0) of the width of the scissor gets shifted over, and the right side pixels get culled. This will never cull more than 36 pixels from the right side. I will upload a fix later to adjust the 2d resolution, which will offset the HUD accordingly.

Copy link
Copy Markdown
Member

@MotoLegacy MotoLegacy Feb 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It sounds like this is incomplete then. Please mark this as a draft

}

void GL_EndRendering (void)
Expand Down Expand Up @@ -334,7 +331,8 @@ void VID_Init(unsigned char *palette)

vid.recalc_refdef = 1; // force a surface cache flush

Cvar_RegisterVariable(&vid_tvborder);
Cvar_RegisterVariable(&vid_overscan_height);
Cvar_RegisterVariable(&vid_overscan_width);
Cvar_RegisterVariable(&vid_retromode);
Cvar_RegisterVariable(&vid_conmode);

Expand Down
40 changes: 26 additions & 14 deletions source/wii/menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1868,7 +1868,7 @@ void M_Net_Key (int k)
//=============================================================================
/* OPTIONS MENU */

#define OPTIONS_ITEMS 15
#define OPTIONS_ITEMS 16

#define SLIDER_RANGE 10

Expand Down Expand Up @@ -1949,15 +1949,23 @@ void M_AdjustSliders (int dir)
case 12: // weapon roll by input
Cvar_SetValue ("cl_weapon_inrollangle", !cl_weapon_inrollangle.value);
break;
case 13: // tv border
vid_tvborder.value += dir * 0.005f;
if (vid_tvborder.value < 0)
vid_tvborder.value = 0;
if (vid_tvborder.value > 0.2)
vid_tvborder.value = 0.2;
Cvar_SetValue ("vid_tvborder", vid_tvborder.value);
break;
case 14: // retro mode
case 13: // height overscan
vid_overscan_height.value += dir * 0.005f;
if (vid_overscan_height.value < 0)
vid_overscan_height.value = 0;
if (vid_overscan_height.value > 0.2)
vid_overscan_height.value = 0.2;
Cvar_SetValue ("vid_overscan_height", vid_overscan_height.value);
break;
case 14: // width overscan
vid_overscan_width.value += dir * 0.0025f;
if (vid_overscan_width.value < 0)
vid_overscan_width.value = 0;
if (vid_overscan_width.value > 0.1)
vid_overscan_width.value = 0.1;
Cvar_SetValue ("vid_overscan_width", vid_overscan_width.value);
break;
case 15: // retro mode
Cvar_SetValue ("vid_retromode", !vid_retromode.value);
break;
}
Expand Down Expand Up @@ -2039,12 +2047,16 @@ void M_Options_Draw (void)
M_PrintScaled (16, 184, "Weapon Roll");
M_DrawCheckbox (215, 184, cl_weapon_inrollangle.value);

M_PrintScaled (16, 196, "TV Overscan");
r = vid_tvborder.value / 0.2f;
M_PrintScaled (16, 196, "TV Height Overscan");
r = vid_overscan_height.value / 0.2f;
M_DrawSlider (220, 196, r);

M_PrintScaled (16, 208, "Retro Mode");
M_DrawCheckbox (215, 208, vid_retromode.value);
M_PrintScaled (16, 208, "TV Width Overscan");
r = vid_overscan_width.value / 0.1f;
M_DrawSlider (220, 208, r);

M_PrintScaled (16, 220, "Retro Mode");
M_DrawCheckbox (215, 220, vid_retromode.value);

// cursor
M_DrawCharacterScaled (200, 40 + options_cursor*12, 12+((int)(realtime*4)&1));
Expand Down