X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.cpp;h=323152dc74b220c6730e024cef11f9ce59637f50;hp=7cea86957dc16568c4119de3943a66e9c1c8e5d4;hb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;hpb=f098a871fc6dc7b61a5aca5581fa327e4124c036 diff --git a/source/font.cpp b/source/font.cpp index 7cea8695..323152dc 100644 --- a/source/font.cpp +++ b/source/font.cpp @@ -1,12 +1,9 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - -#include +#include +#include "bindable.h" +#include "gl.h" #include "font.h" +#include "immediate.h" +#include "primitivetype.h" #include "texture2d.h" using namespace std; @@ -15,131 +12,89 @@ namespace Msp { namespace GL { Font::Font(): - tex(0), - own_tex(false), - default_size(1), + native_size(1), ascent(1), - descent(0), - varray((TEXCOORD2, VERTEX2)) + descent(0) { } -Font::~Font() +void Font::set_texture(const Texture2D &t) { - if(own_tex) - delete tex; + texture = &t; + texture.keep(); } -void Font::set_texture(const Texture2D &t) +const Texture2D &Font::get_texture() const { - tex=&t; + if(!texture) + throw InvalidState("No texture"); + 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.index=glyphs.size(); + 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)); - - RefPtr va_builder=varray.modify(); - create_glyph_vertices(glyph, *va_builder); -} - -float Font::get_string_width(const string &str) const -{ - float x=0; - - for(string::const_iterator i=str.begin(); i!=str.end(); ++i) - x+=get_glyph_advance(static_cast(*i)); - - return x; } 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) const -{ - prepare_render(); - - for(string::const_iterator i=str.begin(); i!=str.end(); ++i) - draw_glyph(static_cast(*i)); - - glPopMatrix(); -} - void Font::draw_string(const string &str, Codecs::Decoder &dec) const { - prepare_render(); - - for(string::const_iterator i=str.begin(); i!=str.end();) - draw_glyph(dec.decode_char(str, i)); - - glPopMatrix(); + Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2)); + draw_string(str, dec, imm); } -void Font::create_glyph_vertices() +void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &bld) const { - varray.clear(); - RefPtr va_builder=varray.modify(); + MatrixStack::Push push_mtx(bld.matrix()); + Bind bind_tex(get_texture(), true); - unsigned n=0; - for(GlyphMap::iterator i=glyphs.begin(); i!=glyphs.end(); ++i, ++n) + bld.begin(QUADS); + for(string::const_iterator i=str.begin(); i!=str.end();) { - i->second.index=n; - create_glyph_vertices(i->second, *va_builder); - } -} + GlyphMap::const_iterator j = glyphs.find(dec.decode_char(str, i)); + if(j==glyphs.end()) + continue; -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 -{ - tex->bind(); - varray.apply(); - glPushMatrix(); + create_glyph_vertices(j->second, bld); + bld.matrix() *= Matrix::translation(j->second.advance, 0, 0); + } + bld.end(); } -void Font::draw_glyph(unsigned code) const +void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &bld) const { - 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); + 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; @@ -148,40 +103,55 @@ float Font::get_glyph_advance(unsigned code) const 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("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", &Glyph::w, &Glyph::h); @@ -191,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