X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Ftext.h;h=0b4fa92c4ac5fe0197dbc917f19bb6453eded733;hb=f19366d32cc29287a2730cfba90893e407754081;hp=cbcef957f8be9b0293f687732e6dfec72660a00c;hpb=6dc5c41fe93ed0cb4f9051387b5551182bc5df41;p=libs%2Fgl.git

diff --git a/source/render/text.h b/source/render/text.h
index cbcef957..0b4fa92c 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;
+	Tag texture_slot;
 	float horz_align;
 	float vert_offset;
 	float width;
 
 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 &, const 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