Remove collection-less constructor overloads from most loaders

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

diff --git a/source/builders/font.h b/source/builders/font.h
index 9f040dc99d0e45cc5ffdec41153dfc71e5149778..f46a287092f811a8a6c2b89a73b1aee0eaf97af4 100644 (file)
--- a/source/builders/font.h
+++ b/source/builders/font.h
@@ -5,7 +5,6 @@
 #include <string>
 #include <msp/datafile/objectloader.h>
 #include <msp/stringcodec/utf8.h>
-#include "vertexarray.h"
 
 namespace Msp {
 namespace GL {
@@ -22,11 +21,9 @@ public:
        class Loader: public DataFile::CollectionObjectLoader<Font>
        {
        public:
-               Loader(Font &);
                Loader(Font &, Collection &);
 
        private:
-               void init();
                void glyph(unsigned);
                void kerning(unsigned, unsigned, float);
                void ligature(unsigned, unsigned, unsigned);
@@ -60,7 +57,7 @@ private:
        typedef std::map<CodePair, float> KerningMap;
        typedef std::map<CodePair, unsigned> LigatureMap;
 
-       RefPtr<const Texture2D> texture;
+       const Texture2D *texture;
        float native_size;
        float ascent;
        float descent;