X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Ftext.h;h=c007c81f8aeaee0c9813dbf66915ccdd12814400;hp=916d6d7b8d1c02e74dfa2dfca8dfd054c77e79ef;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=233dff2a6c552e08da832496aecd88ef4f8948f1

diff --git a/source/render/text.h b/source/render/text.h
index 916d6d7b..c007c81f 100644
--- a/source/render/text.h
+++ b/source/render/text.h
@@ -4,16 +4,17 @@
 #include "font.h"
 #include "mesh.h"
 #include "object.h"
-#include "technique.h"
+#include "objectinstance.h"
 
 namespace Msp {
 namespace GL {
 
 /**
-Creates an object consisting of the visual representation of a string.  Can be
-used with an ObjectInstance to further customize the appearance.
+Creates an object consisting of the visual representation of a string.  If you
+derive from Text to customize it, make sure you call Text::setup_render or
+otherwise bind the appropriate texture.
 */
-class Text: public Renderable
+class Text: public ObjectInstance
 {
 public:
 	enum HorizontalAlign
@@ -35,20 +36,20 @@ private:
 	const Font &font;
 	Mesh mesh;
 	Object object;
-	Technique technique;
-	float horz_align;
-	float vert_offset;
-	float width;
+	Tag texture_slot;
+	float horz_align = 0.0f;
+	float vert_offset = 0.0f;
+	float width = 0.0f;
 
 public:
-	Text(const Font &, const Technique * = 0, const std::string & = std::string());
+	Text(const Font &, const Technique * = 0, Tag = Tag());
 
 	const Mesh *get_mesh() const { return &mesh; }
 
 	/** Sets technique to render with, replacing the given texture slot with
 	the font texture.  If no texture slot is specified, heuristics are used to
 	choose a suitable one. */
-	void set_technique(const Technique *, const std::string & = std::string());
+	void set_technique(const Technique *, Tag = Tag());
 
 	const Technique *get_technique() const { return object.get_technique(); }
 
@@ -77,9 +78,9 @@ public:
 
 	float get_width() const { return width; }
 
-	virtual void render(Renderer &, Tag = Tag()) const;
+	virtual void setup_render(Renderer &, Tag) const;
 
-	operator const Object &() const { return object; }
+	DEPRECATED operator const Object &() const { return object; }
 };
 
 } // namespace GL