Font::Font():
tex(0),
- own_tex(false)
+ own_tex(false),
+ default_size(1),
+ ascent(1),
+ descent(0),
+ varray((TEXCOORD2, VERTEX2))
{ }
+Font::~Font()
+{
+ if(own_tex)
+ delete tex;
+}
+
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;
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<VertexArrayBuilder> 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)
- {
- GlyphMap::const_iterator j=glyphs.find((unsigned char)*i);
- if(j==glyphs.end())
- continue;
+ x+=get_glyph_advance(static_cast<unsigned char>(*i));
- const Glyph &glyph=j->second;
+ return x;
+}
- x+=glyph.advance;
- }
+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();)
+ x+=get_glyph_advance(dec.decode_char(str, i));
return x;
}
void Font::draw_string(const string &str) const
{
- float x=0;
- float data[16];
-
- prepare(data);
+ prepare_render();
for(string::const_iterator i=str.begin(); i!=str.end(); ++i)
- draw_glyph((unsigned char)*i, data, x);
+ draw_glyph(static_cast<unsigned char>(*i));
- glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+ glPopMatrix();
}
-Font::~Font()
+void Font::draw_string(const string &str, Codecs::Decoder &dec) const
{
- if(own_tex)
- delete tex;
+ prepare_render();
+
+ for(string::const_iterator i=str.begin(); i!=str.end();)
+ draw_glyph(dec.decode_char(str, i));
+
+ glPopMatrix();
}
-void Font::prepare(float *data) const
+void Font::create_glyph_vertices()
{
- tex->bind();
+ varray.clear();
+ RefPtr<VertexArrayBuilder> va_builder=varray.modify();
- 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);
+ 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);
}
-void Font::draw_glyph(wchar_t code, float *data, float &x) const
+void Font::prepare_render() 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;
- const Glyph &glyph=i->second;
+ glDrawArrays(GL_QUADS, i->second.index*4, 4);
- data[0]=data[12]=glyph.x1;
- data[1]=data[5]=glyph.y1;
- data[4]=data[8]=glyph.x2;
- data[9]=data[13]=glyph.y2;
-
- 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)
{
+ add("default_size", &Font::default_size);
+ add("ascent", &Font::ascent);
+ add("descent", &Font::descent);
add("texture", &Loader::texture);
add("glyph", &Loader::glyph);
}
+Font::Loader::~Loader()
+{
+ font.create_glyph_vertices();
+}
+
void Font::Loader::texture(const string &t)
{
Texture2D *tex=new Texture2D;
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("offset", &Loader::offset);
add("advance", &Glyph::advance);
}
glyph.h=h;
}
+void Font::Glyph::Loader::offset(float x, float y)
+{
+ glyph.off_x=x;
+ glyph.off_y=y;
+}
+
} // namespace GL
} // namespace Msp