Allow retrieving data from Mesh

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

diff --git a/source/font.h b/source/font.h
index a55933519b6c792a72bf967a7bdce2d7514afdf1..3178a4c2717ed2f64d6d4e2c72bb413b84056a60 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/loader.h>
+#include <msp/datafile/collection.h>
 #include <msp/strings/codec.h>
 #include "vertexarray.h"
 
@@ -22,21 +22,27 @@ class Texture2D;
 class Font
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public DataFile::Loader
        {
+       private:
+               Font &font;
+               DataFile::Collection *coll;
+
        public:
+               typedef DataFile::Collection Collection;
+
                Loader(Font &);
+               Loader(Font &, DataFile::Collection &);
                ~Loader();
                Font &get_object() { return font; }
+               DataFile::Collection &get_collection();
        private:
-               Font &font;
-
+               void init();
                void texture(const std::string &);
                void glyph(unsigned);
        };
 
        Font();
-       ~Font();
 
        void  set_texture(const Texture2D &);
        void  add_glyph(unsigned, float, float, float, float, float, float, float, float, float);
@@ -88,7 +94,6 @@ private:
        typedef std::map<unsigned, Glyph> GlyphMap;
 
        const Texture2D *tex;
-       bool     own_tex;
        float    default_size;
        float    ascent;
        float    descent;