Use libmspmath to provide vector and matrix operations

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

diff --git a/source/font.h b/source/font.h
index 21c202d795ef04a5fd4ec08957dddf44e0c9b0f3..fe5a9b34d2355b386e2f891be38e2b71df48ff4c 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;
@@ -58,12 +58,12 @@ private:
 
 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 &);
        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; }