]> git.tdb.fi Git - libs/gl.git/blobdiff - source/font.cpp
Animate only those components which are present in Transforms
[libs/gl.git] / source / font.cpp
index 8320374e5070ec5580dc5c6e74ddda3de5f1468c..54631926e4e1b3ae22da55afff111450fc9719e0 100644 (file)
@@ -1,11 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/core/maputils.h>
 #include <msp/datafile/collection.h>
+#include "bindable.h"
 #include "gl.h"
 #include "font.h"
 #include "immediate.h"
@@ -18,110 +13,115 @@ namespace Msp {
 namespace GL {
 
 Font::Font():
-       tex(0),
-       own_tex(false),
-       default_size(1),
+       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()
-{
-       if(own_tex)
-               delete tex;
-}
+{ }
 
 void Font::set_texture(const Texture2D &t)
 {
-       if(own_tex)
-               delete tex;
-
-       tex=&t;
-       own_tex=false;
+       texture = &t;
+       texture.keep();
 }
 
 const Texture2D &Font::get_texture() const
 {
-       if(!tex)
-               throw InvalidState("No texture");
-       return *tex;
+       if(!texture)
+               throw logic_error("No texture");
+       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);
 }
 
-float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
+void Font::set_kerning(unsigned l, unsigned r, float d)
 {
-       float x=0;
+       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, Codecs::Decoder &dec) const
+void Font::draw_string(const string &str, StringCodec::Decoder &dec, const Color &color) const
 {
-       Immediate imm((TEXCOORD2, VERTEX2));
-       draw_string(str, dec, imm);
+       BindRestore bind_tex(get_texture());
+       Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
+       imm.color(color);
+       build_string(str, dec, imm);
 }
 
-void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &pbuilder) const
+void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveBuilder &bld) const
 {
-       if(!tex)
-               throw InvalidState("No texture");
-
-       tex->bind();
+       MatrixStack::Push push_mtx(bld.matrix());
 
-       float x=0;
-       unsigned count=0;
-
-       pbuilder.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, pbuilder, x);
-               x+=j->second.advance;
-               count+=4;
+               if(prev)
+                       bld.matrix() *= Matrix::translation(get_glyph_advance(prev, c), 0, 0);
+
+               create_glyph_quad(j->second, bld);
+               prev = c;
        }
-       pbuilder.end();
 }
 
-void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, float x) const
+void Font::create_glyph_quad(const Glyph &glyph, PrimitiveBuilder &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.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.y2);
+       bld.vertex(glyph.off_x+glyph.w, 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);
+       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;
 }
 
 
@@ -139,28 +139,41 @@ Font::Loader::Loader(Font &f, Collection &c):
 
 void Font::Loader::init()
 {
-       add("default_size", &Font::default_size);
-       add("ascent",  &Font::ascent);
-       add("descent", &Font::descent);
-       add("texture", &Font::tex);
-       add("texture_inline", &Loader::texture_inline);
-       add("glyph",   &Loader::glyph);
+       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("x_height",    &Font::x_height);
 }
 
 void Font::Loader::glyph(unsigned c)
 {
        Glyph gl;
-       gl.code=c;
+       gl.code = c;
        load_sub(gl);
        obj.glyphs.insert(GlyphMap::value_type(c, gl));
 }
 
-void Font::Loader::texture_inline()
+void Font::Loader::kerning(unsigned l, unsigned r, float d)
 {
-       RefPtr<Texture2D> tex=new Texture2D;
+       obj.kerning[KerningKey(l, r)] = d;
+}
+
+void Font::Loader::texture()
+{
+       RefPtr<Texture2D> tex = new Texture2D;
        load_sub(*tex);
-       obj.tex=tex.release();
-       obj.own_tex=true;
+       obj.texture = tex;
+}
+
+void Font::Loader::texture_ref(const string &name)
+{
+       obj.texture = &get_collection().get<Texture2D>(name);
+       obj.texture.keep();
 }
 
 
@@ -173,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