Remove the deprecated ProgramBuilder class

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

diff --git a/source/font.cpp b/source/font.cpp
index abfe631ef82dae0336bfb49f631023197c7d1b26..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
@@ -40,63 +41,110 @@ void Font::add_glyph(const Glyph &g)
        insert_unique(glyphs, g.code, g);
 }
 
+void Font::set_kerning(unsigned l, unsigned r, float d)
+{
+       kerning[CodePair(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;
 }
 
-void Font::draw_string(const string &str, StringCodec::Decoder &dec, const Color &color) const
-{
-       Bind bind_tex(get_texture(), true);
-       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);
-       for(string::const_iterator i=str.begin(); i!=str.end();)
+       unsigned prev = 0;
+       unsigned next = 0;
+       for(string::const_iterator i=str.begin(); (next || i!=str.end());)
        {
-               GlyphMap::const_iterator j = glyphs.find(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;
 
-               create_glyph_vertices(j->second, bld);
-               bld.matrix() *= Matrix::translation(j->second.advance, 0, 0);
+               if(prev)
+                       bld.transform(Matrix::translation(get_glyph_advance(prev, c), 0, 0));
+
+               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) 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(CodePair(code, next));
+               if(j!=kerning.end())
+                       advance += j->second;
+       }
+
+       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)
 {
@@ -113,10 +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)
@@ -127,6 +179,16 @@ 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[CodePair(l, r)] = d;
+}
+
+void Font::Loader::ligature(unsigned l, unsigned r, unsigned g)
+{
+       obj.ligatures[CodePair(l, r)] = g;
+}
+
 void Font::Loader::texture()
 {
        RefPtr<Texture2D> tex = new Texture2D;
@@ -150,12 +212,12 @@ Font::Glyph::Loader::Loader(Glyph &g):
        add("advance",   &Glyph::advance);
 }
 
-void Font::Glyph::Loader::texcoords(float x1, float y1, float x2, float y2)
+void Font::Glyph::Loader::texcoords(float x1_, float y1_, float x2_, float y2_)
 {
-       obj.x1 = x1;
-       obj.y1 = y1;
-       obj.x2 = x2;
-       obj.y2 = y2;
+       obj.x1 = x1_;
+       obj.y1 = y1_;
+       obj.x2 = x2_;
+       obj.y2 = y2_;
 }
 
 } // namespace GL