X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectinstance.h;h=3dc5da6a399432bafa62197b01ae0e19d7475f5f;hb=904de4f7fd994886adbd3a6c03bc1b7c14ebc562;hp=dbb8c627163562a4cc8211cf41ff8e2086ab2895;hpb=be74989b0300adecc0062f701ff987cf79d1935a;p=libs%2Fgl.git

diff --git a/source/objectinstance.h b/source/objectinstance.h
index dbb8c627..3dc5da6a 100644
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_OBJETCINSTANCE_H_
 #define MSP_GL_OBJETCINSTANCE_H_
 
@@ -18,12 +11,12 @@ class Object;
 class ProgramData;
 
 /**
-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.
+Represents a single instance of an Object.  A derived class can overload the
+hook functions to specify a model matrix 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.
+ObjectInstances can benefit from being put in an InstanceScene, which will
+render all instances of the same object consecutively.
 */
 class ObjectInstance: public Renderable
 {
@@ -34,20 +27,19 @@ public:
 	ObjectInstance(const Object &);
 
 	const Object &get_object() const { return object; }
+	virtual long get_instance_key() const { return reinterpret_cast<long>(&object); }
 
-	virtual bool has_pass(const Tag &tag) const;
-
-	virtual void render(const Tag &tag=Tag()) 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 Tag &) 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 Tag &) 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; }
 };