X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobjectinstance.h;h=5911dae57fb6f173210ea18936a8e353c11c9f54;hp=955ad1ddd7f0d9ac2f9ee2508c8bad3bdd49d88b;hb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;hpb=85e83ace47e5a9a8ae7263886255dd81afc69278

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 955ad1dd..5911dae5 100644
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -1,13 +1,9 @@
-/* $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_
 
+#include <string>
+#include "renderable.h"
+
 namespace Msp {
 namespace GL {
 
@@ -19,26 +15,30 @@ 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;
 
 public:
 	ObjectInstance(const Object &);
-	void render() const;
 
-	/**
-	Hook function, called from Object just before rendering the mesh.
-	*/
-	virtual void setup_render() const { }
+	const Object &get_object() const { return object; }
+	virtual long get_instance_key() const { return reinterpret_cast<long>(&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.
+	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 { }
+	/** 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_detail_level() const { return 0; }
+	virtual unsigned get_level_of_detail() const { return 0; }
 };
 
 } // namespace GL