Use VertexBuilder's MatrixStack in Font

diff --git a/source/font.cpp b/source/font.cpp
index ae407d1d3224dd8144a5d06e99a87c4d2b50a8b9..a96fd8f884b329ae74c8b520b82d52d1944d7776 100644 (file)
--- 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

diff --git a/source/font.h b/source/font.h
index fcc5c9f51832df17a8c139ad346a8b7e9ea32ed1..28da58229d8bad3f7675599dc2148a6b73a21c42 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -110,7 +110,7 @@ public:
        { return draw_string<Codecs::Utf8>(str, pb); }
 
 private:
-       void create_glyph_vertices(const Glyph &, VertexBuilder &, float) const;
+       void create_glyph_vertices(const Glyph &, VertexBuilder &) const;
        float get_glyph_advance(unsigned) const;
 };