X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.cpp;h=54631926e4e1b3ae22da55afff111450fc9719e0;hp=766f011a97dc55708b3fb11da395342facfb6a92;hb=3d8438922e24b787587d0c8f1883c5567a4af573;hpb=e92458a4a0e6191bff549a8b316dbbbd7c56e90f diff --git a/source/font.cpp b/source/font.cpp index 766f011a..54631926 100644 --- a/source/font.cpp +++ b/source/font.cpp @@ -1,10 +1,6 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - +#include +#include +#include "bindable.h" #include "gl.h" #include "font.h" #include "immediate.h" @@ -17,143 +13,172 @@ namespace Msp { namespace GL { Font::Font(): - tex(0), - 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() { } void Font::set_texture(const Texture2D &t) { - tex=&t; + 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(const Glyph &g) +{ + insert_unique(glyphs, g.code, g); } -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::set_kerning(unsigned l, unsigned r, float d) { - 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)); + kerning[KerningKey(l, r)] = d; } -float Font::get_string_width(const string &str, Codecs::Decoder &dec) const +float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const { - float x=0; + 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(); - - float x=0; - unsigned count=0; + MatrixStack::Push push_mtx(bld.matrix()); - 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; } Font::Loader::Loader(Font &f): - font(f), - coll(0) + DataFile::CollectionObjectLoader(f, 0) { init(); } Font::Loader::Loader(Font &f, Collection &c): - font(f), - coll(&c) + DataFile::CollectionObjectLoader(f, &c) { init(); } -DataFile::Collection &Font::Loader::get_collection() -{ - if(!coll) - throw InvalidState("No collection"); - return *coll; -} - void Font::Loader::init() { - add("default_size", &Font::default_size); - add("ascent", &Font::ascent); - add("descent", &Font::descent); - add("texture", &Font::tex); - 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); - font.glyphs.insert(GlyphMap::value_type(c, gl)); + 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 tex = new Texture2D; + load_sub(*tex); + obj.texture = tex; +} + +void Font::Loader::texture_ref(const string &name) +{ + obj.texture = &get_collection().get(name); + obj.texture.keep(); } Font::Glyph::Loader::Loader(Glyph &g): - glyph(g) + DataFile::ObjectLoader(g) { add("texcoords", &Loader::texcoords); add("size", &Glyph::w, &Glyph::h); @@ -161,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_) { - glyph.x1=x1; - glyph.y1=y1; - glyph.x2=x2; - glyph.y2=y2; + obj.x1 = x1_; + obj.y1 = y1_; + obj.x2 = x2_; + obj.y2 = y2_; } } // namespace GL