X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.h;h=bf4a05249436f5453ec678a274431958597a61fb;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hp=fff1e4cf281d770adf207fada79e156ca016b6e6;hpb=e759062876ee7fc81d1c2f40818d5bf97898d53d;p=libs%2Fgl.git

diff --git a/source/object.h b/source/object.h
index fff1e4cf..bf4a0524 100644
--- a/source/object.h
+++ b/source/object.h
@@ -9,7 +9,6 @@ Distributed under the LGPL
 #define MSP_GL_OBJECT_H_
 
 #include <vector>
-#include <msp/datafile/collection.h>
 #include "objectpass.h"
 #include "renderable.h"
 
@@ -41,20 +40,11 @@ private:
 	const Material *material;
 
 public:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::CollectionObjectLoader<Object>
 	{
-	public:
-		typedef DataFile::Collection Collection;
-
-	protected:
-		Object &obj;
-		Collection &coll;
-	
 	public:
 		Loader(Object &, Collection &);
 
-		Object &get_object() const { return obj; }
-		Collection &get_collection() const { return coll; }
 	private:
 		virtual void finish();
 		void lod_mesh(unsigned, const std::string &);