X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.cpp;h=7d9b306b87486f5590e6acd3f1d75600c707902b;hb=d1800d7ea80290f4913d0203241cef1409656522;hp=2cab462c04e9eaef76b27066d327cebb15a93396;hpb=48420e9e3f950cfe1e3ced8f8ea92d89671ae8c4;p=libs%2Fgl.git diff --git a/source/font.cpp b/source/font.cpp index 2cab462c..7d9b306b 100644 --- a/source/font.cpp +++ b/source/font.cpp @@ -1,5 +1,13 @@ -#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 "primitivetype.h" #include "texture2d.h" using namespace std; @@ -9,19 +17,11 @@ namespace GL { Font::Font(): tex(0), - 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) { tex=&t; @@ -40,21 +40,7 @@ void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, floa 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 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 @@ -67,67 +53,40 @@ float Font::get_string_width(const string &str, Codecs::Decoder &dec) const 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(); + tex->bind(); + VertexArray va((TEXCOORD2, VERTEX2)); + va.reserve(str.size()*4); + RefPtr vab=va.modify(); + float x=0; + unsigned count=0; for(string::const_iterator i=str.begin(); i!=str.end();) - draw_glyph(dec.decode_char(str, i)); - - glPopMatrix(); -} - -void Font::create_glyph_vertices() -{ - varray.clear(); - RefPtr va_builder=varray.modify(); - - 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); - } -} - -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); -} + GlyphMap::const_iterator j=glyphs.find(dec.decode_char(str, i)); + if(j==glyphs.end()) + continue; -void Font::prepare_render() const -{ - tex->bind(); - varray.apply(); - glPushMatrix(); + create_glyph_vertices(j->second, *vab, x); + x+=j->second.advance; + count+=4; + } + vab=0; + va.apply(); + glDrawArrays(QUADS, 0, count); } -void Font::draw_glyph(unsigned code) const +void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, float x) 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 @@ -141,27 +100,33 @@ float Font::get_glyph_advance(unsigned code) const Font::Loader::Loader(Font &f): - font(f) + font(f), + coll(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 &f, Collection &c): + font(f), + coll(&c) +{ + init(); } -Font::Loader::~Loader() +DataFile::Collection &Font::Loader::get_collection() { - font.create_glyph_vertices(); + if(!coll) + throw InvalidState("No collection"); + return *coll; } -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) @@ -177,8 +142,8 @@ 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 +155,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