Inherit Loaders from the ObjectLoader classes

[libs/gl.git] / source / objectpass.h

diff --git a/source/objectpass.h b/source/objectpass.h
index e8190fa7f7c98e4cf13044b08fb446f750ec6d98..e3cac702362191a33759ed3da535ba6e384633a4 100644 (file)
--- a/source/objectpass.h
+++ b/source/objectpass.h
@@ -8,7 +8,7 @@ Distributed under the LGPL
 #ifndef MSP_GL_OBJECTPASS_H_
 #define MSP_GL_OBJECTPASS_H_
 
-#include <msp/datafile/collection.h>
+#include <msp/datafile/objectloader.h>
 
 namespace Msp {
 namespace GL {
@@ -18,19 +18,10 @@ class ProgramData;
 
 struct ObjectPass
 {
-       class Loader: public DataFile::Loader
+       class Loader: public DataFile::CollectionObjectLoader<ObjectPass>
        {
-       public:
-               typedef DataFile::Collection Collection;
-
-       private:
-               ObjectPass &pass;
-               Collection &coll;
-
        public:
                Loader(ObjectPass &, Collection &);
-               ObjectPass &get_object() const { return pass; }
-               Collection &get_collection() const { return coll; }
        private:
                void shader(const std::string &);
        };