Change some class names

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

diff --git a/source/font.cpp b/source/font.cpp
index d03ce281aeae55e6c95daf327ad401e63059164b..54631926e4e1b3ae22da55afff111450fc9719e0 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/maputils.h>
 #include <msp/datafile/collection.h>
 #include "bindable.h"
 #include "gl.h"
@@ -14,7 +15,13 @@ 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
+Font::~Font()
 { }
 
 void Font::set_texture(const Texture2D &t)
@@ -30,35 +37,36 @@ const Texture2D &Font::get_texture() const
        return *texture;
 }
 
-void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, float w, float h, float ox, float oy, float adv)
+void Font::add_glyph(const Glyph &g)
 {
-       Glyph glyph;
-       glyph.code = code;
-       glyph.x1 = x1;
-       glyph.y1 = y1;
-       glyph.x2 = x2;
-       glyph.y2 = y2;
-       glyph.w = w;
-       glyph.h = h;
-       glyph.off_x = ox;
-       glyph.off_y = oy;
-       glyph.advance = adv;
-       glyphs.insert(GlyphMap::value_type(code, glyph));
+       insert_unique(glyphs, g.code, g);
+}
+
+void Font::set_kerning(unsigned l, unsigned r, float d)
+{
+       kerning[KerningKey(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);
+       BindRestore bind_tex(get_texture());
        Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
        imm.color(color);
        build_string(str, dec, imm);
@@ -68,38 +76,52 @@ 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();)
        {
-               GlyphMap::const_iterator j = glyphs.find(dec.decode_char(str, i));
+               unsigned c = dec.decode_char(str, i);
+               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.matrix() *= 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(KerningKey(code, next));
+               if(j!=kerning.end())
+                       advance += j->second;
+       }
+
+       return advance;
 }
 
 
@@ -119,14 +141,13 @@ 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);
-
-       // Deprecated aliases
-       add("default_size",   &Font::native_size);
-       add("texture_inline", &Loader::texture);
+       add("kerning",     &Loader::kerning);
+       add("x_height",    &Font::x_height);
 }
 
 void Font::Loader::glyph(unsigned c)
@@ -137,6 +158,11 @@ 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[KerningKey(l, r)] = d;
+}
+
 void Font::Loader::texture()
 {
        RefPtr<Texture2D> tex = new Texture2D;
@@ -160,12 +186,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