Migrate from LoadableTypeRegistry to TypeRegistry

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

diff --git a/source/materials/basicmaterial.h b/source/materials/basicmaterial.h
index 95259f476b233198856c49a42391049f54f6b0b5..2b27b212b6e6f8430dc6e54202fd1a34803bef34 100644 (file)
--- a/source/materials/basicmaterial.h
+++ b/source/materials/basicmaterial.h
@@ -31,14 +31,19 @@ private:
        Property<float> reflectivity;
        bool receive_shadows;
 
+       static const Tag texture_tags[];
+
 public:
        BasicMaterial();
 
 protected:
-       virtual std::string create_program_source() const;
+       virtual void fill_program_info(std::string &, std::map<std::string, int> &) const;
 
 public:
-       virtual void attach_textures_to(Texturing &, ProgramData &) const;
+       DEPRECATED 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_diffuse(const Color &);
        void set_diffuse_map(const Texture *);