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

diff --git a/source/materials/material.h b/source/materials/material.h
index 278fc4dc..77e7d44e 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/dynamicobjectloader.h>
 #include <msp/datafile/objectloader.h>
 #include "color.h"
 #include "programdata.h"
@@ -11,7 +11,7 @@
 namespace Msp {
 namespace GL {
 
-class Texturing;
+class Sampler;
 
 class Material
 {
@@ -19,7 +19,6 @@ private:
 	class Loader: public DataFile::CollectionObjectLoader<Material>
 	{
 	protected:
-		Loader(Material &);
 		Loader(Material &, Collection &);
 
 		virtual void init_actions();
@@ -42,7 +41,6 @@ protected:
 	class PropertyLoader: public DataFile::DerivedObjectLoader<Material, Loader>
 	{
 	protected:
-		PropertyLoader(C &m): DerivedObjectLoader<Material, Loader>(m) { }
 		PropertyLoader(C &m, Collection &c): DerivedObjectLoader<Material, Loader>(m, c) { }
 
 		void add_property(const std::string &, void (C::*)(float), void (C::*)(const Texture *));
@@ -58,37 +56,17 @@ protected:
 	};
 
 public:
-	class GenericLoader: public DataFile::Loader
+	class GenericLoader: public DataFile::DynamicObjectLoader<Material>
 	{
-	private:
-		template<typename T>
-		struct CreateMaterial
-		{
-			void operator()(const std::string &, GenericLoader &) const;
-		};
-
-		DataFile::Collection *coll;
-		Material *material;
-		Loader *mat_loader;
-
-		static ActionMap shared_actions;
+		friend class Material;
 
 	public:
-		GenericLoader(DataFile::Collection * = 0);
-		~GenericLoader();
+		GenericLoader(Collection &c): DynamicObjectLoader<Material>(&c) { }
 
-		Material *get_material() { Material *m = material; material = 0; return m; }
-	private:
-		virtual void init_actions();
-
-		void type(const DataFile::Symbol &);
-
-		friend class Material;
+	protected:
+		virtual const TypeRegistry &get_type_registry() const { return get_material_registry(); }
 	};
 
-private:
-	typedef TypeRegistry<GenericLoader::CreateMaterial, GenericLoader &> MaterialRegistry;
-
 protected:
 	const Sampler *sampler;
 	ProgramData shdata;
@@ -97,7 +75,7 @@ protected:
 public:
 	virtual ~Material() { }
 
-	virtual const Program *create_compatible_shader(DataFile::Collection &) const;
+	virtual const Program *create_compatible_shader(const std::map<std::string, int> & = std::map<std::string, int>()) const;
 protected:
 	virtual void fill_program_info(std::string &, std::map<std::string, int> &) const = 0;
 
@@ -105,19 +83,16 @@ public:
 	/** Returns the uniforms for the material. */
 	const ProgramData &get_shader_data() const { return shdata; }
 
-protected:
-	DEPRECATED void attach_texture_to(const Texture *, Texturing &, ProgramData &, const std::string &) const;
-public:
-	DEPRECATED virtual void attach_textures_to(Texturing &, ProgramData &) const = 0;
-
 	virtual const Tag *get_texture_tags() const = 0;
 	virtual const Texture *get_texture(Tag) const = 0;
-	const Sampler *get_sampler() const { return sampler; }
+	virtual const Sampler *get_sampler(Tag) const { return sampler; }
+
+	void set_debug_name(const std::string &);
 
 	template<typename T>
 	static void register_type(const std::string &);
 private:
-	static MaterialRegistry &get_material_registry();
+	static GenericLoader::TypeRegistry &get_material_registry();
 };
 
 template<typename T>
@@ -193,22 +168,6 @@ void Material::PropertyLoader<C>::property_texture(void (C::*set_texture)(const
 	(static_cast<C &>(obj).*set_texture)(&static_cast<Collection &>(get_collection()).get<Texture>(name));
 }
 
-
-template<typename T>
-void Material::GenericLoader::CreateMaterial<T>::operator()(const std::string &, GenericLoader &ldr) const
-{
-	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
-		ldr.mat_loader = new typename T::Loader(*mat);
-	ldr.add_auxiliary_loader(*ldr.mat_loader);
-}
-
 } // namespace GL
 } // namespace Msp