X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.cpp;h=44e3d241154b0e4acd8ccdd8e747091ea776f9ef;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hp=a19a94e5d13b22670e13c361689669b3d5b71db4;hpb=80aac2618536baaa99b92629be6931363c49c4de;p=libs%2Fgl.git diff --git a/source/font.cpp b/source/font.cpp index a19a94e5..44e3d241 100644 --- a/source/font.cpp +++ b/source/font.cpp @@ -5,8 +5,11 @@ Copyright © 2007 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ -#include +#include +#include "gl.h" #include "font.h" +#include "immediate.h" +#include "primitivetype.h" #include "texture2d.h" using namespace std; @@ -16,123 +19,105 @@ namespace GL { Font::Font(): tex(0), + own_tex(false), default_size(1), ascent(1), - descent(0), - varray((TEXCOORD2, VERTEX2)) + descent(0) { } -void Font::set_texture(const Texture2D &t) +Font::~Font() { - tex=&t; + if(own_tex) + delete tex; } -void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, float w, float h, float ox, float oy, float adv) +void Font::set_texture(const Texture2D &t) { - 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(); - glyphs.insert(GlyphMap::value_type(code, glyph)); + if(own_tex) + delete tex; - RefPtr va_builder=varray.modify(); - create_glyph_vertices(glyph, *va_builder); + tex = &t; + own_tex = false; } -float Font::get_string_width(const string &str) const +const Texture2D &Font::get_texture() const { - float x=0; - - for(string::const_iterator i=str.begin(); i!=str.end(); ++i) - x+=get_glyph_advance(static_cast(*i)); + if(!tex) + throw InvalidState("No texture"); + return *tex; +} - return x; +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; + 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) const +void Font::draw_string(const string &str, Codecs::Decoder &dec) const { - prepare_render(); - - for(string::const_iterator i=str.begin(); i!=str.end(); ++i) - draw_glyph(static_cast(*i)); - - glPopMatrix(); + Immediate imm((TEXCOORD2, VERTEX2)); + draw_string(str, dec, imm); } -void Font::draw_string(const string &str, Codecs::Decoder &dec) const +void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &pbuilder) const { - prepare_render(); + if(!tex) + throw InvalidState("No texture"); - for(string::const_iterator i=str.begin(); i!=str.end();) - draw_glyph(dec.decode_char(str, i)); - - glPopMatrix(); -} + tex->bind(); -void Font::create_glyph_vertices() -{ - varray.clear(); - RefPtr va_builder=varray.modify(); + float x = 0; + unsigned count = 0; - unsigned n=0; - for(GlyphMap::iterator i=glyphs.begin(); i!=glyphs.end(); ++i, ++n) + pbuilder.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); + create_glyph_vertices(j->second, pbuilder, x); + x += j->second.advance; + count += 4; + } + pbuilder.end(); } -void Font::prepare_render() const +void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, float x) const { - tex->bind(); - varray.apply(); - glPushMatrix(); -} - -void Font::draw_glyph(unsigned code) 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); + 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); } 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; @@ -141,51 +126,46 @@ 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; -} - -Font::Loader::~Loader() -{ - font.create_glyph_vertices(); -} - 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); } 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() +{ + RefPtr tex = new Texture2D; + load_sub(*tex); + obj.tex = tex.release(); + obj.own_tex = true; } Font::Glyph::Loader::Loader(Glyph &g): - glyph(g) + DataFile::ObjectLoader(g) { add("texcoords", &Loader::texcoords); add("size", &Glyph::w, &Glyph::h); @@ -195,10 +175,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