X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobjectinstance.h;h=0ebef2fedf30012e8db4d8bf3b228693b3d1ecfc;hp=906ba2f32785093237c8dbf108e500a655fe3454;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=d297f58d7de73cb92890540ece9ece5f953ebd8c

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 906ba2f3..0ebef2fe 100644
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -18,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;
 
@@ -25,11 +35,10 @@ 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.
@@ -41,7 +50,7 @@ public:
 	anything. */
 	virtual void finish_render(Renderer &, const Tag &) const { }
 
-	virtual unsigned get_level_of_detail(const Renderer &) const { return 0; }
+	virtual unsigned get_level_of_detail(const Renderer &) const;
 };
 
 } // namespace GL