Remove the deprecated ProgramBuilder class

[libs/gl.git] / source / font.cpp

diff --git a/source/font.cpp b/source/font.cpp
index 1005609eb16a8ed1a08377c276a7c152c61d22a0..5990c57d7223771410edadcfb69a9df13ea39fe0 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -3,8 +3,7 @@
 #include "bindable.h"
 #include "gl.h"
 #include "font.h"
-#include "immediate.h"
-#include "primitivetype.h"
+#include "primitivebuilder.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -15,7 +14,9 @@ namespace GL {
 Font::Font():
        native_size(1),
        ascent(1),
-       descent(0)
+       descent(0),
+       cap_height(1),
+       x_height(0.5)
 { }
 
 // Avoid synthesizing ~RefPtr in files including font.h
@@ -42,7 +43,7 @@ void Font::add_glyph(const Glyph &g)
 
 void Font::set_kerning(unsigned l, unsigned r, float d)
 {
-       kerning[KerningKey(l, r)] = d;
+       kerning[CodePair(l, r)] = d;
 }
 
 float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
@@ -62,46 +63,47 @@ float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
        return x;
 }
 
-void Font::draw_string(const string &str, StringCodec::Decoder &dec, const Color &color) const
-{
-       BindRestore bind_tex(get_texture());
-       Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
-       imm.color(color);
-       build_string(str, dec, imm);
-}
-
 void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveBuilder &bld) const
 {
-       MatrixStack::Push push_mtx(bld.matrix());
+       VertexBuilder::PushMatrix push_mtx(bld);
 
-       bld.begin(QUADS);
        unsigned prev = 0;
-       for(string::const_iterator i=str.begin(); i!=str.end();)
+       unsigned next = 0;
+       for(string::const_iterator i=str.begin(); (next || i!=str.end());)
        {
-               unsigned c = dec.decode_char(str, i);
+               unsigned c = (next ? next : dec.decode_char(str, i));
+               next = (i!=str.end() ? dec.decode_char(str, i) : 0);
+
+               if(unsigned lig = get_ligature(c, next))
+               {
+                       c = lig;
+                       next = 0;
+               }
+
                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);
+                       bld.transform(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
@@ -114,7 +116,7 @@ float Font::get_glyph_advance(unsigned code, unsigned next) const
 
        if(next)
        {
-               KerningMap::const_iterator j = kerning.find(KerningKey(code, next));
+               KerningMap::const_iterator j = kerning.find(CodePair(code, next));
                if(j!=kerning.end())
                        advance += j->second;
        }
@@ -122,6 +124,26 @@ float Font::get_glyph_advance(unsigned code, unsigned next) const
        return advance;
 }
 
+unsigned Font::get_ligature(unsigned code, unsigned next) const
+{
+       LigatureMap::const_iterator i = ligatures.find(CodePair(code, next));
+       return (i!=ligatures.end() ? i->second : 0);
+}
+
+
+Font::Glyph::Glyph():
+       code(0),
+       x1(0),
+       y1(0),
+       x2(1),
+       y2(1),
+       w(1),
+       h(1),
+       off_x(0),
+       off_y(0),
+       advance(1)
+{ }
+
 
 Font::Loader::Loader(Font &f):
        DataFile::CollectionObjectLoader<Font>(f, 0)
@@ -139,11 +161,14 @@ void Font::Loader::init()
 {
        add("native_size", &Font::native_size);
        add("ascent",      &Font::ascent);
+       add("cap_height",  &Font::cap_height);
        add("descent",     &Font::descent);
        add("texture",     &Loader::texture);
        add("texture",     &Loader::texture_ref);
        add("glyph",       &Loader::glyph);
        add("kerning",     &Loader::kerning);
+       add("ligature",    &Loader::ligature);
+       add("x_height",    &Font::x_height);
 }
 
 void Font::Loader::glyph(unsigned c)
@@ -156,7 +181,12 @@ void Font::Loader::glyph(unsigned c)
 
 void Font::Loader::kerning(unsigned l, unsigned r, float d)
 {
-       obj.kerning[KerningKey(l, r)] = d;
+       obj.kerning[CodePair(l, r)] = d;
+}
+
+void Font::Loader::ligature(unsigned l, unsigned r, unsigned g)
+{
+       obj.ligatures[CodePair(l, r)] = g;
 }
 
 void Font::Loader::texture()