X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.cpp;h=54631926e4e1b3ae22da55afff111450fc9719e0;hp=1639f4a3726bbe853a8b324c65c3d3296f82626b;hb=3d8438922e24b787587d0c8f1883c5567a4af573;hpb=ae9abd6be3e556d0a202cc5ab05668da715382c9

diff --git a/source/font.cpp b/source/font.cpp
index 1639f4a3..54631926 100644
--- 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
@@ -64,7 +66,7 @@ float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
 
 void Font::draw_string(const string &str, StringCodec::Decoder &dec, const Color &color) const
 {
-	Bind bind_tex(get_texture(), true);
+	BindRestore bind_tex(get_texture());
 	Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
 	imm.color(color);
 	build_string(str, dec, imm);
@@ -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)