Make the use of DevIL optional

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

diff --git a/source/font.h b/source/font.h
index 68c035a64d0c4b2d34c6b207b67641d8dadb6e4f..f647dbbdef1a07a92bcb75e8373822e028cf1316 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -33,7 +33,6 @@ public:
 
                Loader(Font &);
                Loader(Font &, DataFile::Collection &);
-               ~Loader();
                Font &get_object() { return font; }
                DataFile::Collection &get_collection();
        private:
@@ -94,7 +93,6 @@ private:
                float w,h;
                float off_x, off_y;
                float advance;
-               unsigned index;
        };
        typedef std::map<unsigned, Glyph> GlyphMap;
 
@@ -103,12 +101,8 @@ private:
        float    ascent;
        float    descent;
        GlyphMap glyphs;
-       VertexArray varray;
 
-       void create_glyph_vertices();
-       void create_glyph_vertices(const Glyph &, VertexArrayBuilder &);
-       void prepare_render() const;
-       void draw_glyph(unsigned) const;
+       void create_glyph_vertices(const Glyph &, VertexBuilder &, float) const;
        float get_glyph_advance(unsigned) const;
 };