X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Ffont.cpp;h=58b23fe9dac150cefb9f0212c7b7777cba8584a3;hp=dfa6bf9cf953685c2472c29b29788447e53e6642;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=e9a898f315b5d1396f196d785913a283c30940f2 diff --git a/source/builders/font.cpp b/source/builders/font.cpp index dfa6bf9c..58b23fe9 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" @@ -11,18 +10,6 @@ using namespace std; namespace Msp { namespace GL { -Font::Font(): - native_size(1), - ascent(1), - descent(0), - cap_height(1), - x_height(0.5) -{ } - -// Avoid synthesizing ~RefPtr in files including font.h -Font::~Font() -{ } - void Font::set_texture(const Texture2D &t) { texture = &t; @@ -130,33 +117,8 @@ unsigned Font::get_ligature(unsigned code, unsigned next) const } -Font::Glyph::Glyph(): - code(0), - x1(0), - y1(0), - x2(1), - y2(1), - w(1), - h(1), - off_x(0), - off_y(0), - advance(1) -{ } - - -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() { add("native_size", &Font::native_size); add("ascent", &Font::ascent);