X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.h;h=21c202d795ef04a5fd4ec08957dddf44e0c9b0f3;hb=a64e2e362cd7bce6f103f8878d69fcca4261bac9;hp=28da58229d8bad3f7675599dc2148a6b73a21c42;hpb=8ee883aad11511b046461e29ed9f73cf551d0f24;p=libs%2Fgl.git

diff --git a/source/font.h b/source/font.h
index 28da5822..21c202d7 100644
--- a/source/font.h
+++ b/source/font.h
@@ -1,17 +1,10 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_FONT_H_
 #define MSP_GL_FONT_H_
 
 #include <map>
 #include <string>
 #include <msp/datafile/objectloader.h>
-#include <msp/strings/utf8.h>
+#include <msp/stringcodec/utf8.h>
 #include "vertexarray.h"
 
 namespace Msp {
@@ -74,7 +67,7 @@ public:
 	float get_ascent() const { return ascent; }
 	float get_descent() const { return descent; }
 
-	float get_string_width(const std::string &, Codecs::Decoder &) const;
+	float get_string_width(const std::string &, StringCodec::Decoder &) const;
 
 	template<class C>
 	float get_string_width(const std::string &str) const
@@ -84,30 +77,36 @@ public:
 	}
 
 	float get_string_width(const std::string &str) const
-	{ return get_string_width<Codecs::Utf8>(str); }
+	{ return get_string_width<StringCodec::Utf8>(str); }
 
-	void draw_string(const std::string &, Codecs::Decoder &) const;
-	void draw_string(const std::string &, Codecs::Decoder &, PrimitiveBuilder &) const;
+	/// Draws a string to the framebuffer with Immediate.
+	void draw_string(const std::string &, StringCodec::Decoder &, const Color & = Color()) const;
 
 	template<class C>
-	void draw_string(const std::string &str) const
+	void draw_string(const std::string &str, const Color &color = Color()) const
 	{
 		typename C::Decoder dec;
-		draw_string(str, dec);
+		draw_string(str, dec, color);
 	}
 
-	void draw_string(const std::string &str) const
-	{ draw_string<Codecs::Utf8>(str); }
+	void draw_string(const std::string &str, const Color &color = Color()) const
+	{ draw_string<StringCodec::Utf8>(str, color); }
+
+	/** Builds the primitives for a string.  The PrimitiveBuilder should be
+	associated with a target that has at least VERTEX2 and TEXCOORD2 components.
+	The texture is not bound, to avoid unnecessary bindings when creating
+	meshes. */
+	void build_string(const std::string &, StringCodec::Decoder &, PrimitiveBuilder &) const;
 
 	template<class C>
-	void draw_string(const std::string &str, PrimitiveBuilder &pb) const
+	void build_string(const std::string &str, PrimitiveBuilder &pb) const
 	{
 		typename C::Decoder dec;
-		draw_string(str, dec, pb);
+		build_string(str, dec, pb);
 	}
 
-	void draw_string(const std::string &str, PrimitiveBuilder &pb) const
-	{ return draw_string<Codecs::Utf8>(str, pb); }
+	void build_string(const std::string &str, PrimitiveBuilder &pb) const
+	{ return build_string<StringCodec::Utf8>(str, pb); }
 
 private:
 	void create_glyph_vertices(const Glyph &, VertexBuilder &) const;