Use triangle strips for creating strings

Quads are not supported by modern OpenGL.

diff --git a/source/font.cpp b/source/font.cpp
index 1005609eb16a8ed1a08377c276a7c152c61d22a0..6780f5fa8679f2ab73df72902d79e8d729b11a55 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -74,7 +74,6 @@ 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();)
        {
@@ -86,22 +85,23 @@ void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveB
                if(prev)
                        bld.matrix() *= Matrix::translation(get_glyph_advance(prev, c), 0, 0);
 
-               create_glyph_vertices(j->second, bld);
+               create_glyph_quad(j->second, bld);
                prev = c;
        }
-       bld.end();
 }
 
-void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &bld) const
+void Font::create_glyph_quad(const Glyph &glyph, PrimitiveBuilder &bld) const
 {
+       bld.begin(TRIANGLE_STRIP);
+       bld.texcoord(glyph.x1, glyph.y2);
+       bld.vertex(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);
+       bld.texcoord(glyph.x2, glyph.y1);
+       bld.vertex(glyph.off_x+glyph.w, glyph.off_y);
+       bld.end();
 }
 
 float Font::get_glyph_advance(unsigned code, unsigned next) const

diff --git a/source/font.h b/source/font.h
index bb8bd0a29a1c5c45612d4def0476824817e602a6..efef8351830bd45425dc8045ed144884bca3eac5 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -127,7 +127,7 @@ public:
        { return build_string<StringCodec::Utf8>(str, pb); }
 
 private:
-       void create_glyph_vertices(const Glyph &, VertexBuilder &) const;
+       void create_glyph_quad(const Glyph &, PrimitiveBuilder &) const;
        float get_glyph_advance(unsigned, unsigned = 0) const;
 };