Add kerning support to Font

[libs/gl.git] / source / font.h

diff --git a/source/font.h b/source/font.h
index fe5a9b34d2355b386e2f891be38e2b71df48ff4c..5fcc63c4414dee39064c7a63fcd92bd35497d4a2 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -25,6 +25,7 @@ public:
        private:
                void init();
                void glyph(unsigned);
+               void kerning(unsigned, unsigned, float);
                void texture();
                void texture_ref(const std::string &);
        };
@@ -49,12 +50,15 @@ public:
 
 private:
        typedef std::map<unsigned, Glyph> GlyphMap;
+       typedef std::pair<unsigned, unsigned> KerningKey;
+       typedef std::map<KerningKey, float> KerningMap;
 
        RefPtr<const Texture2D> texture;
        float native_size;
        float ascent;
        float descent;
        GlyphMap glyphs;
+       KerningMap kerning;
 
 public:
        Font();
@@ -63,6 +67,7 @@ public:
        void set_texture(const Texture2D &);
        const Texture2D &get_texture() const;
        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; }
@@ -110,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