Inherit Loaders from the ObjectLoader classes

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

diff --git a/source/font.h b/source/font.h
index b48c6445bb53a6d4136cd1d3c2b040edbf913c40..dd40ec0b277f2deb9e835e26b5fda9c1f9ddab96 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -10,7 +10,7 @@ Distributed under the LGPL
 
 #include <map>
 #include <string>
-#include <msp/datafile/collection.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/strings/utf8.h>
 #include "vertexarray.h"
 
@@ -23,26 +23,19 @@ class Texture2D;
 class Font
 {
 public:
-       class Loader: public DataFile::Loader
+       class Loader: public DataFile::CollectionObjectLoader<Font>
        {
-       private:
-               Font &font;
-               DataFile::Collection *coll;
-
        public:
-               typedef DataFile::Collection Collection;
-
                Loader(Font &);
-               Loader(Font &, DataFile::Collection &);
-               Font &get_object() { return font; }
-               DataFile::Collection &get_collection();
+               Loader(Font &, Collection &);
        private:
                void init();
-               void texture(const std::string &);
                void glyph(unsigned);
+               void texture_inline();
        };
 
        Font();
+       ~Font();
 
        void  set_texture(const Texture2D &);
        const Texture2D &get_texture() const;
@@ -88,14 +81,11 @@ public:
 private:
        struct Glyph
        {
-               class Loader: public Msp::DataFile::Loader
+               class Loader: public Msp::DataFile::ObjectLoader<Glyph>
                {
                public:
                        Loader(Glyph &);
-                       Glyph &get_object() { return glyph; }
                private:
-                       Glyph &glyph;
-
                        void texcoords(float, float, float, float);
                };
 
@@ -109,6 +99,7 @@ private:
        typedef std::map<unsigned, Glyph> GlyphMap;
 
        const Texture2D *tex;
+       bool     own_tex;
        float    default_size;
        float    ascent;
        float    descent;