1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 18:19:43 +01:00

Add "resize to nearest" graphics option

If you want your game window to simply be exactly 320x240, or 640x480,
or 960x720 etc. then it's really annoying that there's no easy way to do
this (to clarify, this is different from integer mode, which controls
the size of the game INSIDE the window). The easiest way would be having
to close the game, go into unlock.vvv, and edit the window size
manually. VCE has a 1x/2x/3x/4x graphics option to solve this, although
it does not account for actual monitor size (those 1x/2x/3x/4x modes are
all you get, whether or not you have a monitor too small for some of
them or too big for any of them to be what you want).

I discussed this with flibit, and he said that VCE's approach (if it
accounted for monitor size) wouldn't work on high-retina displays or
high DPIs, because getting the actual multiplier to account for those
monitors is kind of a pain. So the next best thing would be to add an
option that resizes to the nearest perfect multiple of 320x240. That way
you could simply resize the window and let the game correct any
imperfect dimensions automatically.
This commit is contained in:
Misa 2020-06-29 22:02:21 -07:00 committed by Ethan Lee
parent e331abcd7e
commit 7ce4f1173d
5 changed files with 87 additions and 1 deletions

View file

@ -7167,8 +7167,9 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
option("toggle mouse"); option("toggle mouse");
option("toggle fps"); option("toggle fps");
option("toggle vsync"); option("toggle vsync");
option("resize to nearest", graphics.screenbuffer->isWindowed);
option("return"); option("return");
menuyoff = 0; menuyoff = -10;
break; break;
case Menu::ed_settings: case Menu::ed_settings:
option("change description"); option("change description");

View file

@ -323,6 +323,9 @@ void menuactionpress()
graphics.screenbuffer->toggleFullScreen(); graphics.screenbuffer->toggleFullScreen();
game.fullscreen = !game.fullscreen; game.fullscreen = !game.fullscreen;
game.savestats(); game.savestats();
// Recreate menu to update "resize to nearest"
game.createmenu(game.currentmenuname, true);
game.currentmenuoption = 0; game.currentmenuoption = 0;
break; break;
case 1: case 1:
@ -372,6 +375,19 @@ void menuactionpress()
graphics.processVsync(); graphics.processVsync();
game.savestats(); game.savestats();
break; break;
case 7:
// resize to nearest multiple
if (graphics.screenbuffer->isWindowed)
{
music.playef(11);
graphics.screenbuffer->ResizeToNearestMultiple();
game.savestats();
}
else
{
music.playef(2);
}
break;
default: default:
//back //back
music.playef(11); music.playef(11);

View file

@ -212,6 +212,17 @@ void menurender()
{ {
graphics.Print(-1, 95, "Current mode: VSYNC ON", tr, tg, tb, true); graphics.Print(-1, 95, "Current mode: VSYNC ON", tr, tg, tb, true);
} }
break;
case 7:
graphics.bigprint(-1, 30, "Resize to Nearest", tr, tg, tb, true);
graphics.Print(-1, 65, "Resize to the nearest window size", tr, tg, tb, true);
graphics.Print(-1, 75, "that is of an integer multiple.", tr, tg, tb, true);
if (!graphics.screenbuffer->isWindowed)
{
graphics.Print(-1, 95, "You must be in windowed mode", tr, tg, tb, true);
graphics.Print(-1, 105, "to use this option.", tr, tg, tb, true);
}
break;
} }
break; break;
case Menu::credits: case Menu::credits:

View file

@ -153,6 +153,63 @@ void Screen::ResizeScreen(int x, int y)
SDL_ShowWindow(m_window); SDL_ShowWindow(m_window);
} }
void Screen::ResizeToNearestMultiple()
{
int w, h;
GetWindowSize(&w, &h);
// Check aspect ratio first
bool using_width;
int usethisdimension, usethisratio;
if ((float) w / (float) h > 4.0 / 3.0)
{
// Width is bigger, so it's limited by height
usethisdimension = h;
usethisratio = 240;
using_width = false;
}
else
{
// Height is bigger, so it's limited by width. Or we're exactly 4:3 already
usethisdimension = w;
usethisratio = 320;
using_width = true;
}
int floor = (usethisdimension / usethisratio) * usethisratio;
int ceiling = floor + usethisratio;
int final_dimension;
if (usethisdimension - floor < ceiling - usethisdimension)
{
// Floor is nearest
final_dimension = floor;
}
else
{
// Ceiling is nearest. Or we're exactly on a multiple already
final_dimension = ceiling;
}
if (final_dimension == 0)
{
// We're way too small!
ResizeScreen(320, 240);
return;
}
if (using_width)
{
ResizeScreen(final_dimension, final_dimension / 4 * 3);
}
else
{
ResizeScreen(final_dimension * 4 / 3, final_dimension);
}
}
void Screen::GetWindowSize(int* x, int* y) void Screen::GetWindowSize(int* x, int* y)
{ {
SDL_GetWindowSize(m_window, x, y); SDL_GetWindowSize(m_window, x, y);

View file

@ -9,6 +9,7 @@ public:
void init(); void init();
void ResizeScreen(int x, int y); void ResizeScreen(int x, int y);
void ResizeToNearestMultiple();
void GetWindowSize(int* x, int* y); void GetWindowSize(int* x, int* y);
void UpdateScreen(SDL_Surface* buffer, SDL_Rect* rect); void UpdateScreen(SDL_Surface* buffer, SDL_Rect* rect);