X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectinstance.h;h=61ad55d33ef722400780db5540b63f410eb4133b;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hp=151e316c9e2e91faaff22fa31337f9bc9fa3d1ea;hpb=a361efc05fcad11b2918f3cd7abdebe794b131d8;p=libs%2Fgl.git

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 151e316c..61ad55d3 100644
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -9,6 +9,7 @@ Distributed under the LGPL
 #define MSP_GL_OBJETCINSTANCE_H_
 
 #include <string>
+#include "renderable.h"
 
 namespace Msp {
 namespace GL {
@@ -16,14 +17,15 @@ 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
+class ObjectInstance: public Renderable
 {
 protected:
 	const Object &object;
@@ -33,18 +35,17 @@ public:
 
 	const Object &get_object() const { return object; }
 
-	void render() const;
-	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; }
 };