X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=51ecc579a2582fcfedbcc72e86cb04961e909194;hb=712d77b12b4bfee6d1f2e7436247ade5405e8f90;hp=986bd7b1f444cda423f878557efc3a4bb907e268;hpb=a361efc05fcad11b2918f3cd7abdebe794b131d8;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index 986bd7b1..51ecc579 100644
--- 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,28 +23,28 @@ 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:
 	std::map<int, Uniform *> data;
 
-	ProgramData(const ProgramData &);
 	ProgramData &operator=(const ProgramData &);
 public:
 	ProgramData();
+	ProgramData(const ProgramData &);
 	~ProgramData();
 
 	void uniform(int, Uniform *);