X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.h;h=28da58229d8bad3f7675599dc2148a6b73a21c42;hb=5172d32d67595ea0b70184fadcfcb8e023cccbc8;hp=123373ea9df84f8b46ea296ce3542e60bbb48597;hpb=a9e9bb12274c4b00eabdc00d14c61f0df18956b5;p=libs%2Fgl.git

diff --git a/source/font.h b/source/font.h
index 123373ea..28da5822 100644
--- a/source/font.h
+++ b/source/font.h
@@ -28,10 +28,12 @@ public:
 	public:
 		Loader(Font &);
 		Loader(Font &, Collection &);
+
 	private:
 		void init();
 		void glyph(unsigned);
-		void texture_inline();
+		void texture();
+		void texture_ref(const std::string &);
 	};
 
 private:
@@ -55,21 +57,20 @@ private:
 
 	typedef std::map<unsigned, Glyph> GlyphMap;
 
-	const Texture2D *tex;
-	bool own_tex;
-	float default_size;
+	RefPtr<const Texture2D> texture;
+	float native_size;
 	float ascent;
 	float descent;
 	GlyphMap glyphs;
 
 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);
-	float get_default_size() const { return default_size; }
+	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; }
 
@@ -109,7 +110,7 @@ public:
 	{ return draw_string<Codecs::Utf8>(str, pb); }
 
 private:
-	void create_glyph_vertices(const Glyph &, VertexBuilder &, float) const;
+	void create_glyph_vertices(const Glyph &, VertexBuilder &) const;
 	float get_glyph_advance(unsigned) const;
 };