Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed character weight too high for the sf::Text::Bold style

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1311 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2009-12-19 23:17:24 +00:00
parent c72312f9a4
commit 7947044a83
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/SFML/Graphics/Font.cpp
View File

@ -320,7 +320,7 @@ Font::GlyphInfo Font::LoadGlyph(Uint32 codePoint, unsigned int characterSize, bo
return glyphInfo; return glyphInfo;
// Apply bold if necessary -- first technique using outline (highest quality) // Apply bold if necessary -- first technique using outline (highest quality)
FT_Pos weight = 2 << 6; FT_Pos weight = 1 << 6;
bool outline = (glyphDesc->format == FT_GLYPH_FORMAT_OUTLINE); bool outline = (glyphDesc->format == FT_GLYPH_FORMAT_OUTLINE);
if (bold && outline) if (bold && outline)
{ {
@ -344,7 +344,9 @@ Font::GlyphInfo Font::LoadGlyph(Uint32 codePoint, unsigned int characterSize, bo
if (bold) if (bold)
glyphInfo.GlyphDesc.Advance += weight >> 6; glyphInfo.GlyphDesc.Advance += weight >> 6;
if ((bitmap.width > 0) && (bitmap.rows > 0)) int width = bitmap.width;
int height = bitmap.rows;
if ((width > 0) && (height > 0))
{ {
// Leave a small padding around characters, so that filtering doesn't // Leave a small padding around characters, so that filtering doesn't
// pollute them with pixels from neighbours // pollute them with pixels from neighbours
@ -354,28 +356,28 @@ Font::GlyphInfo Font::LoadGlyph(Uint32 codePoint, unsigned int characterSize, bo
Page& page = myPages[characterSize]; Page& page = myPages[characterSize];
// Find a good position for the new glyph into the texture // Find a good position for the new glyph into the texture
glyphInfo.TextureRect = FindGlyphRect(page, bitmap.width + 2 * padding, bitmap.rows + 2 * padding); glyphInfo.TextureRect = FindGlyphRect(page, width + 2 * padding, height + 2 * padding);
// Compute the glyph's texture coordinates and bounding box // Compute the glyph's texture coordinates and bounding box
glyphInfo.GlyphDesc.TexCoords = page.Texture.GetTexCoords(glyphInfo.TextureRect); glyphInfo.GlyphDesc.TexCoords = page.Texture.GetTexCoords(glyphInfo.TextureRect);
glyphInfo.GlyphDesc.Rectangle.Left = bitmapGlyph->left - padding; glyphInfo.GlyphDesc.Rectangle.Left = bitmapGlyph->left - padding;
glyphInfo.GlyphDesc.Rectangle.Top = -bitmapGlyph->top - padding; glyphInfo.GlyphDesc.Rectangle.Top = -bitmapGlyph->top - padding;
glyphInfo.GlyphDesc.Rectangle.Right = bitmapGlyph->left + bitmap.width + padding; glyphInfo.GlyphDesc.Rectangle.Right = bitmapGlyph->left + width + padding;
glyphInfo.GlyphDesc.Rectangle.Bottom = -bitmapGlyph->top + bitmap.rows + padding; glyphInfo.GlyphDesc.Rectangle.Bottom = -bitmapGlyph->top + height + padding;
// Extract the glyph's pixels from the bitmap // Extract the glyph's pixels from the bitmap
myPixelBuffer.resize(bitmap.width * bitmap.rows * 4, 255); myPixelBuffer.resize(width * height * 4, 255);
const Uint8* pixels = bitmap.buffer; const Uint8* pixels = bitmap.buffer;
for (int y = 0; y < bitmap.rows; ++y) for (int y = 0; y < height; ++y)
{ {
for (int x = 0; x < bitmap.width; ++x) for (int x = 0; x < width; ++x)
{ {
// The color channels remain white, just fill the alpha channel // The color channels remain white, just fill the alpha channel
std::size_t index = (x + y * bitmap.width) * 4 + 3; std::size_t index = (x + y * width) * 4 + 3;
myPixelBuffer[index] = pixels[x]; myPixelBuffer[index] = pixels[x];
// Formula for FT_RENDER_MODE_MONO // Formula for FT_RENDER_MODE_MONO
// myPixelBuffer[index] = ((pixels[x / 8]) & (1 << (7 - (x % 8)))) ? 255 : 0; //myPixelBuffer[index] = ((pixels[x / 8]) & (1 << (7 - (x % 8)))) ? 255 : 0;
} }
pixels += bitmap.pitch; pixels += bitmap.pitch;
} }
@ -481,7 +483,7 @@ bool Font::SetCurrentSize(unsigned int characterSize) const
if (myCurrentSize != characterSize) if (myCurrentSize != characterSize)
{ {
myCurrentSize = characterSize; myCurrentSize = characterSize;
return FT_Set_Pixel_Sizes(static_cast<FT_Face>(myFace), characterSize, characterSize) == 0; return FT_Set_Pixel_Sizes(static_cast<FT_Face>(myFace), 0, characterSize) == 0;
} }
else else
{ {