X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Funlitmaterial.cpp;h=e1979051672481f277b953253589e88925c23716;hp=38dbd3a3bdfc9104295fb87983839b9d19cdff29;hb=HEAD;hpb=6f39983060a27634c012f66c82fea0d09fea9774 diff --git a/source/materials/unlitmaterial.cpp b/source/materials/unlitmaterial.cpp index 38dbd3a3..e1979051 100644 --- a/source/materials/unlitmaterial.cpp +++ b/source/materials/unlitmaterial.cpp @@ -11,9 +11,7 @@ const Tag UnlitMaterial::texture_tags[] = Tag() }; -UnlitMaterial::UnlitMaterial(): - texture(0), - vertex_color(false) +UnlitMaterial::UnlitMaterial() { set_color(Color(1.0f)); } @@ -25,14 +23,6 @@ void UnlitMaterial::fill_program_info(string &module_name, map &spe spec_values["use_vertex_color"] = vertex_color; } -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -void UnlitMaterial::attach_textures_to(Texturing &texturing, ProgramData &tex_shdata) const -{ - attach_texture_to(texture, texturing, tex_shdata, "color_tex"); -} -#pragma GCC diagnostic pop - const Texture *UnlitMaterial::get_texture(Tag tag) const { if(tag==texture_tags[0]) @@ -60,12 +50,6 @@ void UnlitMaterial::set_vertex_color(bool vc) DataFile::Loader::ActionMap UnlitMaterial::Loader::shared_actions; -UnlitMaterial::Loader::Loader(UnlitMaterial &m): - DerivedObjectLoader >(m) -{ - set_actions(shared_actions); -} - UnlitMaterial::Loader::Loader(UnlitMaterial &m, Collection &c): DerivedObjectLoader >(m, c) {