X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilders%2Ffont.h;h=af65da8af9ae15d160482397fccdac70d8429d5d;hb=f19366d32cc29287a2730cfba90893e407754081;hp=18c225c13a3dd0399f6f767b3f168a5588d76daa;hpb=3ac3a51c623271da815c8ee60c484445871753bf;p=libs%2Fgl.git diff --git a/source/builders/font.h b/source/builders/font.h index 18c225c1..af65da8a 100644 --- a/source/builders/font.h +++ b/source/builders/font.h @@ -5,7 +5,6 @@ #include #include #include -#include "vertexarray.h" namespace Msp { namespace GL { @@ -22,11 +21,11 @@ public: class Loader: public DataFile::CollectionObjectLoader { public: - Loader(Font &); - Loader(Font &, Collection &); - + Loader(Font &f): Loader(f, 0) { } + Loader(Font &f, Collection &c): Loader(f, &c) { } private: - void init(); + Loader(Font &, Collection *); + void glyph(unsigned); void kerning(unsigned, unsigned, float); void ligature(unsigned, unsigned, unsigned);