X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.h;h=278fc4dc0ee8ba7da8ce27fcd392d5c4bf0c2b46;hb=a4b9ae04a0a89bb2cf3ab4235d7376d3ff70af7b;hp=a04e74585e56c9fbfc9088b27bc9eb4f1ff96c81;hpb=6f39983060a27634c012f66c82fea0d09fea9774;p=libs%2Fgl.git

diff --git a/source/materials/material.h b/source/materials/material.h
index a04e7458..278fc4dc 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"
@@ -62,31 +62,32 @@ public:
 	{
 	private:
 		template<typename T>
-		struct AddType
+		struct CreateMaterial
 		{
-			static void add(GenericLoader &ldr, const std::string &kw) { ldr.add(kw, &GenericLoader::typed_material<T>); }
+			void operator()(const std::string &, GenericLoader &) const;
 		};
 
 		DataFile::Collection *coll;
-		RefPtr<Material> material;
+		Material *material;
+		Loader *mat_loader;
 
 		static ActionMap shared_actions;
 
 	public:
 		GenericLoader(DataFile::Collection * = 0);
+		~GenericLoader();
 
-		Material *get_material() { return material.release(); }
+		Material *get_material() { Material *m = material; material = 0; return m; }
 	private:
 		virtual void init_actions();
 
-		template<typename T>
-		void typed_material();
+		void type(const DataFile::Symbol &);
 
 		friend class Material;
 	};
 
 private:
-	typedef DataFile::LoadableTypeRegistry<GenericLoader, GenericLoader::AddType> MaterialRegistry;
+	typedef TypeRegistry<GenericLoader::CreateMaterial, GenericLoader &> MaterialRegistry;
 
 protected:
 	const Sampler *sampler;
@@ -194,16 +195,18 @@ void Material::PropertyLoader<C>::property_texture(void (C::*set_texture)(const
 
 
 template<typename T>
-void Material::GenericLoader::typed_material()
+void Material::GenericLoader::CreateMaterial<T>::operator()(const std::string &, GenericLoader &ldr) const
 {
-	if(material)
-		throw std::logic_error("Material was already loaded");
-	RefPtr<T> mat = new T;
-	if(coll)
-		load_sub(*mat, *coll);
+	if(ldr.material)
+		throw std::logic_error("Material type was already specified");
+
+	T *mat = new T;
+	ldr.material = mat;
+	if(ldr.coll)
+		ldr.mat_loader = new typename T::Loader(*mat, *ldr.coll);
 	else
-		load_sub(*mat);
-	material = mat;
+		ldr.mat_loader = new typename T::Loader(*mat);
+	ldr.add_auxiliary_loader(*ldr.mat_loader);
 }
 
 } // namespace GL