X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectinstance.h;h=dbb8c627163562a4cc8211cf41ff8e2086ab2895;hb=e20075bffbbe1f3aaa9cc149953525a7e855f496;hp=459c2da3523b23ff84e2cd510e2cde05d0c5a154;hpb=4324df6e3d807d35e02e828320e436c509275520;p=libs%2Fgl.git

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 459c2da3..dbb8c627 100644
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -17,12 +17,13 @@ namespace GL {
 class Object;
 class ProgramData;
 
-class ObjectPass;
-
 /**
 Represents a single instance of an Object.  An application can derive another
 class from this and overload the hook functions to specify location and other
 instance-specific parameters for the rendered objects.
+
+The finish_render function generally should clean up everything done by
+setup_render, unless the rendering sequence is known to allow otherwise.
 */
 class ObjectInstance: public Renderable
 {
@@ -34,20 +35,19 @@ public:
 
 	const Object &get_object() const { return object; }
 
-	virtual bool has_pass(const std::string &) const;
+	virtual bool has_pass(const Tag &tag) const;
 
-	virtual void render() const;
-	virtual void render(const std::string &) const;
+	virtual void render(const Tag &tag=Tag()) const;
 
 	/**
 	Hook function, called from Object just before rendering the mesh.
 	*/
-	virtual void setup_render(const ObjectPass &) const { }
+	virtual void setup_render(const Tag &) const { }
 
 	/**
 	Hook function, called from Object right after rendering the mesh.
 	*/
-	virtual void finish_render(const ObjectPass &) const { }
+	virtual void finish_render(const Tag &) const { }
 
 	virtual unsigned get_level_of_detail() const { return 0; }
 };