X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.h;h=dd40ec0b277f2deb9e835e26b5fda9c1f9ddab96;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hp=3178a4c2717ed2f64d6d4e2c72bb413b84056a60;hpb=80aac2618536baaa99b92629be6931363c49c4de;p=libs%2Fgl.git

diff --git a/source/font.h b/source/font.h
index 3178a4c2..dd40ec0b 100644
--- a/source/font.h
+++ b/source/font.h
@@ -10,51 +10,43 @@ Distributed under the LGPL
 
 #include <map>
 #include <string>
-#include <msp/datafile/collection.h>
-#include <msp/strings/codec.h>
+#include <msp/datafile/objectloader.h>
+#include <msp/strings/utf8.h>
 #include "vertexarray.h"
 
 namespace Msp {
 namespace GL {
 
+class PrimitiveBuilder;
 class Texture2D;
 
 class Font
 {
 public:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::CollectionObjectLoader<Font>
 	{
-	private:
-		Font &font;
-		DataFile::Collection *coll;
-
 	public:
-		typedef DataFile::Collection Collection;
-
 		Loader(Font &);
-		Loader(Font &, DataFile::Collection &);
-		~Loader();
-		Font &get_object() { return font; }
-		DataFile::Collection &get_collection();
+		Loader(Font &, Collection &);
 	private:
 		void init();
-		void texture(const std::string &);
 		void glyph(unsigned);
+		void texture_inline();
 	};
 
 	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_ascent() const { return ascent; }
 	float get_descent() const { return descent; }
-	float get_string_width(const std::string &) const;
 	float get_string_width(const std::string &, Codecs::Decoder &) const;
 	void  draw_glyph(unsigned);
-	void  draw_string(const std::string &) const;
 	void  draw_string(const std::string &, Codecs::Decoder &) const;
-	void  draw_multiline(const std::string &) const;
+	void  draw_string(const std::string &, Codecs::Decoder &, PrimitiveBuilder &) const;
 
 	template<class C>
 	float get_string_width(const std::string &str) const
@@ -63,23 +55,37 @@ public:
 		return get_string_width(str, dec);
 	}
 
+	float get_string_width(const std::string &str) const
+	{ return get_string_width<Codecs::Utf8>(str); }
+
 	template<class C>
 	void draw_string(const std::string &str) const
 	{
 		typename C::Decoder dec;
 		draw_string(str, dec);
 	}
+
+	void draw_string(const std::string &str) const
+	{ draw_string<Codecs::Utf8>(str); }
+
+	template<class C>
+	void draw_string(const std::string &str, PrimitiveBuilder &pb) const
+	{
+		typename C::Decoder dec;
+		draw_string(str, dec, pb);
+	}
+
+	void draw_string(const std::string &str, PrimitiveBuilder &pb) const
+	{ return draw_string<Codecs::Utf8>(str, pb); }
+
 private:
 	struct Glyph
 	{
-		class Loader: public Msp::DataFile::Loader
+		class Loader: public Msp::DataFile::ObjectLoader<Glyph>
 		{
 		public:
 			Loader(Glyph &);
-			Glyph &get_object() { return glyph; }
 		private:
-			Glyph &glyph;
-
 			void texcoords(float, float, float, float);
 		};
 
@@ -89,21 +95,17 @@ private:
 		float w,h;
 		float off_x, off_y;
 		float advance;
-		unsigned index;
 	};
 	typedef std::map<unsigned, Glyph> GlyphMap;
 
 	const Texture2D *tex;
+	bool     own_tex;
 	float    default_size;
 	float    ascent;
 	float    descent;
 	GlyphMap glyphs;
-	VertexArray varray;
 
-	void create_glyph_vertices();
-	void create_glyph_vertices(const Glyph &, VertexArrayBuilder &);
-	void prepare_render() const;
-	void draw_glyph(unsigned) const;
+	void create_glyph_vertices(const Glyph &, VertexBuilder &, float) const;
 	float get_glyph_advance(unsigned) const;
 };