X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.cpp;h=abfe631ef82dae0336bfb49f631023197c7d1b26;hb=27abdf9ad5d5e297fd74ddc23b39b0c7817a20d8;hp=d03ce281aeae55e6c95daf327ad401e63059164b;hpb=a64e2e362cd7bce6f103f8878d69fcca4261bac9;p=libs%2Fgl.git

diff --git a/source/font.cpp b/source/font.cpp
index d03ce281..abfe631e 100644
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/maputils.h>
 #include <msp/datafile/collection.h>
 #include "bindable.h"
 #include "gl.h"
@@ -17,6 +18,10 @@ Font::Font():
 	descent(0)
 { }
 
+// Avoid synthesizing ~RefPtr in files including font.h
+Font::~Font()
+{ }
+
 void Font::set_texture(const Texture2D &t)
 {
 	texture = &t;
@@ -30,20 +35,9 @@ const Texture2D &Font::get_texture() const
 	return *texture;
 }
 
-void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, float w, float h, float ox, float oy, float adv)
+void Font::add_glyph(const Glyph &g)
 {
-	Glyph glyph;
-	glyph.code = code;
-	glyph.x1 = x1;
-	glyph.y1 = y1;
-	glyph.x2 = x2;
-	glyph.y2 = y2;
-	glyph.w = w;
-	glyph.h = h;
-	glyph.off_x = ox;
-	glyph.off_y = oy;
-	glyph.advance = adv;
-	glyphs.insert(GlyphMap::value_type(code, glyph));
+	insert_unique(glyphs, g.code, g);
 }
 
 float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
@@ -123,10 +117,6 @@ void Font::Loader::init()
 	add("texture",     &Loader::texture);
 	add("texture",     &Loader::texture_ref);
 	add("glyph",       &Loader::glyph);
-
-	// Deprecated aliases
-	add("default_size",   &Font::native_size);
-	add("texture_inline", &Loader::texture);
 }
 
 void Font::Loader::glyph(unsigned c)