X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Funlitmaterial.cpp;h=d5d99c01f2196a67ca6204ef8d7f9b22a34bebb4;hb=5a01404e40717c6c2cc389ed8357713e1f216f07;hp=e81be8ae136c3b8a915ef3b440b4c6946ffd5cb0;hpb=2bf5645d38492c5ef829478f3e04e78f31802fe6;p=libs%2Fgl.git

diff --git a/source/materials/unlitmaterial.cpp b/source/materials/unlitmaterial.cpp
index e81be8ae..d5d99c01 100644
--- a/source/materials/unlitmaterial.cpp
+++ b/source/materials/unlitmaterial.cpp
@@ -5,6 +5,12 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+const Tag UnlitMaterial::texture_tags[] =
+{
+	Tag("color_tex"),
+	Tag()
+};
+
 UnlitMaterial::UnlitMaterial():
 	texture(0),
 	vertex_color(false)
@@ -19,9 +25,12 @@ void UnlitMaterial::fill_program_info(string &module_name, map<string, int> &spe
 	spec_values["use_vertex_color"] = vertex_color;
 }
 
-void UnlitMaterial::attach_textures_to(Texturing &texturing, ProgramData &tex_shdata) const
+const Texture *UnlitMaterial::get_texture(Tag tag) const
 {
-	attach_texture_to(texture, texturing, tex_shdata, "color_tex");
+	if(tag==texture_tags[0])
+		return texture;
+	else
+		return 0;
 }
 
 void UnlitMaterial::set_texture(const Texture *tex)
@@ -43,12 +52,6 @@ void UnlitMaterial::set_vertex_color(bool vc)
 
 DataFile::Loader::ActionMap UnlitMaterial::Loader::shared_actions;
 
-UnlitMaterial::Loader::Loader(UnlitMaterial &m):
-	DerivedObjectLoader<UnlitMaterial, Material::PropertyLoader<UnlitMaterial> >(m)
-{
-	set_actions(shared_actions);
-}
-
 UnlitMaterial::Loader::Loader(UnlitMaterial &m, Collection &c):
 	DerivedObjectLoader<UnlitMaterial, Material::PropertyLoader<UnlitMaterial> >(m, c)
 {