X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.h;h=5fcc63c4414dee39064c7a63fcd92bd35497d4a2;hb=0777840f31274f75cb4ff8e6717c44c373d5e182;hp=a6873aacac6ed7921e035189d095d68aa37940bb;hpb=a6463a575c64115dc1ab80ec9b350622778a8f9b;p=libs%2Fgl.git diff --git a/source/font.h b/source/font.h index a6873aac..5fcc63c4 100644 --- a/source/font.h +++ b/source/font.h @@ -25,11 +25,11 @@ public: private: void init(); void glyph(unsigned); + void kerning(unsigned, unsigned, float); void texture(); void texture_ref(const std::string &); }; -private: struct Glyph { class Loader: public Msp::DataFile::ObjectLoader @@ -48,20 +48,26 @@ private: float advance; }; +private: typedef std::map GlyphMap; + typedef std::pair KerningKey; + typedef std::map KerningMap; RefPtr texture; float native_size; float ascent; float descent; GlyphMap glyphs; + KerningMap kerning; public: Font(); + ~Font(); void set_texture(const Texture2D &); const Texture2D &get_texture() const; - void add_glyph(unsigned, float, float, float, float, float, float, float, float, float); + void add_glyph(const Glyph &); + void set_kerning(unsigned, unsigned, float); float get_native_size() const { return native_size; } float get_ascent() const { return ascent; } float get_descent() const { return descent; } @@ -109,7 +115,7 @@ public: private: void create_glyph_vertices(const Glyph &, VertexBuilder &) const; - float get_glyph_advance(unsigned) const; + float get_glyph_advance(unsigned, unsigned = 0) const; }; } // namespace GL