libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 23:31:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AGS: Cleanup TTF font rendering a bit

Browse Source 
There is no need to test if antialiasing should be used
in two different places.
This commit is contained in:
Thierry Crozat 2021-04-08 22:15:37 +01:00
parent bcf4412d4b
commit 53432f1153
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/ags/lib/alfont/alfont.cpp
View File

@ -24,6 +24,7 @@
#include "ags/ags.h"
#include "ags/globals.h"
#include "ags/shared/ac/gamesetupstruct.h"
#include "ags/engine/ac/display.h"
#include "common/file.h"
#include "graphics/fonts/ttf.h"
@ -34,7 +35,7 @@ Graphics::Font *ALFONT_FONT::getFont() {
if (!_fonts.contains(_size)) {
// Instantiate the raw TTF data into a font of the given size
Graphics::TTFRenderMode renderMode = Graphics::kTTFRenderModeMonochrome;
if (_GP(game).options[OPT_ANTIALIASFONTS] != 0 || ::AGS::g_vm->_forceTextAA)
if (ShouldAntiAliasText())
renderMode = Graphics::kTTFRenderModeLight;
_fonts[_size] = Graphics::loadTTFFont(_ttfData, _size, Graphics::kTTFSizeModeCharacter, 0, renderMode);
assert(_fonts[_size]);
@ -65,16 +66,14 @@ size_t alfont_text_height(ALFONT_FONT *font) {
}
void alfont_textout(BITMAP *bmp, ALFONT_FONT *font, const char *text, int x, int y, uint32 color) {
// Note: the original does not use antialiasing when drawing on 8 bit bmp
// if (bitmap_color_depth(bmp) > 8) do not use AA in getFont()...
// The original alfont changes the y based on the font height and ascent.
y += (font->_size - font->getFont()->getFontAscent());
Graphics::ManagedSurface &surf = **bmp;
font->getFont()->drawString(&surf, text, x, y, bmp->w - x, color);
}
void alfont_textout_aa(BITMAP *bmp, ALFONT_FONT *font, const char *text, int x, int y, uint32 color) {
alfont_textout(bmp, font, text, x, y, color);
}
void alfont_set_font_size(ALFONT_FONT *font, int size) {
font->_size = size;
}

1
engines/ags/lib/alfont/alfont.h
View File

@ -56,7 +56,6 @@ extern void alfont_destroy_font(ALFONT_FONT *font);
extern size_t alfont_text_length(ALFONT_FONT *font, const char *text);
extern size_t alfont_text_height(ALFONT_FONT *font);
extern void alfont_textout(BITMAP *bmp, ALFONT_FONT *font, const char *text, int x, int y, uint32 color);
extern void alfont_textout_aa(BITMAP *bmp, ALFONT_FONT *font, const char *text, int x, int y, uint32 color);
extern const char *alfont_get_name(ALFONT_FONT *font);
extern void alfont_set_font_size(ALFONT_FONT *font, int size);

5
engines/ags/shared/font/ttffontrenderer.cpp
View File

@ -76,10 +76,7 @@ void TTFFontRenderer::RenderText(const char *text, int fontNumber, BITMAP *desti
return;
// Y - 1 because it seems to get drawn down a bit
if ((ShouldAntiAliasText()) && (bitmap_color_depth(destination) > 8))
alfont_textout_aa(destination, _fontData[fontNumber].AlFont, text, x, y - 1, colour);
else
alfont_textout(destination, _fontData[fontNumber].AlFont, text, x, y - 1, colour);
alfont_textout(destination, _fontData[fontNumber].AlFont, text, x, y - 1, colour);
}
bool TTFFontRenderer::LoadFromDisk(int fontNumber, int fontSize) {