X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.cpp;h=c96ec7507aeee520962acf37fcdb2c4a997f4a17;hb=0fc02952ed449ff85f5f9e96ea2fc724c8456891;hp=31f43f7347802f6124c0388c15519cea4864444b;hpb=7adcad3b40a03000a82e32db4523761c218309b8;p=libs%2Fgl.git diff --git a/source/font.cpp b/source/font.cpp index 31f43f73..c96ec750 100644 --- a/source/font.cpp +++ b/source/font.cpp @@ -1,5 +1,9 @@ -#include +#include +#include "bindable.h" +#include "gl.h" #include "font.h" +#include "immediate.h" +#include "primitivetype.h" #include "texture2d.h" using namespace std; @@ -8,144 +12,159 @@ namespace Msp { namespace GL { Font::Font(): - tex(0), - own_tex(false) + native_size(1), + ascent(1), + descent(0) { } void Font::set_texture(const Texture2D &t) { - tex=&t; + texture = &t; + texture.keep(); } -void Font::add_glyph(wchar_t code, float x1, float y1, float x2, float y2, float w, float h, float desc, 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.descent=desc; - glyph.advance=adv; + if(!texture) + throw logic_error("No texture"); + return *texture; } -float Font::get_string_width(const string &str) const +void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, float w, float h, float ox, float oy, float adv) { - float x=0; - - for(string::const_iterator i=str.begin(); i!=str.end(); ++i) - { - GlyphMap::const_iterator j=glyphs.find((unsigned char)*i); - if(j==glyphs.end()) - continue; + 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)); +} - const Glyph &glyph=j->second; +float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const +{ + float x = 0; - x+=glyph.advance; - } + for(string::const_iterator i=str.begin(); i!=str.end();) + x += get_glyph_advance(dec.decode_char(str, i)); return x; } -void Font::draw_string(const string &str) const +void Font::draw_string(const string &str, StringCodec::Decoder &dec) const { - float x=0; - float data[16]; + Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2)); + draw_string(str, dec, imm); +} - prepare(data); +void Font::draw_string(const string &str, StringCodec::Decoder &dec, PrimitiveBuilder &bld) const +{ + MatrixStack::Push push_mtx(bld.matrix()); + Bind bind_tex(get_texture(), true); - for(string::const_iterator i=str.begin(); i!=str.end(); ++i) - draw_glyph((unsigned char)*i, data, x); + bld.begin(QUADS); + for(string::const_iterator i=str.begin(); i!=str.end();) + { + GlyphMap::const_iterator j = glyphs.find(dec.decode_char(str, i)); + if(j==glyphs.end()) + continue; - glDisableClientState(GL_TEXTURE_COORD_ARRAY); + create_glyph_vertices(j->second, bld); + bld.matrix() *= Matrix::translation(j->second.advance, 0, 0); + } + bld.end(); } -Font::~Font() +void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &bld) const { - if(own_tex) - delete tex; + 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); } -void Font::prepare(float *data) const +float Font::get_glyph_advance(unsigned code) const { - tex->bind(); - - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glEnableClientState(GL_VERTEX_ARRAY); - glTexCoordPointer(2, GL_FLOAT, 4*sizeof(float), data); - glVertexPointer(2, GL_FLOAT, 4*sizeof(float), data+2); -} - -void Font::draw_glyph(wchar_t code, float *data, float &x) const -{ - GlyphMap::const_iterator i=glyphs.find(code); + GlyphMap::const_iterator i = glyphs.find(code); if(i==glyphs.end()) - return; - - const Glyph &glyph=i->second; - - data[0]=data[12]=glyph.x1; - data[1]=data[5]=glyph.y1; - data[4]=data[8]=glyph.x2; - data[9]=data[13]=glyph.y2; + return 0; - data[2]=data[14]=x; - data[3]=data[7]=glyph.descent; - data[6]=data[10]=x+glyph.w; - data[11]=data[15]=glyph.h+glyph.descent; + return i->second.advance; +} - glDrawArrays(GL_QUADS, 0, 4); - x+=glyph.advance; +Font::Loader::Loader(Font &f): + DataFile::CollectionObjectLoader(f, 0) +{ + init(); } -Font::Loader::Loader(Font &f): - font(f) +Font::Loader::Loader(Font &f, Collection &c): + DataFile::CollectionObjectLoader(f, &c) { - add("texture", &Loader::texture); - add("glyph", &Loader::glyph); + 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("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() +{ + 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", &Loader::size); - add("descent", &Glyph::descent); + add("size", &Glyph::w, &Glyph::h); + add("offset", &Glyph::off_x, &Glyph::off_y); add("advance", &Glyph::advance); } 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; -} - -void Font::Glyph::Loader::size(float w, float h) -{ - glyph.w=w; - glyph.h=h; + obj.x1 = x1; + obj.y1 = y1; + obj.x2 = x2; + obj.y2 = y2; } } // namespace GL