X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.h;h=4f8e23ccc972001c892bb6e37a65f9448e3f1c9d;hb=23d4100160bfa33359ce297b6b36244abcaa5f82;hp=8f387a43bfacfbdc4b2b5629d1a5a718f653a5cd;hpb=cb7db94f7837e6a3be037d07575dc248177d9426;p=libs%2Fgl.git

diff --git a/source/materials/material.h b/source/materials/material.h
index 8f387a43..4f8e23cc 100644
--- a/source/materials/material.h
+++ b/source/materials/material.h
@@ -11,7 +11,7 @@
 namespace Msp {
 namespace GL {
 
-class Texturing;
+class Sampler;
 
 class Material
 {
@@ -74,10 +74,11 @@ public:
 		static ActionMap shared_actions;
 
 	public:
-		GenericLoader(DataFile::Collection * = 0);
+		GenericLoader();
+		GenericLoader(DataFile::Collection &);
 		~GenericLoader();
 
-		Material *get_material() { Material *m = material; material = 0; return m; }
+		Material *get_object() { Material *m = material; material = 0; return m; }
 	private:
 		virtual void init_actions();
 
@@ -97,7 +98,7 @@ protected:
 public:
 	virtual ~Material() { }
 
-	virtual const Program *create_compatible_shader(DataFile::Collection &, const std::map<std::string, int> & = std::map<std::string, int>()) 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,14 +106,11 @@ 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 &);