X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmaterials%2Funlitmaterial.h;h=4481d5f988f446d446c048303666803c0af44e46;hb=ae45c0397e2cb8f0a01f2f31d01c95ff3870271e;hp=22e226917da00298d7c8934f3adedae0eed86c0e;hpb=842c817bb679a5a0abc05e8149e2e6e0ae1a0412;p=libs%2Fgl.git

diff --git a/source/materials/unlitmaterial.h b/source/materials/unlitmaterial.h
index 22e22691..4481d5f9 100644
--- a/source/materials/unlitmaterial.h
+++ b/source/materials/unlitmaterial.h
@@ -15,7 +15,6 @@ public:
 		static ActionMap shared_actions;
 
 	public:
-		Loader(UnlitMaterial &);
 		Loader(UnlitMaterial &, Collection &);
 
 	private:
@@ -26,9 +25,11 @@ public:
 
 private:
 	const Texture *texture;
-	Color tint;
+	Color color;
 	bool vertex_color;
 
+	static const Tag texture_tags[];
+
 public:
 	UnlitMaterial();
 
@@ -36,10 +37,11 @@ protected:
 	virtual void fill_program_info(std::string &, std::map<std::string, int> &) const;
 
 public:
-	virtual void attach_textures_to(Texturing &, ProgramData &) const;
+	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);
 };