X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.cpp;h=a96fd8f884b329ae74c8b520b82d52d1944d7776;hp=ae407d1d3224dd8144a5d06e99a87c4d2b50a8b9;hb=8ee883aad11511b046461e29ed9f73cf551d0f24;hpb=524515ae47ea553e8e1b9381c2027208f2d096db

diff --git a/source/font.cpp b/source/font.cpp
index ae407d1d..a96fd8f8 100644
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -69,37 +69,34 @@ void Font::draw_string(const string &str, Codecs::Decoder &dec) const
 	draw_string(str, dec, imm);
 }
 
-void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &pbuilder) const
+void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &bld) const
 {
+	MatrixStack::Push push_mtx(bld.matrix());
 	Bind bind_tex(get_texture(), true);
 
-	float x = 0;
-	unsigned count = 0;
-
-	pbuilder.begin(QUADS);
+	bld.begin(QUADS);
 	for(string::const_iterator i=str.begin(); i!=str.end();)
 	{
 		GlyphMap::const_iterator j = glyphs.find(dec.decode_char(str, i));
 		if(j==glyphs.end())
 			continue;
 
-		create_glyph_vertices(j->second, pbuilder, x);
-		x += j->second.advance;
-		count += 4;
+		create_glyph_vertices(j->second, bld);
+		bld.matrix() *= Matrix::translation(j->second.advance, 0, 0);
 	}
-	pbuilder.end();
+	bld.end();
 }
 
-void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, float x) const
+void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &bld) const
 {
-	vbuilder.texcoord(glyph.x1, glyph.y1);
-	vbuilder.vertex(x+glyph.off_x, glyph.off_y);
-	vbuilder.texcoord(glyph.x2, glyph.y1);
-	vbuilder.vertex(x+glyph.off_x+glyph.w, glyph.off_y);
-	vbuilder.texcoord(glyph.x2, glyph.y2);
-	vbuilder.vertex(x+glyph.off_x+glyph.w, glyph.off_y+glyph.h);
-	vbuilder.texcoord(glyph.x1, glyph.y2);
-	vbuilder.vertex(x+glyph.off_x, glyph.off_y+glyph.h);
+	bld.texcoord(glyph.x1, glyph.y1);
+	bld.vertex(glyph.off_x, glyph.off_y);
+	bld.texcoord(glyph.x2, glyph.y1);
+	bld.vertex(glyph.off_x+glyph.w, glyph.off_y);
+	bld.texcoord(glyph.x2, glyph.y2);
+	bld.vertex(glyph.off_x+glyph.w, glyph.off_y+glyph.h);
+	bld.texcoord(glyph.x1, glyph.y2);
+	bld.vertex(glyph.off_x, glyph.off_y+glyph.h);
 }
 
 float Font::get_glyph_advance(unsigned code) const