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

diff --git a/source/render/text.h b/source/render/text.h
index 40c9b850..cbcef957 100644
--- a/source/render/text.h
+++ b/source/render/text.h
@@ -41,13 +41,14 @@ private:
 	float width;
 
 public:
-	Text(const Font &, const Technique * = 0);
+	Text(const Font &, const Technique * = 0, const std::string & = std::string());
 
 	const Mesh *get_mesh() const { return &mesh; }
 
-	/** Sets technique to render with.  It should have a texture slot named
-	"diffuse_map", which will be replaced with the font's texture. */
-	void set_technique(const Technique *);
+	/** 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());
 
 	const Technique *get_technique() const { return object.get_technique(); }