X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.cpp;h=c96ec7507aeee520962acf37fcdb2c4a997f4a17;hb=ab83db6f1e31d44ced585119a57fd10896e469cb;hp=ae407d1d3224dd8144a5d06e99a87c4d2b50a8b9;hpb=aceaa08be594ac708efcd0b68e5d08547cbcbbe1;p=libs%2Fgl.git

diff --git a/source/font.cpp b/source/font.cpp
index ae407d1d..c96ec750 100644
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/datafile/collection.h>
 #include "bindable.h"
 #include "gl.h"
@@ -33,7 +26,7 @@ void Font::set_texture(const Texture2D &t)
 const Texture2D &Font::get_texture() const
 {
 	if(!texture)
-		throw InvalidState("No texture");
+		throw logic_error("No texture");
 	return *texture;
 }
 
@@ -53,7 +46,7 @@ void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, floa
 	glyphs.insert(GlyphMap::value_type(code, glyph));
 }
 
-float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
+float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
 {
 	float x = 0;
 
@@ -63,43 +56,40 @@ float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
 	return x;
 }
 
-void Font::draw_string(const string &str, Codecs::Decoder &dec) const
+void Font::draw_string(const string &str, StringCodec::Decoder &dec) const
 {
 	Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
 	draw_string(str, dec, imm);
 }
 
-void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &pbuilder) const
+void Font::draw_string(const string &str, StringCodec::Decoder &dec, PrimitiveBuilder &bld) const
 {
+	MatrixStack::Push push_mtx(bld.matrix());
 	Bind bind_tex(get_texture(), true);
 
-	float x = 0;
-	unsigned count = 0;
-
-	pbuilder.begin(QUADS);
+	bld.begin(QUADS);
 	for(string::const_iterator i=str.begin(); i!=str.end();)
 	{
 		GlyphMap::const_iterator j = glyphs.find(dec.decode_char(str, i));
 		if(j==glyphs.end())
 			continue;
 
-		create_glyph_vertices(j->second, pbuilder, x);
-		x += j->second.advance;
-		count += 4;
+		create_glyph_vertices(j->second, bld);
+		bld.matrix() *= Matrix::translation(j->second.advance, 0, 0);
 	}
-	pbuilder.end();
+	bld.end();
 }
 
-void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, float x) const
+void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &bld) const
 {
-	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);
+	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);
 }
 
 float Font::get_glyph_advance(unsigned code) const
@@ -155,7 +145,7 @@ void Font::Loader::texture()
 
 void Font::Loader::texture_ref(const string &name)
 {
-	obj.texture = get_collection().get<Texture2D>(name);
+	obj.texture = &get_collection().get<Texture2D>(name);
 	obj.texture.keep();
 }