X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobjectinstance.h;h=6577dd2a6265f6ca241d88dc2bf9337447d40afc;hp=6a8749766f39ca08223c07d8971435c3abe1eebb;hb=b0059bd068c99dadfc922584911fcb25a21b737b;hpb=46921b54c8252bb535a3b2cb7be97eb38e66eaed

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 6a874976..6577dd2a 100644
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -3,23 +3,31 @@
 
 #include <string>
 #include "object.h"
-#include "renderable.h"
+#include "placeable.h"
 
 namespace Msp {
 namespace GL {
 
-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,7 +35,7 @@ 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(); }
 
@@ -36,7 +44,7 @@ public:
 
 	/** 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