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

diff --git a/source/objectinstance.h b/source/objectinstance.h
index d665851f..d85d2db8 100644
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -1,28 +1,22 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_OBJETCINSTANCE_H_
 #define MSP_GL_OBJETCINSTANCE_H_
 
 #include <string>
-#include "renderable.h"
+#include "object.h"
+#include "placeable.h"
 
 namespace Msp {
 namespace GL {
 
-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.  Thanks to being derived from
+Placeable in can be positioned without additional effort.  Other instance
+parameters can be set by overriding the hook functions.
+
+ObjectInstances can benefit from being put in an InstanceScene, which will
+render all instances of the same object consecutively.
 */
-class ObjectInstance: public Renderable
+class ObjectInstance: public PlacedRenderable
 {
 protected:
 	const Object &object;
@@ -31,6 +25,9 @@ public:
 	ObjectInstance(const Object &);
 
 	const Object &get_object() const { return object; }
+	virtual long get_instance_key() const { return reinterpret_cast<long>(&object); }
+
+	virtual const Geometry::BoundingSphere<float, 3> *get_bounding_sphere() const { return object.get_bounding_sphere(); }
 
 	virtual void render(const Tag &tag = Tag()) const;
 	virtual void render(Renderer &, const Tag & = Tag()) const;
@@ -44,7 +41,7 @@ public:
 	anything. */
 	virtual void finish_render(Renderer &, const Tag &) const { }
 
-	virtual unsigned get_level_of_detail() const { return 0; }
+	virtual unsigned get_level_of_detail(const Renderer &) const { return 0; }
 };
 
 } // namespace GL