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

diff --git a/source/font.h b/source/font.h
deleted file mode 100644
index 14320b8f..00000000
--- a/source/font.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#ifndef MSP_GL_FONT_H_
-#define MSP_GL_FONT_H_
-
-#include <map>
-#include <string>
-#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 DataFile::CollectionObjectLoader<Font>
-	{
-	public:
-		Loader(Font &);
-		Loader(Font &, Collection &);
-
-	private:
-		void init();
-		void glyph(unsigned);
-		void texture();
-		void texture_ref(const std::string &);
-	};
-
-private:
-	struct Glyph
-	{
-		class Loader: public Msp::DataFile::ObjectLoader<Glyph>
-		{
-		public:
-			Loader(Glyph &);
-		private:
-			void texcoords(float, float, float, float);
-		};
-
-		unsigned code;
-		float x1,y1;
-		float x2,y2;
-		float w,h;
-		float off_x, off_y;
-		float advance;
-	};
-
-	typedef std::map<unsigned, Glyph> GlyphMap;
-
-	RefPtr<const Texture2D> texture;
-	float native_size;
-	float ascent;
-	float descent;
-	GlyphMap glyphs;
-
-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;
-};
-
-} // namespace GL
-} // namespace Msp
-
-#endif