Remove collection-less constructor overloads from most loaders

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

diff --git a/source/materials/pbrmaterial.h b/source/materials/pbrmaterial.h
index 7c0d545936db21b5464c20bf60512f3566b94ae2..9669bc35a3a1086e117c73cc8aa2e2f4d677d315 100644 (file)
--- a/source/materials/pbrmaterial.h
+++ b/source/materials/pbrmaterial.h
@@ -17,7 +17,6 @@ public:
                static ActionMap shared_actions;
 
        public:
-               Loader(PbrMaterial &);
                Loader(PbrMaterial &, Collection &);
 
        private:
@@ -32,6 +31,7 @@ private:
        Property<float> occlusion;
        Property<Color> emission;
        const Texture2D &fresnel_lookup;
+       const Sampler &fresnel_sampler;
 
        static const Tag texture_tags[];
 
@@ -45,10 +45,9 @@ protected:
        virtual void fill_program_info(std::string &, std::map<std::string, int> &) const;
 
 public:
-       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;
+       virtual const Sampler *get_sampler(Tag) const;
 
        void set_base_color(const Color &);
        void set_base_color_map(const Texture *);