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

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 151e316c..e7f85e3f 100644
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -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,12 @@ 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.
 */
-class ObjectInstance
+class ObjectInstance: public Renderable
 {
 protected:
 	const Object &object;
@@ -32,19 +31,19 @@ public:
 	ObjectInstance(const Object &);
 
 	const Object &get_object() const { return object; }
+	virtual long get_instance_key() const { return reinterpret_cast<long>(&object); }
 
-	void render() const;
-	void render(const std::string &) const;
+	virtual void render(const Tag &tag = Tag()) const;
+	virtual void render(Renderer &, const Tag & = Tag()) const;
 
-	/**
-	Hook function, called from Object just before rendering the mesh.
-	*/
-	virtual void setup_render(const ObjectPass &) const { }
+	/** Hook function, called from Object just before rendering the mesh.
+	Renderer state will have been pushed before this is called. */
+	virtual void setup_render(Renderer &, const Tag &) const { }
 
-	/**
-	Hook function, called from Object right after rendering the mesh.
-	*/
-	virtual void finish_render(const ObjectPass &) const { }
+	/** Hook function, called from Object right after rendering the mesh.  Since
+	Object takes care of pushing Renderer state, this rarely needs to do
+	anything. */
+	virtual void finish_render(Renderer &, const Tag &) const { }
 
 	virtual unsigned get_level_of_detail() const { return 0; }
 };