LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 16:20:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up font code to always use uint32 instead of the slightly more ambiguous "unsigned int" for codepoints

Browse Source
This commit is contained in:
Alex Szpakowski
2013-06-16 19:48:53 -03:00
parent d48d1fd441
commit 76618f0328
17 changed files with 60 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Font.cpp
+7 -12
View File
@@ -172,7 +172,7 @@ void Font::createTexture()
setFilter(filter);
}
Font::Glyph *Font::addGlyph(unsigned int glyph)
Font::Glyph *Font::addGlyph(uint32 glyph)
{
love::font::GlyphData *gd = rasterizer->getGlyphData(glyph);
int w = gd->getWidth();
@@ -243,7 +243,7 @@ Font::Glyph *Font::addGlyph(unsigned int glyph)
return g;
}
Font::Glyph *Font::findGlyph(unsigned int glyph)
Font::Glyph *Font::findGlyph(uint32 glyph)
{
Glyph *g = glyphs[glyph];
if (!g)
@@ -283,7 +283,7 @@ void Font::print(const std::string &text, float x, float y, float letter_spacing
while (i != end)
{
unsigned int g = *i++;
uint32 g = *i++;
if (g == '\n')
{
@@ -392,7 +392,7 @@ int Font::getWidth(const std::string &str)
utf8::iterator<std::string::const_iterator> end(line.end(), line.begin(), line.end());
while (i != end)
{
unsigned int c = *i++;
uint32 c = *i++;
g = findGlyph(c);
width += static_cast<int>(g->spacing * mSpacing);
}
@@ -409,12 +409,7 @@ int Font::getWidth(const std::string &str)
return max_width;
}
int Font::getWidth(const char *str)
{
return this->getWidth(std::string(str));
}
int Font::getWidth(unsigned int character)
int Font::getWidth(char character)
{
Glyph *g = findGlyph(character);
return g->spacing;
@@ -526,7 +521,7 @@ bool Font::loadVolatile()
void Font::unloadVolatile()
{
// nuke everything from orbit
std::map<unsigned int, Glyph *>::iterator it = glyphs.begin();
std::map<uint32, Glyph *>::iterator it = glyphs.begin();
Glyph *g;
while (it != glyphs.end())
{
@@ -559,7 +554,7 @@ float Font::getBaseline() const
return (type == FONT_TRUETYPE) ? floor(getHeight() / 1.25f + 0.5f) : 0.0f;
}
bool Font::hasGlyph(unsigned int glyph) const
bool Font::hasGlyph(uint32 glyph) const
{
return rasterizer->hasGlyph(glyph);
}
src/modules/graphics/opengl/Font.h
+5 -6
View File
@@ -81,14 +81,13 @@ public:
* @param str A string of text.
**/
int getWidth(const std::string &str);
int getWidth(const char *str);
/**
* Returns the width of the passed character.
*
* @param character A character.
**/
int getWidth(unsigned int character);
int getWidth(char character);
/**
* Returns the maximal width of a wrapped string
@@ -138,7 +137,7 @@ public:
int getDescent() const;
float getBaseline() const;
bool hasGlyph(unsigned int glyph) const;
bool hasGlyph(uint32 glyph) const;
bool hasGlyph(const std::string &text) const;
private:
@@ -194,7 +193,7 @@ private:
std::vector<GLuint> textures;
// maps glyphs to glyph texture information
std::map<unsigned int, Glyph *> glyphs;
std::map<uint32, Glyph *> glyphs;
FontType type;
Image::Filter filter;
@@ -210,8 +209,8 @@ private:
bool initializeTexture(GLint format);
void createTexture();
Glyph *addGlyph(unsigned int glyph);
Glyph *findGlyph(unsigned int glyph);
Glyph *addGlyph(uint32 glyph);
Glyph *findGlyph(uint32 glyph);
}; // Font
} // opengl
src/modules/graphics/opengl/wrap_Font.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ int w_Font_hasGlyph(lua_State *L)
if (lua_type(L, 2) == LUA_TSTRING)
hasglyph = t->hasGlyph(luax_checkstring(L, 2));
else
hasglyph = t->hasGlyph((unsigned int) luaL_checknumber(L, 2));
hasglyph = t->hasGlyph((uint32) luaL_checknumber(L, 2));
}
catch (love::Exception &e)
{