LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-18 11:44:15 +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/font/ImageRasterizer.h
+9 -9
View File
@@ -39,14 +39,14 @@ namespace font
class ImageRasterizer : public Rasterizer
{
public:
ImageRasterizer(love::image::ImageData *imageData, unsigned int *glyphs, int numglyphs);
ImageRasterizer(love::image::ImageData *imageData, uint32 *glyphs, int numglyphs);
virtual ~ImageRasterizer();
// Implement Rasterizer
virtual int getLineHeight() const;
virtual GlyphData *getGlyphData(unsigned int glyph) const;
virtual GlyphData *getGlyphData(uint32 glyph) const;
virtual int getGlyphCount() const;
virtual bool hasGlyph(unsigned int glyph) const;
virtual bool hasGlyph(uint32 glyph) const;
private:
// Load all the glyph positions into memory
@@ -56,20 +56,20 @@ private:
love::image::ImageData *imageData;
// The glyphs in the font
unsigned int *glyphs;
uint32 *glyphs;
// Number of glyphs in the font
unsigned int numglyphs;
int numglyphs;
// Information about a glyph in the ImageData
struct ImageGlyphData
{
unsigned int x;
unsigned int width;
unsigned int spacing;
int x;
int width;
int spacing;
};
std::map<unsigned int, ImageGlyphData> imageGlyphs;
std::map<uint32, ImageGlyphData> imageGlyphs;
// Color used to identify glyph separation in the source ImageData
love::image::pixel spacer;