X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.cpp;h=323152dc74b220c6730e024cef11f9ce59637f50;hp=f82b45d8ac81fe7bb3ac30b7f70be453b2a720b7;hb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;hpb=652cb91c2b6008c4407c16054085f20bf5888c4d diff --git a/source/font.cpp b/source/font.cpp index f82b45d8..323152dc 100644 --- a/source/font.cpp +++ b/source/font.cpp @@ -1,10 +1,5 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - +#include +#include "bindable.h" #include "gl.h" #include "font.h" #include "immediate.h" @@ -17,106 +12,89 @@ namespace Msp { namespace GL { Font::Font(): - tex(0), - own_tex(false), - default_size(1), + native_size(1), ascent(1), descent(0) { } -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) + if(!texture) throw InvalidState("No texture"); - return *tex; + 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) { 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.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)); } float Font::get_string_width(const string &str, Codecs::Decoder &dec) const { - float x=0; + float x = 0; for(string::const_iterator i=str.begin(); i!=str.end();) - x+=get_glyph_advance(dec.decode_char(str, i)); + x += get_glyph_advance(dec.decode_char(str, i)); return x; } void Font::draw_string(const string &str, Codecs::Decoder &dec) const { - Immediate imm((TEXCOORD2, VERTEX2)); + Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2)); draw_string(str, dec, imm); } -void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &pbuilder) const +void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &bld) const { - if(!tex) - throw InvalidState("No texture"); - - tex->bind(); + MatrixStack::Push push_mtx(bld.matrix()); + Bind bind_tex(get_texture(), true); - float x=0; - unsigned count=0; - - pbuilder.begin(QUADS); + bld.begin(QUADS); for(string::const_iterator i=str.begin(); i!=str.end();) { - GlyphMap::const_iterator j=glyphs.find(dec.decode_char(str, i)); + GlyphMap::const_iterator j = glyphs.find(dec.decode_char(str, i)); if(j==glyphs.end()) continue; - create_glyph_vertices(j->second, pbuilder, x); - x+=j->second.advance; - count+=4; + create_glyph_vertices(j->second, bld); + bld.matrix() *= Matrix::translation(j->second.advance, 0, 0); } - pbuilder.end(); + bld.end(); } -void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, float x) const +void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &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.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); } float Font::get_glyph_advance(unsigned code) const { - GlyphMap::const_iterator i=glyphs.find(code); + GlyphMap::const_iterator i = glyphs.find(code); if(i==glyphs.end()) return 0; @@ -125,55 +103,55 @@ float Font::get_glyph_advance(unsigned code) const 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("texture_inline", &Loader::texture_inline); - add("glyph", &Loader::glyph); + add("native_size", &Font::native_size); + add("ascent", &Font::ascent); + 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); } 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::texture_inline() +void Font::Loader::texture() { - RefPtr tex=new Texture2D; + RefPtr tex = new Texture2D; load_sub(*tex); - font.tex=tex.release(); - font.own_tex=true; + 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); @@ -183,10 +161,10 @@ Font::Glyph::Loader::Loader(Glyph &g): 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