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

diff --git a/source/materials/material.h b/source/materials/material.h
index 278fc4dc..40d2b7ee 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
 {
@@ -97,7 +97,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,14 +105,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 &);