duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Font code cleanup

Browse source
This commit is contained in:
Clownacy 2019-03-07 00:18:24 +00:00
parent 111313ec77
commit 2266a5ee6d
1 changed files with 50 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/Font.cpp
View file

@ -223,17 +223,19 @@ void DrawText(FontObject *font_object, SDL_Surface *surface, int x, int y, unsig
const int letter_x = x + pen_x + face->glyph->bitmap_left; const int letter_x = x + pen_x + face->glyph->bitmap_left;
const int letter_y = y + ((FT_MulFix(face->ascender, face->size->metrics.y_scale) - face->glyph->metrics.horiBearingY + (64 / 2)) / 64); const int letter_y = y + ((FT_MulFix(face->ascender, face->size->metrics.y_scale) - face->glyph->metrics.horiBearingY + (64 / 2)) / 64);
for (int iy = MAX(-letter_y, 0); letter_y + iy < MIN(letter_y + (int)converted.rows, surface->h); ++iy) switch (face->glyph->bitmap.pixel_mode)
{ {
if (face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_LCD) case FT_PIXEL_MODE_LCD:
for (int iy = MAX(-letter_y, 0); letter_y + iy < MIN(letter_y + (int)converted.rows, surface->h); ++iy)
{ {
for (int ix = MAX(-letter_x, 0); letter_x + ix < MIN(letter_x + (int)converted.width / 3, surface->w); ++ix) for (int ix = MAX(-letter_x, 0); letter_x + ix < MIN(letter_x + (int)converted.width / 3, surface->w); ++ix)
{ {
const unsigned char *font_pixel = converted.buffer + iy * converted.pitch + ix * 3; const unsigned char *font_pixel = converted.buffer + iy * converted.pitch + ix * 3;
unsigned char *surface_pixel = (unsigned char*)surface->pixels + (letter_y + iy) * surface->pitch + (letter_x + ix) * 4;
if (font_pixel[0] || font_pixel[1] || font_pixel[2]) if (font_pixel[0] || font_pixel[1] || font_pixel[2])
{ {
unsigned char *surface_pixel = (unsigned char*)surface->pixels + (letter_y + iy) * surface->pitch + (letter_x + ix) * 4;
for (unsigned int j = 0; j < 3; ++j) for (unsigned int j = 0; j < 3; ++j)
{ {
const double alpha = pow((font_pixel[j] / 255.0), 1.0 / 1.8); // Gamma correction const double alpha = pow((font_pixel[j] / 255.0), 1.0 / 1.8); // Gamma correction
@ -244,18 +246,22 @@ void DrawText(FontObject *font_object, SDL_Surface *surface, int x, int y, unsig
} }
} }
} }
else if (face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY)
break;
case FT_PIXEL_MODE_GRAY:
for (int iy = MAX(-letter_y, 0); letter_y + iy < MIN(letter_y + (int)converted.rows, surface->h); ++iy)
{ {
for (int ix = MAX(-letter_x, 0); letter_x + ix < MIN(letter_x + (int)converted.width, surface->w); ++ix) for (int ix = MAX(-letter_x, 0); letter_x + ix < MIN(letter_x + (int)converted.width, surface->w); ++ix)
{ {
const unsigned char font_pixel = converted.buffer[iy * converted.pitch + ix]; const unsigned char font_pixel = converted.buffer[iy * converted.pitch + ix];
if (font_pixel)
{
const double alpha = pow((double)font_pixel / (converted.num_grays - 1), 1.0 / 1.8); // Gamma-corrected const double alpha = pow((double)font_pixel / (converted.num_grays - 1), 1.0 / 1.8); // Gamma-corrected
unsigned char *surface_pixel = (unsigned char*)surface->pixels + (letter_y + iy) * surface->pitch + (letter_x + ix) * 4; unsigned char *surface_pixel = (unsigned char*)surface->pixels + (letter_y + iy) * surface->pitch + (letter_x + ix) * 4;
if (alpha)
{
for (unsigned int j = 0; j < 3; ++j) for (unsigned int j = 0; j < 3; ++j)
surface_pixel[j] = (unsigned char)((colours[j] * alpha) + (surface_pixel[j] * (1.0 - alpha))); // Alpha blending surface_pixel[j] = (unsigned char)((colours[j] * alpha) + (surface_pixel[j] * (1.0 - alpha))); // Alpha blending
@ -263,16 +269,18 @@ void DrawText(FontObject *font_object, SDL_Surface *surface, int x, int y, unsig
} }
} }
} }
else if (face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_MONO)
break;
case FT_PIXEL_MODE_MONO:
for (int iy = MAX(-letter_y, 0); letter_y + iy < MIN(letter_y + (int)converted.rows, surface->h); ++iy)
{ {
for (int ix = MAX(-letter_x, 0); letter_x + ix < MIN(letter_x + (int)converted.width, surface->w); ++ix) for (int ix = MAX(-letter_x, 0); letter_x + ix < MIN(letter_x + (int)converted.width, surface->w); ++ix)
{ {
const unsigned char font_pixel = converted.buffer[iy * converted.pitch + ix]; if (converted.buffer[iy * converted.pitch + ix])
{
unsigned char *surface_pixel = (unsigned char*)surface->pixels + (letter_y + iy) * surface->pitch + (letter_x + ix) * 4; unsigned char *surface_pixel = (unsigned char*)surface->pixels + (letter_y + iy) * surface->pitch + (letter_x + ix) * 4;
if (font_pixel)
{
for (unsigned int j = 0; j < 3; ++j) for (unsigned int j = 0; j < 3; ++j)
surface_pixel[j] = colours[j]; surface_pixel[j] = colours[j];
@ -280,6 +288,8 @@ void DrawText(FontObject *font_object, SDL_Surface *surface, int x, int y, unsig
} }
} }
} }
break;
} }
FT_Bitmap_Done(font_object->library, &converted); FT_Bitmap_Done(font_object->library, &converted);