Change some class names

[libs/gl.git] / source / font.cpp

diff --git a/source/font.cpp b/source/font.cpp
index 1005609eb16a8ed1a08377c276a7c152c61d22a0..54631926e4e1b3ae22da55afff111450fc9719e0 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -15,7 +15,9 @@ namespace GL {
 Font::Font():
        native_size(1),
        ascent(1),
-       descent(0)
+       descent(0),
+       cap_height(1),
+       x_height(0.5)
 { }
 
 // Avoid synthesizing ~RefPtr in files including font.h
@@ -74,7 +76,6 @@ void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveB
 {
        MatrixStack::Push push_mtx(bld.matrix());
 
-       bld.begin(QUADS);
        unsigned prev = 0;
        for(string::const_iterator i=str.begin(); i!=str.end();)
        {
@@ -86,22 +87,23 @@ void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveB
                if(prev)
                        bld.matrix() *= Matrix::translation(get_glyph_advance(prev, c), 0, 0);
 
-               create_glyph_vertices(j->second, bld);
+               create_glyph_quad(j->second, bld);
                prev = c;
        }
-       bld.end();
 }
 
-void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &bld) const
+void Font::create_glyph_quad(const Glyph &glyph, PrimitiveBuilder &bld) const
 {
+       bld.begin(TRIANGLE_STRIP);
+       bld.texcoord(glyph.x1, glyph.y2);
+       bld.vertex(glyph.off_x, glyph.off_y+glyph.h);
        bld.texcoord(glyph.x1, glyph.y1);
        bld.vertex(glyph.off_x, glyph.off_y);
-       bld.texcoord(glyph.x2, glyph.y1);
-       bld.vertex(glyph.off_x+glyph.w, glyph.off_y);
        bld.texcoord(glyph.x2, glyph.y2);
        bld.vertex(glyph.off_x+glyph.w, glyph.off_y+glyph.h);
-       bld.texcoord(glyph.x1, glyph.y2);
-       bld.vertex(glyph.off_x, glyph.off_y+glyph.h);
+       bld.texcoord(glyph.x2, glyph.y1);
+       bld.vertex(glyph.off_x+glyph.w, glyph.off_y);
+       bld.end();
 }
 
 float Font::get_glyph_advance(unsigned code, unsigned next) const
@@ -139,11 +141,13 @@ void Font::Loader::init()
 {
        add("native_size", &Font::native_size);
        add("ascent",      &Font::ascent);
+       add("cap_height",  &Font::cap_height);
        add("descent",     &Font::descent);
        add("texture",     &Loader::texture);
        add("texture",     &Loader::texture_ref);
        add("glyph",       &Loader::glyph);
        add("kerning",     &Loader::kerning);
+       add("x_height",    &Font::x_height);
 }
 
 void Font::Loader::glyph(unsigned c)