X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.h;h=9f040dc99d0e45cc5ffdec41153dfc71e5149778;hp=14320b8fed58ff1b9d3fefe01c82c474c631f505;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=b0685fabd8e98a54b396f9b014573f2085743b09 diff --git a/source/font.h b/source/font.h index 14320b8f..9f040dc9 100644 --- a/source/font.h +++ b/source/font.h @@ -13,6 +13,9 @@ namespace GL { class PrimitiveBuilder; class Texture2D; +/** +Stores a set of glyphs and creates strings out of them. +*/ class Font { public: @@ -25,11 +28,12 @@ public: private: void init(); void glyph(unsigned); + void kerning(unsigned, unsigned, float); + void ligature(unsigned, unsigned, unsigned); void texture(); void texture_ref(const std::string &); }; -private: struct Glyph { class Loader: public Msp::DataFile::ObjectLoader @@ -41,32 +45,54 @@ private: }; unsigned code; - float x1,y1; - float x2,y2; - float w,h; + float x1, y1; + float x2, y2; + float w, h; float off_x, off_y; float advance; + + Glyph(); }; +private: typedef std::map GlyphMap; + typedef std::pair CodePair; + typedef std::map KerningMap; + typedef std::map LigatureMap; RefPtr texture; float native_size; float ascent; float descent; + float cap_height; + float x_height; GlyphMap glyphs; + KerningMap kerning; + LigatureMap ligatures; 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); + + /** Adds a glyph to the font. There must not be an existing glyph with the + same code. */ + void add_glyph(const Glyph &); + void set_kerning(unsigned, unsigned, float); + + /** Returns the size used to generate the font texture. This serves as a + hint for obtaining the best quality when rendering strings. */ float get_native_size() const { return native_size; } - float get_default_size() const { return native_size; } // Deprecated + float get_ascent() const { return ascent; } float get_descent() const { return descent; } + float get_cap_height() const { return cap_height; } + float get_x_height() const { return x_height; } + /** Returns the width of a string, in multiples of the font size. Scale the + result according to the size used in rendering. */ float get_string_width(const std::string &, StringCodec::Decoder &) const; template @@ -79,32 +105,26 @@ public: float get_string_width(const std::string &str) const { return get_string_width(str); } - void draw_string(const std::string &, StringCodec::Decoder &) const; - void draw_string(const std::string &, StringCodec::Decoder &, PrimitiveBuilder &) const; - - template - void draw_string(const std::string &str) const - { - typename C::Decoder dec; - draw_string(str, dec); - } - - void draw_string(const std::string &str) const - { draw_string(str); } + /** Builds the primitives for a string. Two-dimensional vertex and texture + coordinates are generated. Size 1.0 is used for building; set up the + builder's matrix before the call. The texture is not bound, to avoid + unnecessary bindings when creating meshes. */ + void build_string(const std::string &, StringCodec::Decoder &, PrimitiveBuilder &) const; template - void draw_string(const std::string &str, PrimitiveBuilder &pb) const + void build_string(const std::string &str, PrimitiveBuilder &pb) const { typename C::Decoder dec; - draw_string(str, dec, pb); + build_string(str, dec, pb); } - void draw_string(const std::string &str, PrimitiveBuilder &pb) const - { return draw_string(str, pb); } + void build_string(const std::string &str, PrimitiveBuilder &pb) const + { return build_string(str, pb); } private: - void create_glyph_vertices(const Glyph &, VertexBuilder &) const; - float get_glyph_advance(unsigned) const; + void create_glyph_quad(const Glyph &, PrimitiveBuilder &) const; + float get_glyph_advance(unsigned, unsigned = 0) const; + unsigned get_ligature(unsigned, unsigned) const; }; } // namespace GL