Unify the loader wrappers for Material and Scene

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

diff --git a/source/materials/material.h b/source/materials/material.h
index 43da2542612d7ba50bbb4f4e0d2ee886f7a48483..4f8e23ccc972001c892bb6e37a65f9448e3f1c9d 100644 (file)
--- a/source/materials/material.h
+++ b/source/materials/material.h
@@ -11,6 +11,8 @@
 namespace Msp {
 namespace GL {
 
+class Sampler;
+
 class Material
 {
 private:
@@ -72,10 +74,11 @@ public:
                static ActionMap shared_actions;
 
        public:
-               GenericLoader(DataFile::Collection * = 0);
+               GenericLoader();
+               GenericLoader(DataFile::Collection &);
                ~GenericLoader();
 
-               Material *get_material() { Material *m = material; material = 0; return m; }
+               Material *get_object() { Material *m = material; material = 0; return m; }
        private:
                virtual void init_actions();
 
@@ -105,7 +108,7 @@ public:
 
        virtual const Tag *get_texture_tags() const = 0;
        virtual const Texture *get_texture(Tag) const = 0;
-       const Sampler *get_sampler() const { return sampler; }
+       virtual const Sampler *get_sampler(Tag) const { return sampler; }
 
        void set_debug_name(const std::string &);