X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Funlitmaterial.h;h=11641fa15be3a0b78de657af3669f0f399c12208;hb=c8520aa336e92f2eaf9a38c3430c608520a90324;hp=a98b12844c5ae1fa1bfa3653cf89953117620026;hpb=2bf5645d38492c5ef829478f3e04e78f31802fe6;p=libs%2Fgl.git

diff --git a/source/materials/unlitmaterial.h b/source/materials/unlitmaterial.h
index a98b1284..11641fa1 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:
@@ -25,9 +24,11 @@ public:
 	};
 
 private:
-	const Texture *texture;
+	const Texture *texture = 0;
 	Color color;
-	bool vertex_color;
+	bool vertex_color = false;
+
+	static const Tag texture_tags[];
 
 public:
 	UnlitMaterial();
@@ -36,7 +37,8 @@ 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_color(const Color &);