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

diff --git a/source/font.h b/source/font.h
index 123373ea..a6873aac 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 {
@@ -28,10 +21,12 @@ public:
 	public:
 		Loader(Font &);
 		Loader(Font &, Collection &);
+
 	private:
 		void init();
 		void glyph(unsigned);
-		void texture_inline();
+		void texture();
+		void texture_ref(const std::string &);
 	};
 
 private:
@@ -55,25 +50,23 @@ private:
 
 	typedef std::map<unsigned, Glyph> GlyphMap;
 
-	const Texture2D *tex;
-	bool own_tex;
-	float default_size;
+	RefPtr<const Texture2D> texture;
+	float native_size;
 	float ascent;
 	float descent;
 	GlyphMap glyphs;
 
 public:
 	Font();
-	~Font();
 
 	void set_texture(const Texture2D &);
 	const Texture2D &get_texture() const;
 	void add_glyph(unsigned, float, float, float, float, float, float, float, float, float);
-	float get_default_size() const { return default_size; }
+	float get_native_size() const { return native_size; }
 	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
@@ -83,33 +76,39 @@ 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 &, float) const;
+	void create_glyph_vertices(const Glyph &, VertexBuilder &) const;
 	float get_glyph_advance(unsigned) const;
 };