Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-30 18:04:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Implement scaling modes manually

Browse Source 
For future PRs, it'll be very nice to have full control over how VVVVVV
gets drawn to the window. This means we can use the entire window size
for things like touch input, drawing borders, or anything we want.
This commit is contained in:
AllyTally
2024-01-28 20:04:02 -04:00
committed by Misa Elizabeth Kai
parent 935db27d39
commit 77a571017d
5 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
desktop_version/src/Graphics.cpp
View File

@@ -3458,9 +3458,12 @@ void Graphics::screenshake(void)
set_render_target(NULL);
set_blendmode(SDL_BLENDMODE_NONE);
clear();
draw_window_background();
copy_texture(tempShakeTexture, NULL, NULL, 0, NULL, flipmode ? SDL_FLIP_VERTICAL : SDL_FLIP_NONE);
SDL_Rect rect;
get_stretch_info(&rect);
copy_texture(tempShakeTexture, NULL, &rect, 0, NULL, flipmode ? SDL_FLIP_VERTICAL : SDL_FLIP_NONE);
}
void Graphics::updatescreenshake(void)
@@ -3469,6 +3472,54 @@ void Graphics::updatescreenshake(void)
screenshake_y = static_cast<Sint32>((fRandom() * 7) - 4);
}
void Graphics::draw_window_background(void)
{
clear();
}
void Graphics::get_stretch_info(SDL_Rect* rect)
{
int width;
int height;
gameScreen.GetScreenSize(&width, &height);
switch (gameScreen.scalingMode)
{
case SCALING_INTEGER:
{
int scale = SDL_min(width / SCREEN_WIDTH_PIXELS, height / SCREEN_HEIGHT_PIXELS);
rect->x = (width - SCREEN_WIDTH_PIXELS * scale) / 2;
rect->y = (height - SCREEN_HEIGHT_PIXELS * scale) / 2;
rect->w = SCREEN_WIDTH_PIXELS * scale;
rect->h = SCREEN_HEIGHT_PIXELS * scale;
}
break;
case SCALING_LETTERBOX:
if (width * SCREEN_HEIGHT_PIXELS > height * SCREEN_WIDTH_PIXELS)
{
rect->x = (width - height * SCREEN_WIDTH_PIXELS / SCREEN_HEIGHT_PIXELS) / 2;
rect->y = 0;
rect->w = height * SCREEN_WIDTH_PIXELS / SCREEN_HEIGHT_PIXELS;
rect->h = height;
}
else
{
rect->x = 0;
rect->y = (height - width * SCREEN_HEIGHT_PIXELS / SCREEN_WIDTH_PIXELS) / 2;
rect->w = width;
rect->h = width * SCREEN_HEIGHT_PIXELS / SCREEN_WIDTH_PIXELS;
}
break;
case SCALING_STRETCH:
/* Could pass NULL to copy_texture instead, but this feels better */
rect->x = 0;
rect->y = 0;
rect->w = width;
rect->h = height;
break;
}
}
void Graphics::render(void)
{
draw_screenshot_border();
@@ -3480,9 +3531,13 @@ void Graphics::render(void)
set_render_target(NULL);
set_blendmode(SDL_BLENDMODE_NONE);
clear();
copy_texture(gameTexture, NULL, NULL, 0, NULL, flipmode ? SDL_FLIP_VERTICAL : SDL_FLIP_NONE);
draw_window_background();
SDL_Rect rect;
get_stretch_info(&rect);
copy_texture(gameTexture, NULL, &rect, 0, NULL, flipmode ? SDL_FLIP_VERTICAL : SDL_FLIP_NONE);
}
void Graphics::renderwithscreeneffects(void)