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;
}
-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, Collection *c):
- DataFile::CollectionObjectLoader<Font>(f, c)
+Font::Loader::Loader(Font &f, Collection &c):
+ DataFile::CollectionObjectLoader<Font>(f, &c)
{
add("native_size", &Font::native_size);
add("ascent", &Font::ascent);
{
RefPtr<Texture2D> tex = new Texture2D;
load_sub(*tex);
- get_collection().add(FS::basename(get_source())+".tex2d", tex.get());
+ get_collection().add(FS::basename(get_source())+".tex", tex.get());
obj.texture = tex.release();
}