X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Ffont.cpp;h=aac416ba5b55b4958b45bcfe67319bbbcd99120e;hp=1ede612a1dec64e9ab2e671a5a9398fc44e8f6dc;hb=HEAD;hpb=f19366d32cc29287a2730cfba90893e407754081

diff --git a/source/builders/font.cpp b/source/builders/font.cpp
index 1ede612a..aac416ba 100644
--- a/source/builders/font.cpp
+++ b/source/builders/font.cpp
@@ -10,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;
@@ -129,22 +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, 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);
@@ -180,7 +154,7 @@ void Font::Loader::texture()
 {
 	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();
 }