gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r25463) -Codechange: export more size related information from the fonts

Browse Source
This commit is contained in:
rubidium 2013-06-25 20:21:21 +00:00
parent 092c33be3f
commit 43a37f7f28
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fontcache.cpp
View File

@ -25,13 +25,16 @@ static const int ASCII_LETTERSTART = 32; ///< First printable ASCII letter.
static const int MAX_FONT_SIZE = 72; ///< Maximum font size. static const int MAX_FONT_SIZE = 72; ///< Maximum font size.
/** Default heights for the different sizes of fonts. */ /** Default heights for the different sizes of fonts. */
static const int _default_font_height[FS_END] = {10, 6, 18, 10}; static const int _default_font_height[FS_END] = {10, 6, 18, 10};
static const int _default_font_ascender[FS_END] = { 8, 5, 15, 8};
/** /**
* Create a new font cache. * Create a new font cache.
* @param fs The size of the font. * @param fs The size of the font.
*/ */
FontCache::FontCache(FontSize fs) : parent(FontCache::Get(fs)), fs(fs), height(_default_font_height[fs]) FontCache::FontCache(FontSize fs) : parent(FontCache::Get(fs)), fs(fs), height(_default_font_height[fs]),
ascender(_default_font_ascender[fs]), descender(_default_font_ascender[fs] - _default_font_height[fs]),
units_per_em(1)
{ {
assert(parent == NULL || this->fs == parent->fs); assert(parent == NULL || this->fs == parent->fs);
FontCache::caches[this->fs] = this; FontCache::caches[this->fs] = this;
@ -187,8 +190,6 @@ bool SpriteFontCache::GetDrawGlyphShadow()
class FreeTypeFontCache : public FontCache { class FreeTypeFontCache : public FontCache {
private: private:
FT_Face face; ///< The font face associated with this font. FT_Face face; ///< The font face associated with this font.
int ascender; ///< The ascender value of this font.
int descender; ///< The descender value of this font.
/** Container for information about a glyph. */ /** Container for information about a glyph. */
struct GlyphEntry { struct GlyphEntry {
@ -272,9 +273,10 @@ FreeTypeFontCache::FreeTypeFontCache(FontSize fs, FT_Face face, int pixels) : Fo
FT_Set_Pixel_Sizes(this->face, 0, n); FT_Set_Pixel_Sizes(this->face, 0, n);
} }
this->ascender = this->face->size->metrics.ascender >> 6; this->units_per_em = this->face->units_per_EM;
this->descender = this->face->size->metrics.descender >> 6; this->ascender = this->face->size->metrics.ascender >> 6;
this->height = this->ascender - this->descender; this->descender = this->face->size->metrics.descender >> 6;
this->height = this->ascender - this->descender;
} }
/** /**

31
src/fontcache.h
View File

@ -26,16 +26,43 @@ private:
protected: protected:
FontCache *parent; ///< The parent of this font cache. FontCache *parent; ///< The parent of this font cache.
const FontSize fs; ///< The size of the font. const FontSize fs; ///< The size of the font.
int height; ///< The height of the font; int height; ///< The height of the font.
int ascender; ///< The ascender value of the font.
int descender; ///< The descender value of the font.
int units_per_em; ///< The units per EM value of the font.
public: public:
FontCache(FontSize fs); FontCache(FontSize fs);
virtual ~FontCache(); virtual ~FontCache();
/**
* Get the FontSize of the font.
* @return The FontSize.
*/
inline FontSize GetSize() const { return this->fs; }
/** /**
* Get the height of the font. * Get the height of the font.
* @return The height of the font. * @return The height of the font.
*/ */
inline int GetHeight() { return this->height; } inline int GetHeight() const { return this->height; }
/**
* Get the ascender value of the font.
* @return The ascender value of the font.
*/
inline int GetAscender() const { return this->ascender; }
/**
* Get the descender value of the font.
* @return The descender value of the font.
*/
inline int GetDescender() const{ return this->descender; }
/**
* Get the units per EM value of the font.
* @return The units per EM value of the font.
*/
inline int GetUnitsPerEM() const { return this->units_per_em; }
/** /**
* Get the SpriteID mapped to the given key * Get the SpriteID mapped to the given key