X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.cpp;h=54631926e4e1b3ae22da55afff111450fc9719e0;hp=2cab462c04e9eaef76b27066d327cebb15a93396;hb=3d8438922e24b787587d0c8f1883c5567a4af573;hpb=48420e9e3f950cfe1e3ced8f8ea92d89671ae8c4 diff --git a/source/font.cpp b/source/font.cpp index 2cab462c..54631926 100644 --- a/source/font.cpp +++ b/source/font.cpp @@ -1,5 +1,10 @@ -#include +#include +#include +#include "bindable.h" +#include "gl.h" #include "font.h" +#include "immediate.h" +#include "primitivetype.h" #include "texture2d.h" using namespace std; @@ -8,198 +13,185 @@ namespace Msp { namespace GL { Font::Font(): - tex(0), - own_tex(false), - default_size(1), + native_size(1), ascent(1), descent(0), - varray((TEXCOORD2, VERTEX2)) + 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) { - tex=&t; + texture = &t; + texture.keep(); } -void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, float w, float h, float ox, float oy, float adv) +const Texture2D &Font::get_texture() const { - 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; - glyph.index=glyphs.size(); - glyphs.insert(GlyphMap::value_type(code, glyph)); - - RefPtr va_builder=varray.modify(); - create_glyph_vertices(glyph, *va_builder); + if(!texture) + throw logic_error("No texture"); + return *texture; } -float Font::get_string_width(const string &str) const +void Font::add_glyph(const Glyph &g) { - float x=0; - - for(string::const_iterator i=str.begin(); i!=str.end(); ++i) - x+=get_glyph_advance(static_cast(*i)); + insert_unique(glyphs, g.code, g); +} - return x; +void Font::set_kerning(unsigned l, unsigned r, float d) +{ + 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) const +void Font::draw_string(const string &str, StringCodec::Decoder &dec, const Color &color) const { - prepare_render(); - - for(string::const_iterator i=str.begin(); i!=str.end(); ++i) - draw_glyph(static_cast(*i)); - - glPopMatrix(); + 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) const +void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveBuilder &bld) const { - prepare_render(); + MatrixStack::Push push_mtx(bld.matrix()); + unsigned prev = 0; for(string::const_iterator i=str.begin(); i!=str.end();) - draw_glyph(dec.decode_char(str, i)); + { + unsigned c = dec.decode_char(str, i); + GlyphMap::const_iterator j = glyphs.find(c); + if(j==glyphs.end()) + continue; - glPopMatrix(); -} + if(prev) + bld.matrix() *= Matrix::translation(get_glyph_advance(prev, c), 0, 0); -void Font::create_glyph_vertices() -{ - varray.clear(); - RefPtr va_builder=varray.modify(); - - unsigned n=0; - for(GlyphMap::iterator i=glyphs.begin(); i!=glyphs.end(); ++i, ++n) - { - i->second.index=n; - create_glyph_vertices(i->second, *va_builder); + create_glyph_quad(j->second, bld); + prev = c; } } -void Font::create_glyph_vertices(const Glyph &glyph, VertexArrayBuilder &va_builder) +void Font::create_glyph_quad(const Glyph &glyph, PrimitiveBuilder &bld) const { - va_builder.texcoord(glyph.x1, glyph.y1); - va_builder.vertex(glyph.off_x, glyph.off_y); - va_builder.texcoord(glyph.x2, glyph.y1); - va_builder.vertex(glyph.off_x+glyph.w, glyph.off_y); - va_builder.texcoord(glyph.x2, glyph.y2); - va_builder.vertex(glyph.off_x+glyph.w, glyph.off_y+glyph.h); - va_builder.texcoord(glyph.x1, glyph.y2); - va_builder.vertex(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(); } -void Font::prepare_render() const +float Font::get_glyph_advance(unsigned code, unsigned next) const { - tex->bind(); - varray.apply(); - glPushMatrix(); -} - -void Font::draw_glyph(unsigned code) const -{ - GlyphMap::const_iterator i=glyphs.find(code); + GlyphMap::const_iterator i = glyphs.find(code); if(i==glyphs.end()) - return; + return 0; - glDrawArrays(GL_QUADS, i->second.index*4, 4); + float advance = i->second.advance; - glTranslatef(i->second.advance, 0, 0); -} - -float Font::get_glyph_advance(unsigned code) const -{ - GlyphMap::const_iterator i=glyphs.find(code); - if(i==glyphs.end()) - return 0; + if(next) + { + KerningMap::const_iterator j = kerning.find(KerningKey(code, next)); + if(j!=kerning.end()) + advance += j->second; + } - return i->second.advance; + return advance; } Font::Loader::Loader(Font &f): - font(f) + DataFile::CollectionObjectLoader(f, 0) { - add("default_size", &Font::default_size); - add("ascent", &Font::ascent); - add("descent", &Font::descent); - add("texture", &Loader::texture); - add("glyph", &Loader::glyph); + init(); } -Font::Loader::~Loader() +Font::Loader::Loader(Font &f, Collection &c): + DataFile::CollectionObjectLoader(f, &c) { - font.create_glyph_vertices(); + init(); } -void Font::Loader::texture(const string &t) +void Font::Loader::init() { - Texture2D *tex=new Texture2D; - tex->parameter(GL_GENERATE_MIPMAP, 1); - font.tex=tex; - tex->image(t); - font.own_tex=true; + 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; +} -Font::Glyph::Loader::Loader(Glyph &g): - glyph(g) +void Font::Loader::texture() { - add("texcoords", &Loader::texcoords); - add("size", &Loader::size); - add("offset", &Loader::offset); - add("advance", &Glyph::advance); + RefPtr tex = new Texture2D; + load_sub(*tex); + obj.texture = tex; } -void Font::Glyph::Loader::texcoords(float x1, float y1, float x2, float y2) +void Font::Loader::texture_ref(const string &name) { - glyph.x1=x1; - glyph.y1=y1; - glyph.x2=x2; - glyph.y2=y2; + obj.texture = &get_collection().get(name); + obj.texture.keep(); } -void Font::Glyph::Loader::size(float w, float h) + +Font::Glyph::Loader::Loader(Glyph &g): + DataFile::ObjectLoader(g) { - glyph.w=w; - glyph.h=h; + add("texcoords", &Loader::texcoords); + add("size", &Glyph::w, &Glyph::h); + add("offset", &Glyph::off_x, &Glyph::off_y); + add("advance", &Glyph::advance); } -void Font::Glyph::Loader::offset(float x, float y) +void Font::Glyph::Loader::texcoords(float x1_, float y1_, float x2_, float y2_) { - glyph.off_x=x; - glyph.off_y=y; + obj.x1 = x1_; + obj.y1 = y1_; + obj.x2 = x2_; + obj.y2 = y2_; } } // namespace GL