X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.h;h=a6873aacac6ed7921e035189d095d68aa37940bb;hb=a6463a575c64115dc1ab80ec9b350622778a8f9b;hp=14320b8fed58ff1b9d3fefe01c82c474c631f505;hpb=b0685fabd8e98a54b396f9b014573f2085743b09;p=libs%2Fgl.git

diff --git a/source/font.h b/source/font.h
index 14320b8f..a6873aac 100644
--- a/source/font.h
+++ b/source/font.h
@@ -63,7 +63,6 @@ public:
 	const Texture2D &get_texture() const;
 	void add_glyph(unsigned, float, float, float, float, float, float, float, float, float);
 	float get_native_size() const { return native_size; }
-	float get_default_size() const { return native_size; }  // Deprecated
 	float get_ascent() const { return ascent; }
 	float get_descent() const { return descent; }
 
@@ -79,28 +78,34 @@ public:
 	float get_string_width(const std::string &str) const
 	{ return get_string_width<StringCodec::Utf8>(str); }
 
-	void draw_string(const std::string &, StringCodec::Decoder &) const;
-	void draw_string(const std::string &, StringCodec::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<StringCodec::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<StringCodec::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;