Distributed under the LGPL
*/
-#include <GL/gl.h>
+#include "gl.h"
#include "font.h"
+#include "primitivetype.h"
#include "texture2d.h"
using namespace std;
tex(0),
default_size(1),
ascent(1),
- descent(0),
- varray((TEXCOORD2, VERTEX2))
+ descent(0)
{ }
void Font::set_texture(const Texture2D &t)
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, Codecs::Decoder &dec) const
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<VertexArrayBuilder> 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<VertexArrayBuilder> 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);
- }
-}
+ 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, *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
return *coll;
}
-Font::Loader::~Loader()
-{
- font.create_glyph_vertices();
-}
-
void Font::Loader::init()
{
add("default_size", &Font::default_size);