Remove collection-less constructor overloads from most loaders

[libs/gl.git] / source / materials / unlitmaterial.h

diff --git a/source/materials/unlitmaterial.h b/source/materials/unlitmaterial.h
index 22e226917da00298d7c8934f3adedae0eed86c0e..4481d5f988f446d446c048303666803c0af44e46 100644 (file)
--- 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);
 };