X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Funlitmaterial.h;h=442348dad4da4400b1ad6456633b0b8e15f1ffde;hb=da85eb77172dbd62f764a63b45c79fc059af563b;hp=b8b28835b7ce18f031c79a4cb0a877670555b2ac;hpb=2f198e3210714c7abac53bbe1be4d41b1ef85c14;p=libs%2Fgl.git

diff --git a/source/materials/unlitmaterial.h b/source/materials/unlitmaterial.h
index b8b28835..442348da 100644
--- a/source/materials/unlitmaterial.h
+++ b/source/materials/unlitmaterial.h
@@ -26,20 +26,28 @@ public:
 
 private:
 	const Texture *texture;
-	Color tint;
+	Color color;
 	bool vertex_color;
 
+	static const Tag texture_tags[];
+
 public:
 	UnlitMaterial();
 
 protected:
-	virtual std::string create_program_source() const;
+	virtual void fill_program_info(std::string &, std::map<std::string, int> &) const;
 
 public:
-	virtual void attach_textures_to(Texturing &, ProgramData &) const;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+	DEPRECATED virtual void attach_textures_to(Texturing &, ProgramData &) const;
+#pragma GCC diagnostic pop
+
+	virtual const Tag *get_texture_tags() const { return texture_tags; }
+	virtual const Texture *get_texture(Tag) const;
 
 	void set_texture(const Texture *);
-	void set_tint(const Color &);
+	void set_color(const Color &);
 	void set_vertex_color(bool);
 };