From f7b4ac83227f5024a5b4cfa5dc259f3fb0aee419 Mon Sep 17 00:00:00 2001 From: Misa Date: Wed, 22 Dec 2021 19:54:59 -0800 Subject: [PATCH] Rename stretch mode to scaling mode internally It's been long overdue that this variable be named properly. 2.2 added integer scaling mode (thanks Ethan), 2.3 renamed it to scaling mode. Now 2.4 will properly call it what it is so people won't be confused by it. The ScreenSettings struct member is renamed from stretch to scalingMode along with the Screen class member being renamed, as well as the toggleStretchMode function being renamed to toggleScalingMode as well. Unfortunately, due to compatibility, we can't change the XML tag. --- desktop_version/src/Editor.cpp | 2 +- desktop_version/src/Game.cpp | 4 ++-- desktop_version/src/Input.cpp | 2 +- desktop_version/src/Render.cpp | 2 +- desktop_version/src/Screen.cpp | 14 +++++++------- desktop_version/src/Screen.h | 4 ++-- desktop_version/src/ScreenSettings.h | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/desktop_version/src/Editor.cpp b/desktop_version/src/Editor.cpp index 2c76ff41..1f065bc5 100644 --- a/desktop_version/src/Editor.cpp +++ b/desktop_version/src/Editor.cpp @@ -1921,7 +1921,7 @@ void editorinput(void) game.my = (float) key.my; ed.tilex=(game.mx - (game.mx%8))/8; ed.tiley=(game.my - (game.my%8))/8; - if (graphics.screenbuffer->stretchMode == 1) { + if (graphics.screenbuffer->scalingMode == 1) { // In this mode specifically, we have to fix the mouse coordinates int winwidth, winheight; graphics.screenbuffer->GetWindowSize(&winwidth, &winheight); diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index e8534f65..ce41922a 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -4127,7 +4127,7 @@ void Game::deserializesettings(tinyxml2::XMLElement* dataNode, ScreenSettings* s if (SDL_strcmp(pKey, "stretch") == 0) { - screen_settings->stretch = help.Int(pText); + screen_settings->scalingMode = help.Int(pText); } if (SDL_strcmp(pKey, "useLinearFilter") == 0) @@ -4446,7 +4446,7 @@ void Game::serializesettings(tinyxml2::XMLElement* dataNode, const ScreenSetting xml::update_tag(dataNode, "fullscreen", (int) screen_settings->fullscreen); - xml::update_tag(dataNode, "stretch", screen_settings->stretch); + xml::update_tag(dataNode, "stretch", screen_settings->scalingMode); xml::update_tag(dataNode, "useLinearFilter", (int) screen_settings->linearFilter); diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index cac975c9..c17555e4 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -619,7 +619,7 @@ static void menuactionpress(void) break; case 1: music.playef(11); - graphics.screenbuffer->toggleStretchMode(); + graphics.screenbuffer->toggleScalingMode(); game.savestatsandsettings_menu(); break; case 2: diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp index 2b663cd1..3f7e70e3 100644 --- a/desktop_version/src/Render.cpp +++ b/desktop_version/src/Render.cpp @@ -314,7 +314,7 @@ static void menurender(void) graphics.bigprint( -1, 30, "Scaling Mode", tr, tg, tb, true); graphics.Print( -1, 65, "Choose letterbox/stretch/integer mode.", tr, tg, tb, true); - switch (graphics.screenbuffer->stretchMode) + switch (graphics.screenbuffer->scalingMode) { case 2: graphics.Print( -1, 85, "Current mode: INTEGER", tr, tg, tb, true); diff --git a/desktop_version/src/Screen.cpp b/desktop_version/src/Screen.cpp index 57c066eb..f4f2f542 100644 --- a/desktop_version/src/Screen.cpp +++ b/desktop_version/src/Screen.cpp @@ -25,7 +25,7 @@ ScreenSettings::ScreenSettings(void) windowHeight = 240; fullscreen = false; useVsync = true; // Now that uncapped is the default... - stretch = 0; + scalingMode = 0; linearFilter = false; badSignal = false; } @@ -37,7 +37,7 @@ void Screen::init(const ScreenSettings& settings) m_screenTexture = NULL; m_screen = NULL; isWindowed = !settings.fullscreen; - stretchMode = settings.stretch; + scalingMode = settings.scalingMode; isFiltered = settings.linearFilter; vsync = settings.useVsync; filterSubrect.x = 1; @@ -118,7 +118,7 @@ void Screen::GetSettings(ScreenSettings* settings) settings->fullscreen = !isWindowed; settings->useVsync = vsync; - settings->stretch = stretchMode; + settings->scalingMode = scalingMode; settings->linearFilter = isFiltered; settings->badSignal = badSignalEffect; } @@ -181,7 +181,7 @@ void Screen::ResizeScreen(int x, int y) SDL_SetWindowPosition(m_window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED); } } - if (stretchMode == 1) + if (scalingMode == 1) { int winX, winY; GetWindowSize(&winX, &winY); @@ -201,7 +201,7 @@ void Screen::ResizeScreen(int x, int y) else { SDL_RenderSetLogicalSize(m_renderer, 320, 240); - int result = SDL_RenderSetIntegerScale(m_renderer, (SDL_bool) (stretchMode == 2)); + int result = SDL_RenderSetIntegerScale(m_renderer, (SDL_bool) (scalingMode == 2)); if (result != 0) { vlog_error("Error: could not set scale: %s", SDL_GetError()); @@ -345,9 +345,9 @@ void Screen::toggleFullScreen(void) } } -void Screen::toggleStretchMode(void) +void Screen::toggleScalingMode(void) { - stretchMode = (stretchMode + 1) % 3; + scalingMode = (scalingMode + 1) % 3; ResizeScreen(-1, -1); } diff --git a/desktop_version/src/Screen.h b/desktop_version/src/Screen.h index c59da040..6a7ef3be 100644 --- a/desktop_version/src/Screen.h +++ b/desktop_version/src/Screen.h @@ -25,14 +25,14 @@ public: const SDL_PixelFormat* GetFormat(void); void toggleFullScreen(void); - void toggleStretchMode(void); + void toggleScalingMode(void); void toggleLinearFilter(void); void toggleVSync(void); bool isWindowed; bool isFiltered; bool badSignalEffect; - int stretchMode; + int scalingMode; bool vsync; SDL_Window *m_window; diff --git a/desktop_version/src/ScreenSettings.h b/desktop_version/src/ScreenSettings.h index 0294dbde..2f60a9d0 100644 --- a/desktop_version/src/ScreenSettings.h +++ b/desktop_version/src/ScreenSettings.h @@ -9,7 +9,7 @@ struct ScreenSettings int windowHeight; bool fullscreen; bool useVsync; - int stretch; + int scalingMode; bool linearFilter; bool badSignal; };