Inherit Loaders from the ObjectLoader classes

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

diff --git a/source/programdata.h b/source/programdata.h
index 986bd7b1f444cda423f878557efc3a4bb907e268..591ffee347f7dfe6bf97a3e1ef9b9772f87c101a 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -9,7 +9,7 @@ Distributed under the LGPL
 #define MSP_GL_PROGRAMDATA_H_
 
 #include <map>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 
 namespace Msp {
 namespace GL {
@@ -23,19 +23,19 @@ Stores uniform variables for a shader program.
 class ProgramData
 {
 public:
-       class Loader: public DataFile::Loader
+       class Loader: public DataFile::ObjectLoader<ProgramData>
        {
        private:
-               ProgramData &pdata;
                Program &prog;
 
        public:
                Loader(ProgramData &, Program &);
        private:
-               void uniform1(const std::string &, float);
-               void uniform2(const std::string &, float, float);
-               void uniform3(const std::string &, float, float, float);
-               void uniform4(const std::string &, float, float, float, float);
+               void uniform1i(const std::string &, int);
+               void uniform1f(const std::string &, float);
+               void uniform2f(const std::string &, float, float);
+               void uniform3f(const std::string &, float, float, float);
+               void uniform4f(const std::string &, float, float, float, float);
        };
 
 private: