X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobjectinstance.h;h=6577dd2a6265f6ca241d88dc2bf9337447d40afc;hp=273d348579b4b8a34e71d2ebcb33a73f9394c60b;hb=1c03d9e430782b329c684fbf9c9e10230eec1966;hpb=00d926c3fe134820139a925cfac28cd64729db93

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 273d3485..6577dd2a 100644
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -8,8 +8,6 @@
 namespace Msp {
 namespace GL {
 
-class ProgramData;
-
 /**
 Represents a single instance of an Object.  Thanks to being derived from
 Placeable in can be positioned without additional effort.  Other instance
@@ -20,6 +18,16 @@ render all instances of the same object consecutively.
 */
 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