X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.h;h=98baaa54ff2faf41b7975427dc4412306ac2e906;hp=571f4cb027c4da3a41e8d317e1e4c042603a2706;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266

diff --git a/source/materials/material.h b/source/materials/material.h
index 571f4cb0..98baaa54 100644
--- a/source/materials/material.h
+++ b/source/materials/material.h
@@ -2,7 +2,7 @@
 #define MSP_GL_MATERIAL_H_
 
 #include <msp/datafile/collection.h>
-#include <msp/datafile/loadabletyperegistry.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,62 +56,43 @@ protected:
 	};
 
 public:
-	class GenericLoader: public DataFile::Loader
+	class GenericLoader: public DataFile::DynamicObjectLoader<Material>
 	{
-	private:
-		template<typename T>
-		struct AddType
-		{
-			static void add(GenericLoader &ldr, const std::string &kw) { ldr.add(kw, &GenericLoader::typed_material<T>); }
-		};
-
-		DataFile::Collection *coll;
-		RefPtr<Material> material;
-
-		static ActionMap shared_actions;
+		friend class Material;
 
 	public:
-		GenericLoader(DataFile::Collection * = 0);
+		GenericLoader(Collection &c): DynamicObjectLoader<Material>(&c) { }
 
-		Material *get_material() { return material.release(); }
-	private:
-		virtual void init_actions();
-
-		template<typename T>
-		void typed_material();
-
-		friend class Material;
+	protected:
+		virtual const TypeRegistry &get_type_registry() const { return get_material_registry(); }
 	};
 
-private:
-	typedef DataFile::LoadableTypeRegistry<GenericLoader, GenericLoader::AddType> MaterialRegistry;
-
 protected:
-	const Sampler *sampler;
+	const Sampler *sampler = 0;
 	ProgramData shdata;
 
-	Material(): sampler(0) { }
+	Material() = default;
 public:
-	virtual ~Material() { }
+	virtual ~Material() = default;
 
-	virtual Program *create_compatible_shader() const;
-	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 std::string create_program_source() const = 0;
+	virtual void fill_program_info(std::string &, std::map<std::string, int> &) const = 0;
 
 public:
 	/** Returns the uniforms for the material. */
 	const ProgramData &get_shader_data() const { return shdata; }
 
-protected:
-	void attach_texture_to(const Texture *, Texturing &, ProgramData &, const std::string &) const;
-public:
-	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;
+	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>
@@ -127,7 +106,8 @@ template<typename C>
 void Material::PropertyLoader<C>::add_property(const std::string &kw, void (C::*set_value)(float), void (C::*set_texture)(const Texture *))
 {
 	add(kw, &PropertyLoader<C>::property_value_scalar, set_value);
-	add(kw+"_map", &PropertyLoader<C>::property_texture, set_texture);
+	if(set_texture)
+		add(kw+"_map", &PropertyLoader<C>::property_texture, set_texture);
 }
 
 template<typename C>
@@ -140,7 +120,8 @@ void Material::PropertyLoader<C>::add_property(const std::string &kw, void (C::*
 		add(kw, &PropertyLoader<C>::property_value_rgba, set_value);
 		add(kw+"_srgb", &PropertyLoader<C>::property_value_srgb_alpha, set_value);
 	}
-	add(kw+"_map", &PropertyLoader<C>::property_texture, set_texture);
+	if(set_texture)
+		add(kw+"_map", &PropertyLoader<C>::property_texture, set_texture);
 }
 
 template<typename C>
@@ -187,20 +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::typed_material()
-{
-	if(material)
-		throw std::logic_error("Material was already loaded");
-	RefPtr<T> mat = new T;
-	if(coll)
-		load_sub(*mat, *coll);
-	else
-		load_sub(*mat);
-	material = mat;
-}
-
 } // namespace GL
 } // namespace Msp