X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Ffont.h;h=adbfc82830c9d5ae69ff7f0e0cea0c893c21978e;hp=18c225c13a3dd0399f6f767b3f168a5588d76daa;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=3ac3a51c623271da815c8ee60c484445871753bf

diff --git a/source/builders/font.h b/source/builders/font.h
index 18c225c1..adbfc828 100644
--- a/source/builders/font.h
+++ b/source/builders/font.h
@@ -5,7 +5,6 @@
 #include <string>
 #include <msp/datafile/objectloader.h>
 #include <msp/stringcodec/utf8.h>
-#include "vertexarray.h"
 
 namespace Msp {
 namespace GL {
@@ -22,11 +21,9 @@ public:
 	class Loader: public DataFile::CollectionObjectLoader<Font>
 	{
 	public:
-		Loader(Font &);
 		Loader(Font &, Collection &);
 
 	private:
-		void init();
 		void glyph(unsigned);
 		void kerning(unsigned, unsigned, float);
 		void ligature(unsigned, unsigned, unsigned);
@@ -44,14 +41,16 @@ public:
 			void texcoords(float, float, float, float);
 		};
 
-		unsigned code;
-		float x1, y1;
-		float x2, y2;
-		float w, h;
-		float off_x, off_y;
-		float advance;
-
-		Glyph();
+		unsigned code = 0;
+		float x1 = 0.0f;
+		float y1 = 0.0f;
+		float x2 = 1.0f;
+		float y2 = 1.0f;
+		float w = 1.0f;
+		float h = 1.0f;
+		float off_x = 0.0f;
+		float off_y = 0.0f;
+		float advance = 1.0f;
 	};
 
 private:
@@ -60,20 +59,17 @@ private:
 	typedef std::map<CodePair, float> KerningMap;
 	typedef std::map<CodePair, unsigned> LigatureMap;
 
-	const Texture2D *texture;
-	float native_size;
-	float ascent;
-	float descent;
-	float cap_height;
-	float x_height;
+	const Texture2D *texture = 0;
+	float native_size = 1.0f;
+	float ascent = 1.0f;
+	float descent = 0.0f;
+	float cap_height = 1.0f;
+	float x_height = 0.5f;
 	GlyphMap glyphs;
 	KerningMap kerning;
 	LigatureMap ligatures;
 
 public:
-	Font();
-	~Font();
-
 	void set_texture(const Texture2D &);
 	const Texture2D &get_texture() const;