X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilders%2Ffont.cpp;h=1ede612a1dec64e9ab2e671a5a9398fc44e8f6dc;hb=f19366d32cc29287a2730cfba90893e407754081;hp=dfa6bf9cf953685c2472c29b29788447e53e6642;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git diff --git a/source/builders/font.cpp b/source/builders/font.cpp index dfa6bf9c..1ede612a 100644 --- a/source/builders/font.cpp +++ b/source/builders/font.cpp @@ -1,7 +1,6 @@ #include #include #include -#include "gl.h" #include "font.h" #include "primitivebuilder.h" #include "texture2d.h" @@ -144,19 +143,8 @@ Font::Glyph::Glyph(): { } -Font::Loader::Loader(Font &f): - DataFile::CollectionObjectLoader(f, 0) -{ - init(); -} - -Font::Loader::Loader(Font &f, Collection &c): - DataFile::CollectionObjectLoader(f, &c) -{ - init(); -} - -void Font::Loader::init() +Font::Loader::Loader(Font &f, Collection *c): + DataFile::CollectionObjectLoader(f, c) { add("native_size", &Font::native_size); add("ascent", &Font::ascent);