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

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 3dc5da6a..1ad221c7 100644
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -2,24 +2,32 @@
 #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.  A derived class can overload the
-hook functions to specify a model matrix 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
 {
+public:
+	class Loader: public DataFile::ObjectLoader<ObjectInstance>
+	{
+	public:
+		Loader(ObjectInstance &);
+
+	private:
+		void transform();
+	};
+
 protected:
 	const Object &object;
 
@@ -27,21 +35,23 @@ public:
 	ObjectInstance(const Object &);
 
 	const Object &get_object() const { return object; }
-	virtual long get_instance_key() const { return reinterpret_cast<long>(&object); }
+	virtual IntPtr get_instance_key() const { return reinterpret_cast<IntPtr>(&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;
 
 	/** 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 { }
+	virtual void setup_render(Renderer &, 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; }
+	virtual unsigned get_level_of_detail(const Renderer &) const;
 };
 
 } // namespace GL