X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.h;h=2f8f38ab7ce183c40492b3d75f2b11c2904939a6;hp=a04e74585e56c9fbfc9088b27bc9eb4f1ff96c81;hb=da85eb77172dbd62f764a63b45c79fc059af563b;hpb=c3ebbcb56c1ca9bb3022a7f49aab1da5e09150ba

diff --git a/source/materials/material.h b/source/materials/material.h
index a04e7458..2f8f38ab 100644
--- a/source/materials/material.h
+++ b/source/materials/material.h
@@ -1,8 +1,8 @@
 #ifndef MSP_GL_MATERIAL_H_
 #define MSP_GL_MATERIAL_H_
 
+#include <msp/core/typeregistry.h>
 #include <msp/datafile/collection.h>
-#include <msp/datafile/loadabletyperegistry.h>
 #include <msp/datafile/objectloader.h>
 #include "color.h"
 #include "programdata.h"
@@ -64,7 +64,7 @@ public:
 		template<typename T>
 		struct AddType
 		{
-			static void add(GenericLoader &ldr, const std::string &kw) { ldr.add(kw, &GenericLoader::typed_material<T>); }
+			void operator()(const std::string &kw, GenericLoader &ldr) const { ldr.add(kw, &GenericLoader::typed_material<T>); }
 		};
 
 		DataFile::Collection *coll;
@@ -86,7 +86,7 @@ public:
 	};
 
 private:
-	typedef DataFile::LoadableTypeRegistry<GenericLoader, GenericLoader::AddType> MaterialRegistry;
+	typedef TypeRegistry<GenericLoader::AddType, GenericLoader &> MaterialRegistry;
 
 protected:
 	const Sampler *sampler;