X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.h;h=fea97a11feb026688d56028e8804b4539677b311;hb=1bad86b461abd4fe2a1cb1c6c5685adf5db13935;hp=21c202d795ef04a5fd4ec08957dddf44e0c9b0f3;hpb=a64e2e362cd7bce6f103f8878d69fcca4261bac9;p=libs%2Fgl.git

diff --git a/source/font.h b/source/font.h
index 21c202d7..fea97a11 100644
--- a/source/font.h
+++ b/source/font.h
@@ -25,11 +25,11 @@ public:
 	private:
 		void init();
 		void glyph(unsigned);
+		void kerning(unsigned, unsigned, float);
 		void texture();
 		void texture_ref(const std::string &);
 	};
 
-private:
 	struct Glyph
 	{
 		class Loader: public Msp::DataFile::ObjectLoader<Glyph>
@@ -41,29 +41,34 @@ private:
 		};
 
 		unsigned code;
-		float x1,y1;
-		float x2,y2;
-		float w,h;
+		float x1, y1;
+		float x2, y2;
+		float w, h;
 		float off_x, off_y;
 		float advance;
 	};
 
+private:
 	typedef std::map<unsigned, Glyph> GlyphMap;
+	typedef std::pair<unsigned, unsigned> KerningKey;
+	typedef std::map<KerningKey, float> KerningMap;
 
 	RefPtr<const Texture2D> texture;
 	float native_size;
 	float ascent;
 	float descent;
 	GlyphMap glyphs;
+	KerningMap kerning;
 
 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);
+	void add_glyph(const Glyph &);
+	void set_kerning(unsigned, unsigned, 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; }
 
@@ -110,7 +115,7 @@ public:
 
 private:
 	void create_glyph_vertices(const Glyph &, VertexBuilder &) const;
-	float get_glyph_advance(unsigned) const;
+	float get_glyph_advance(unsigned, unsigned = 0) const;
 };
 
 } // namespace GL