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 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;
return x;
}
-float Font::get_string_width(const wstring &str) const
+float Font::get_string_width(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);
+ for(string::const_iterator i=str.begin(); i!=str.end();)
+ x+=get_glyph_advance(dec.decode_char(str, i));
return x;
}
glPopMatrix();
}
-void Font::draw_string(const wstring &str) const
+void Font::draw_string(const string &str, Codecs::Decoder &dec) const
{
prepare_render();
- for(wstring::const_iterator i=str.begin(); i!=str.end(); ++i)
- draw_glyph(*i);
+ for(string::const_iterator i=str.begin(); i!=str.end();)
+ draw_glyph(dec.decode_char(str, i));
glPopMatrix();
}
-Font::~Font()
-{
- if(own_tex)
- delete tex;
-}
-
void Font::create_glyph_vertices()
{
varray.clear();
glPushMatrix();
}
-void Font::draw_glyph(wchar_t code) const
+void Font::draw_glyph(unsigned code) const
{
GlyphMap::const_iterator i=glyphs.find(code);
if(i==glyphs.end())
glTranslatef(i->second.advance, 0, 0);
}
-float Font::get_glyph_advance(wchar_t code) const
+float Font::get_glyph_advance(unsigned code) const
{
GlyphMap::const_iterator i=glyphs.find(code);
if(i==glyphs.end())