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

diff --git a/source/font.h b/source/font.h
index 278a14aa..f647dbbd 100644
--- a/source/font.h
+++ b/source/font.h
@@ -1,10 +1,17 @@
-#ifndef FONT_H_
-#define FONT_H_
+/* $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/loader.h>
-#include <msp/strings/codec.h>
+#include <msp/datafile/collection.h>
+#include <msp/strings/utf8.h>
 #include "vertexarray.h"
 
 namespace Msp {
@@ -15,47 +22,57 @@ class Texture2D;
 class Font
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public DataFile::Loader
 	{
+	private:
+		Font &font;
+		DataFile::Collection *coll;
+
 	public:
+		typedef DataFile::Collection Collection;
+
 		Loader(Font &);
-		~Loader();
+		Loader(Font &, DataFile::Collection &);
 		Font &get_object() { return font; }
+		DataFile::Collection &get_collection();
 	private:
-		Font &font;
-
+		void init();
 		void texture(const std::string &);
 		void glyph(unsigned);
 	};
 
 	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);
-	}	
-	
+	}
+
+	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); }
+
 private:
 	struct Glyph
 	{
@@ -68,8 +85,6 @@ private:
 			Glyph &glyph;
 
 			void texcoords(float, float, float, float);
-			void size(float, float);
-			void offset(float, float);
 		};
 
 		unsigned code;
@@ -78,22 +93,16 @@ 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;
 };