X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectpass.h;h=e3cac702362191a33759ed3da535ba6e384633a4;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hp=59a1dfb47d9ae757d269a11f5fb1a213e6f9f7b0;hpb=a361efc05fcad11b2918f3cd7abdebe794b131d8;p=libs%2Fgl.git

diff --git a/source/objectpass.h b/source/objectpass.h
index 59a1dfb4..e3cac702 100644
--- a/source/objectpass.h
+++ b/source/objectpass.h
@@ -8,7 +8,7 @@ Distributed under the LGPL
 #ifndef MSP_GL_OBJECTPASS_H_
 #define MSP_GL_OBJECTPASS_H_
 
-#include <msp/datafile/collection.h>
+#include <msp/datafile/objectloader.h>
 
 namespace Msp {
 namespace GL {
@@ -18,25 +18,17 @@ class ProgramData;
 
 struct ObjectPass
 {
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::CollectionObjectLoader<ObjectPass>
 	{
-	public:
-		typedef DataFile::Collection Collection;
-
-	private:
-		ObjectPass &pass;
-		Collection &coll;
-
 	public:
 		Loader(ObjectPass &, Collection &);
-		ObjectPass &get_object() const { return pass; }
-		Collection &get_collection() const { return coll; }
 	private:
 		void shader(const std::string &);
 	};
 
 	Program *shprog;
 	ProgramData *shdata;
+	bool use_textures;
 
 	ObjectPass();
 	~ObjectPass();