X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.cpp;h=f82b45d8ac81fe7bb3ac30b7f70be453b2a720b7;hb=652cb91c2b6008c4407c16054085f20bf5888c4d;hp=956acb462324dddb2603442981ef476f98be6d1f;hpb=b2851c18f6361fed2203e0aced4a5d671ad28630;p=libs%2Fgl.git diff --git a/source/font.cpp b/source/font.cpp index 956acb46..f82b45d8 100644 --- a/source/font.cpp +++ b/source/font.cpp @@ -1,5 +1,14 @@ -#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 "immediate.h" +#include "primitivetype.h" #include "texture2d.h" using namespace std; @@ -12,16 +21,32 @@ Font::Font(): own_tex(false), default_size(1), ascent(1), - descent(0), - varray((TEXCOORD2, VERTEX2)) + 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; +} + +const Texture2D &Font::get_texture() const +{ + if(!tex) + throw InvalidState("No texture"); + return *tex; } -void Font::add_glyph(wchar_t code, float x1, float y1, float x2, float y2, float w, float h, float ox, float oy, 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; @@ -34,136 +59,102 @@ void Font::add_glyph(wchar_t code, float x1, float y1, float x2, float y2, float 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) - x+=get_glyph_advance(static_cast(*i)); + for(string::const_iterator i=str.begin(); i!=str.end();) + x+=get_glyph_advance(dec.decode_char(str, i)); return x; } -float Font::get_string_width(const wstring &str) const +void Font::draw_string(const string &str, Codecs::Decoder &dec) const { - float x=0; - - for(wstring::const_iterator i=str.begin(); i!=str.end(); ++i) - x+=get_glyph_advance(*i); - - return x; + Immediate imm((TEXCOORD2, VERTEX2)); + draw_string(str, dec, imm); } -void Font::draw_string(const string &str) const +void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &pbuilder) const { - prepare_render(); - - for(string::const_iterator i=str.begin(); i!=str.end(); ++i) - draw_glyph(static_cast(*i)); + if(!tex) + throw InvalidState("No texture"); - glPopMatrix(); -} + tex->bind(); -void Font::draw_string(const wstring &str) const -{ - prepare_render(); + float x=0; + unsigned count=0; - for(wstring::const_iterator i=str.begin(); i!=str.end(); ++i) - draw_glyph(*i); + pbuilder.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; - glPopMatrix(); + create_glyph_vertices(j->second, pbuilder, x); + x+=j->second.advance; + count+=4; + } + pbuilder.end(); } -Font::~Font() +void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, float x) const { - if(own_tex) - delete tex; + 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); } -void Font::create_glyph_vertices() +float Font::get_glyph_advance(unsigned code) const { - varray.clear(); - RefPtr va_builder=varray.modify(); + GlyphMap::const_iterator i=glyphs.find(code); + if(i==glyphs.end()) + return 0; - 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); - } + return i->second.advance; } -void Font::create_glyph_vertices(const Glyph &glyph, VertexArrayBuilder &va_builder) -{ - 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_render() const +Font::Loader::Loader(Font &f): + font(f), + coll(0) { - tex->bind(); - varray.apply(); - glPushMatrix(); + init(); } -void Font::draw_glyph(wchar_t code) const +Font::Loader::Loader(Font &f, Collection &c): + font(f), + coll(&c) { - GlyphMap::const_iterator i=glyphs.find(code); - if(i==glyphs.end()) - return; - - glDrawArrays(GL_QUADS, i->second.index*4, 4); - - glTranslatef(i->second.advance, 0, 0); + init(); } -float Font::get_glyph_advance(wchar_t code) const +DataFile::Collection &Font::Loader::get_collection() { - GlyphMap::const_iterator i=glyphs.find(code); - if(i==glyphs.end()) - return 0; - - return i->second.advance; + if(!coll) + throw InvalidState("No collection"); + return *coll; } - -Font::Loader::Loader(Font &f): - font(f) +void Font::Loader::init() { add("default_size", &Font::default_size); add("ascent", &Font::ascent); add("descent", &Font::descent); - add("texture", &Loader::texture); + add("texture", &Font::tex); + add("texture_inline", &Loader::texture_inline); add("glyph", &Loader::glyph); } -Font::Loader::~Loader() -{ - font.create_glyph_vertices(); -} - -void Font::Loader::texture(const string &t) -{ - Texture2D *tex=new Texture2D; - tex->parameter(GL_GENERATE_MIPMAP, 1); - font.tex=tex; - tex->image(t); - font.own_tex=true; -} - void Font::Loader::glyph(unsigned c) { Glyph gl; @@ -172,13 +163,21 @@ void Font::Loader::glyph(unsigned c) font.glyphs.insert(GlyphMap::value_type(c, gl)); } +void Font::Loader::texture_inline() +{ + RefPtr tex=new Texture2D; + load_sub(*tex); + font.tex=tex.release(); + font.own_tex=true; +} + Font::Glyph::Loader::Loader(Glyph &g): glyph(g) { add("texcoords", &Loader::texcoords); - add("size", &Loader::size); - add("offset", &Loader::offset); + add("size", &Glyph::w, &Glyph::h); + add("offset", &Glyph::off_x, &Glyph::off_y); add("advance", &Glyph::advance); } @@ -190,17 +189,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; -} - -void Font::Glyph::Loader::offset(float x, float y) -{ - glyph.off_x=x; - glyph.off_y=y; -} - } // namespace GL } // namespace Msp