X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Funlitmaterial.h;h=442348dad4da4400b1ad6456633b0b8e15f1ffde;hb=6f39983060a27634c012f66c82fea0d09fea9774;hp=22e226917da00298d7c8934f3adedae0eed86c0e;hpb=842c817bb679a5a0abc05e8149e2e6e0ae1a0412;p=libs%2Fgl.git diff --git a/source/materials/unlitmaterial.h b/source/materials/unlitmaterial.h index 22e22691..442348da 100644 --- a/source/materials/unlitmaterial.h +++ b/source/materials/unlitmaterial.h @@ -26,9 +26,11 @@ public: private: const Texture *texture; - Color tint; + Color color; bool vertex_color; + static const Tag texture_tags[]; + public: UnlitMaterial(); @@ -36,10 +38,16 @@ protected: virtual void fill_program_info(std::string &, std::map &) 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); };