X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobjectinstance.h;h=d665851fbb5d40fb0201d17c255ea8667572a04c;hp=61ad55d33ef722400780db5540b63f410eb4133b;hb=25c81b4953dd38993250321b9407ce8b0139cbeb;hpb=d51a234320449909eb34c802faa1f0c516ef70a0

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 61ad55d3..d665851f 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
 */
 
@@ -21,9 +21,6 @@ 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.
-
-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
 {
@@ -36,16 +33,16 @@ public:
 	const Object &get_object() const { return object; }
 
 	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; }
 };