X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.cpp;fp=source%2Ffont.cpp;h=069ecf0fa40db27feeaca1e592204fd1a3934408;hp=abfe631ef82dae0336bfb49f631023197c7d1b26;hb=355e3a068ea4ad6a7d3ab9318b3ce74b7f0b0b15;hpb=ee31badbd85f64eaca16c3a2e9db217465992a69

diff --git a/source/font.cpp b/source/font.cpp
index abfe631e..069ecf0f 100644
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -40,12 +40,24 @@ void Font::add_glyph(const Glyph &g)
 	insert_unique(glyphs, g.code, g);
 }
 
+void Font::set_kerning(unsigned l, unsigned r, float d)
+{
+	kerning[KerningKey(l, r)] = d;
+}
+
 float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
 {
 	float x = 0;
 
+	unsigned prev = 0;
 	for(string::const_iterator i=str.begin(); i!=str.end();)
-		x += get_glyph_advance(dec.decode_char(str, i));
+	{
+		unsigned c = dec.decode_char(str, i);
+		if(prev)
+			x += get_glyph_advance(prev, c);
+		prev = c;
+	}
+	x += get_glyph_advance(prev);
 
 	return x;
 }
@@ -63,14 +75,19 @@ void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveB
 	MatrixStack::Push push_mtx(bld.matrix());
 
 	bld.begin(QUADS);
+	unsigned prev = 0;
 	for(string::const_iterator i=str.begin(); i!=str.end();)
 	{
-		GlyphMap::const_iterator j = glyphs.find(dec.decode_char(str, i));
+		unsigned c = dec.decode_char(str, i);
+		GlyphMap::const_iterator j = glyphs.find(c);
 		if(j==glyphs.end())
 			continue;
 
+		if(prev)
+			bld.matrix() *= Matrix::translation(get_glyph_advance(prev, c), 0, 0);
+
 		create_glyph_vertices(j->second, bld);
-		bld.matrix() *= Matrix::translation(j->second.advance, 0, 0);
+		prev = c;
 	}
 	bld.end();
 }
@@ -87,13 +104,22 @@ void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &bld) const
 	bld.vertex(glyph.off_x, glyph.off_y+glyph.h);
 }
 
-float Font::get_glyph_advance(unsigned code) const
+float Font::get_glyph_advance(unsigned code, unsigned next) const
 {
 	GlyphMap::const_iterator i = glyphs.find(code);
 	if(i==glyphs.end())
 		return 0;
 
-	return i->second.advance;
+	float advance = i->second.advance;
+
+	if(next)
+	{
+		KerningMap::const_iterator j = kerning.find(KerningKey(code, next));
+		if(j!=kerning.end())
+			advance += j->second;
+	}
+
+	return advance;
 }
 
 
@@ -117,6 +143,7 @@ void Font::Loader::init()
 	add("texture",     &Loader::texture);
 	add("texture",     &Loader::texture_ref);
 	add("glyph",       &Loader::glyph);
+	add("kerning",     &Loader::kerning);
 }
 
 void Font::Loader::glyph(unsigned c)
@@ -127,6 +154,11 @@ void Font::Loader::glyph(unsigned c)
 	obj.glyphs.insert(GlyphMap::value_type(c, gl));
 }
 
+void Font::Loader::kerning(unsigned l, unsigned r, float d)
+{
+	obj.kerning[KerningKey(l, r)] = d;
+}
+
 void Font::Loader::texture()
 {
 	RefPtr<Texture2D> tex = new Texture2D;