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

diff --git a/source/font.h b/source/font.h
index 278a14aa..14320b8f 100644
--- a/source/font.h
+++ b/source/font.h
@@ -1,75 +1,43 @@
-#ifndef FONT_H_
-#define FONT_H_
+#ifndef MSP_GL_FONT_H_
+#define MSP_GL_FONT_H_
 
 #include <map>
 #include <string>
-#include <msp/datafile/loader.h>
-#include <msp/strings/codec.h>
+#include <msp/datafile/objectloader.h>
+#include <msp/stringcodec/utf8.h>
 #include "vertexarray.h"
 
 namespace Msp {
 namespace GL {
 
+class PrimitiveBuilder;
 class Texture2D;
 
 class Font
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public DataFile::CollectionObjectLoader<Font>
 	{
 	public:
 		Loader(Font &);
-		~Loader();
-		Font &get_object() { return font; }
-	private:
-		Font &font;
+		Loader(Font &, Collection &);
 
-		void texture(const std::string &);
+	private:
+		void init();
 		void glyph(unsigned);
+		void texture();
+		void texture_ref(const std::string &);
 	};
 
-	Font();
-	~Font();
-
-	void  set_texture(const Texture2D &);
-	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;
-	
-	template<class C>
-	float get_string_width(const std::string &str) const
-	{
-		typename C::Decoder dec;
-		return get_string_width(str, dec);
-	}	
-	
-	template<class C>
-	void draw_string(const std::string &str) const
-	{
-		typename C::Decoder dec;
-		draw_string(str, dec);
-	}	
 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);
-			void size(float, float);
-			void offset(float, float);
 		};
 
 		unsigned code;
@@ -78,22 +46,64 @@ 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;
+	RefPtr<const Texture2D> texture;
+	float native_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;
+public:
+	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_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; }
+
+	float get_string_width(const std::string &, StringCodec::Decoder &) const;
+
+	template<class C>
+	float get_string_width(const std::string &str) const
+	{
+		typename C::Decoder dec;
+		return get_string_width(str, dec);
+	}
+
+	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;
+
+	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<StringCodec::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<StringCodec::Utf8>(str, pb); }
+
+private:
+	void create_glyph_vertices(const Glyph &, VertexBuilder &) const;
 	float get_glyph_advance(unsigned) const;
 };