Change Font::add_glyph to take a glyph struct

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

diff --git a/source/font.h b/source/font.h
index a6873aacac6ed7921e035189d095d68aa37940bb..6f8f35ff1db4be61fc52af060e1daade7ae73496 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -29,7 +29,6 @@ public:
                void texture_ref(const std::string &);
        };
 
-private:
        struct Glyph
        {
                class Loader: public Msp::DataFile::ObjectLoader<Glyph>
@@ -48,6 +47,7 @@ private:
                float advance;
        };
 
+private:
        typedef std::map<unsigned, Glyph> GlyphMap;
 
        RefPtr<const Texture2D> texture;
@@ -61,7 +61,7 @@ public:
 
        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 &);
        float get_native_size() const { return native_size; }
        float get_ascent() const { return ascent; }
        float get_descent() const { return descent; }