Skip to content
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

Jump to bottom

Use fixed render sizes and SDL_RenderSetLogicalSize for scaling #275

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Use fixed render sizes and SDL_RenderSetLogicalSize for scaling #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9176d1c
Use SDL_WINDOW_FULLSCREEN_DESKTOP for fullscreen mode
xordspar0 Oct 13, 2022
b3738aa
Set the correct render size when switching to fullscreen
xordspar0 Oct 13, 2022
0c0c05b
Always render at the base size; let SDL scale for us
xordspar0 Oct 13, 2022
323e4b2
Allow high DPI
xordspar0 Oct 13, 2022
8cdbd62
Don't hardcode dimensions
xordspar0 Oct 13, 2022
775e0e2
Clean up extra ()
xordspar0 Oct 13, 2022
b73b43a
Update inventory position every frame
xordspar0 Oct 25, 2022
7b3a5cf
Factor out scale field
xordspar0 Oct 25, 2022
462e076
Don't adjust the save select menu y position based on widescreen mode
xordspar0 Oct 25, 2022
b042789
Factor out duplicate code
xordspar0 Oct 25, 2022
fdbcf01
Call SDL_RenderClear once per frame
xordspar0 Oct 29, 2022
e49d109
Automatically calculate the camera position for skinny maps
xordspar0 Nov 11, 2022
8f90b14
Correct centering for maps thinner than the screen
xordspar0 Nov 27, 2022
b7bd4e8
Don't use a custom resolution for Switch
xordspar0 Nov 27, 2022
6a1768d
Render to a small texture, then scale up to the screen size
xordspar0 Nov 28, 2022
15e475f
Factor out duplicate code between initVideo and setResolution
xordspar0 Nov 28, 2022
6fe41c8
Fix uninitialized memory error
xordspar0 Sep 30, 2023
5fb1179
Merge branch 'master' into camera-dimensions
xordspar0 Dec 29, 2023
56e9b27
Merge branch 'master' into camera-dimensions
xordspar0 Jan 5, 2024
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
12 changes: 2 additions & 10 deletions src/TextBox/SaveSelect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,8 @@ void TB_SaveSelect::SetVisible(bool enable, bool saving)

fCoords.w = 244;
fCoords.h = 152;
if (Renderer::getInstance()->widescreen)
{
fCoords.x = (Renderer::getInstance()->screenWidth / 2) - (fCoords.w / 2);
fCoords.y = 30;
}
else
{
fCoords.x = 38;
fCoords.y = 8;
}
fCoords.x = (Renderer::getInstance()->screenWidth / 2) - (fCoords.w / 2);
fCoords.y = 8;

fNumFiles = MAX_SAVE_SLOTS;
fSaving = saving;
Expand Down
51 changes: 18 additions & 33 deletions src/graphics/Font.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,14 @@ Font::Font()
bool Font::load()
{
cleanup();
std::string font = std::string("font_" + std::to_string(Renderer::getInstance()->scale) + ".fnt");
std::string font = std::string("font_1.fnt");
LOG_DEBUG("Loading font file {}", font.c_str());

// special empty glyph
_glyphs[0] = Font::Glyph{0, 0, 0, 0, 0, 0, 0, 0, 0};

std::string path = ResourceManager::getInstance()->getPath(font);
if (ResourceManager::getInstance()->fileExists(path))
{
_upscale = 1;
}
else
{
_upscale = Renderer::getInstance()->scale;
font = std::string("font_1.fnt");
path = ResourceManager::getInstance()->getPath(font);
}
ResourceManager::getInstance()->fileExists(path);

LOG_DEBUG("Loading font file {}", path.c_str());

Expand Down Expand Up @@ -123,9 +114,6 @@ SDL_Texture *Font::atlas(uint32_t idx)

uint32_t Font::draw(int x, int y, const std::string &text, uint32_t color, bool isShaded)
{
x *= Renderer::getInstance()->scale;
y *= Renderer::getInstance()->scale;

int orgx = x;
int i = 0;
SDL_Rect dstrect;
Expand All @@ -152,8 +140,8 @@ uint32_t Font::draw(int x, int y, const std::string &text, uint32_t color, bool
{
if (_rendering)
{
int offset = (int)round(((double)_height / (double)Renderer::getInstance()->scale - 6.) / 2.);
Renderer::getInstance()->sprites.drawSprite((x / Renderer::getInstance()->scale), (y / Renderer::getInstance()->scale) + offset, SPR_TEXTBULLET);
int offset = (int)round(((double)_height - 6.) / 2.);
Renderer::getInstance()->sprites.drawSprite(x, y + offset, SPR_TEXTBULLET);
}
}
else if (_rendering && ch != ' ')
Expand All @@ -178,7 +166,7 @@ uint32_t Font::draw(int x, int y, const std::string &text, uint32_t color, bool
if (isShaded)
{
shdrect.x = x + (glyph.xoffset * _upscale);
shdrect.y = y + (glyph.yoffset * _upscale + _shadowOffset * Renderer::getInstance()->scale);
shdrect.y = y + (glyph.yoffset * _upscale + _shadowOffset);
shdrect.w = glyph.w * _upscale;
shdrect.h = glyph.h * _upscale;
SDL_SetTextureColorMod(atlas, 0, 0, 0);
Expand All @@ -194,21 +182,21 @@ uint32_t Font::draw(int x, int y, const std::string &text, uint32_t color, bool
{ // 10.5 px for spaces - make smaller than they really are - the default
if (rtl())
{
x -= (Renderer::getInstance()->scale == 1) ? 5 : 10;
x -= 5;
if (i & 1)
x--;
}
else
{
x += (Renderer::getInstance()->scale == 1) ? 5 : 10;
x += 5;
if (i & 1)
x++;
}
}
else if (ch == '=' && game.mode != GM_CREDITS)
{
if (rtl()) x -= 7 * Renderer::getInstance()->scale;
else x += 7 * Renderer::getInstance()->scale;
if (rtl()) x -= 7;
else x += 7;
}
else
{
Expand All @@ -219,14 +207,11 @@ uint32_t Font::draw(int x, int y, const std::string &text, uint32_t color, bool
}

// return the final width of the text drawn
return abs((x - orgx) / Renderer::getInstance()->scale);
return abs(x - orgx);
}

uint32_t Font::drawLTR(int x, int y, const std::string &text, uint32_t color, bool isShaded)
{
x *= Renderer::getInstance()->scale;
y *= Renderer::getInstance()->scale;

int orgx = x;
int i = 0;
SDL_Rect dstrect;
Expand All @@ -252,8 +237,8 @@ uint32_t Font::drawLTR(int x, int y, const std::string &text, uint32_t color, bo
{
if (_rendering)
{
int offset = (int)round(((double)_height / (double)Renderer::getInstance()->scale - 6.) / 2.);
Renderer::getInstance()->sprites.drawSprite((x / Renderer::getInstance()->scale), (y / Renderer::getInstance()->scale) + offset, SPR_TEXTBULLET);
int offset = (int)round(((double)_height - 6.) / 2.);
Renderer::getInstance()->sprites.drawSprite(x, y + offset, SPR_TEXTBULLET);
}
}
else if (_rendering && ch != ' ')
Expand All @@ -278,7 +263,7 @@ uint32_t Font::drawLTR(int x, int y, const std::string &text, uint32_t color, bo
if (isShaded)
{
shdrect.x = x + (glyph.xoffset * _upscale);
shdrect.y = y + glyph.yoffset * _upscale + _shadowOffset * Renderer::getInstance()->scale;
shdrect.y = y + glyph.yoffset * _upscale + _shadowOffset;
shdrect.w = glyph.w * _upscale;
shdrect.h = glyph.h * _upscale;
SDL_SetTextureColorMod(atlas, 0, 0, 0);
Expand All @@ -292,13 +277,13 @@ uint32_t Font::drawLTR(int x, int y, const std::string &text, uint32_t color, bo

if (ch == ' ')
{ // 10.5 px for spaces - make smaller than they really are - the default
x += (Renderer::getInstance()->scale == 1) ? 5 : 10;
x += 5;
if (i & 1)
x++;
}
else if (ch == '=' && game.mode != GM_CREDITS)
{
x += 7 * Renderer::getInstance()->scale;
x += 7;
}
else
{
Expand All @@ -308,7 +293,7 @@ uint32_t Font::drawLTR(int x, int y, const std::string &text, uint32_t color, bo
}

// return the final width of the text drawn
return abs((x - orgx) / Renderer::getInstance()->scale);
return abs(x - orgx);
}

uint32_t Font::getWidth(const std::string &text)
Expand All @@ -324,12 +309,12 @@ uint32_t Font::getWidth(const std::string &text)

uint32_t Font::getHeight() const
{
return _height / ((_upscale == 1) ? Renderer::getInstance()->scale : 1);
return _height;
}

uint32_t Font::getBase() const
{
return _base / ((_upscale == 1) ? Renderer::getInstance()->scale : 1);
return _base;
}

}; // namespace Graphics
Expand Down
Loading