X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.cpp;h=637569f205358a8a08edf846fbac8c55a480e7e1;hp=31f43f7347802f6124c0388c15519cea4864444b;hb=a4ec5410595ddf37bfbc0e85ad87d31a9cbf94f1;hpb=7adcad3b40a03000a82e32db4523761c218309b8 diff --git a/source/font.cpp b/source/font.cpp index 31f43f73..637569f2 100644 --- a/source/font.cpp +++ b/source/font.cpp @@ -1,4 +1,11 @@ -#include +/* $Id$ + +This file is part of libmspgl +Copyright © 2007 Mikko Rasa, Mikkosoft Productions +Distributed under the LGPL +*/ + +#include "gl.h" #include "font.h" #include "texture2d.h" @@ -9,7 +16,10 @@ namespace GL { Font::Font(): tex(0), - own_tex(false) + default_size(1), + ascent(1), + descent(0), + varray((TEXCOORD2, VERTEX2)) { } void Font::set_texture(const Texture2D &t) @@ -17,7 +27,7 @@ void Font::set_texture(const Texture2D &t) tex=&t; } -void Font::add_glyph(wchar_t code, float x1, float y1, float x2, float y2, float w, float h, float desc, float adv) +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; @@ -27,94 +37,125 @@ void Font::add_glyph(wchar_t code, float x1, float y1, float x2, float y2, float glyph.y2=y2; glyph.w=w; glyph.h=h; - glyph.descent=desc; + 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); } -float Font::get_string_width(const string &str) const +float Font::get_string_width(const string &str, Codecs::Decoder &dec) const { 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; - - const Glyph &glyph=j->second; - - 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, Codecs::Decoder &dec) const { - float x=0; - float data[16]; + prepare_render(); + + for(string::const_iterator i=str.begin(); i!=str.end();) + draw_glyph(dec.decode_char(str, i)); - prepare(data); + glPopMatrix(); +} - for(string::const_iterator i=str.begin(); i!=str.end(); ++i) - draw_glyph((unsigned char)*i, data, x); +void Font::create_glyph_vertices() +{ + varray.clear(); + RefPtr va_builder=varray.modify(); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); + 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); + } } -Font::~Font() +void Font::create_glyph_vertices(const Glyph &glyph, VertexArrayBuilder &va_builder) { - if(own_tex) - delete tex; + 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); } -void Font::prepare(float *data) const +void Font::prepare_render() 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); + varray.apply(); + glPushMatrix(); } -void Font::draw_glyph(wchar_t code, float *data, float &x) const +void Font::draw_glyph(unsigned code) const { GlyphMap::const_iterator i=glyphs.find(code); if(i==glyphs.end()) return; const Glyph &glyph=i->second; + (void)glyph; - data[0]=data[12]=glyph.x1; - data[1]=data[5]=glyph.y1; - data[4]=data[8]=glyph.x2; - data[9]=data[13]=glyph.y2; + glDrawArrays(GL_QUADS, i->second.index*4, 4); - 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; + glTranslatef(i->second.advance, 0, 0); +} - glDrawArrays(GL_QUADS, 0, 4); +float Font::get_glyph_advance(unsigned code) const +{ + GlyphMap::const_iterator i=glyphs.find(code); + if(i==glyphs.end()) + return 0; - x+=glyph.advance; + return i->second.advance; } + Font::Loader::Loader(Font &f): - font(f) + font(f), + coll(0) { - add("texture", &Loader::texture); - add("glyph", &Loader::glyph); + init(); +} + +Font::Loader::Loader(Font &f, Collection &c): + font(f), + coll(&c) +{ + init(); +} + +DataFile::Collection &Font::Loader::get_collection() +{ + if(!coll) + throw InvalidState("No collection"); + return *coll; +} + +Font::Loader::~Loader() +{ + font.create_glyph_vertices(); } -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("default_size", &Font::default_size); + add("ascent", &Font::ascent); + add("descent", &Font::descent); + add("texture", &Font::tex); + add("glyph", &Loader::glyph); } void Font::Loader::glyph(unsigned c) @@ -125,12 +166,13 @@ void Font::Loader::glyph(unsigned c) font.glyphs.insert(GlyphMap::value_type(c, gl)); } + Font::Glyph::Loader::Loader(Glyph &g): glyph(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); } @@ -142,11 +184,5 @@ void Font::Glyph::Loader::texcoords(float x1, float y1, float x2, float y2) glyph.y2=y2; } -void Font::Glyph::Loader::size(float w, float h) -{ - glyph.w=w; - glyph.h=h; -} - } // namespace GL } // namespace Msp