X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=4cc2398ec9bafafeffd4fa202f2f64baa4801d6c;hb=5172d32d67595ea0b70184fadcfcb8e023cccbc8;hp=986bd7b1f444cda423f878557efc3a4bb907e268;hpb=a361efc05fcad11b2918f3cd7abdebe794b131d8;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index 986bd7b1..4cc2398e 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -9,13 +9,17 @@ 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 {
 
+class Color;
+class Matrix;
 class Program;
 class Uniform;
+class Vector3;
+class Vector4;
 
 /**
 Stores uniform variables for a shader program.
@@ -23,40 +27,59 @@ 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 &);
+		Loader(ProgramData &);
 	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:
+	const Program &program;
 	std::map<int, Uniform *> data;
 
-	ProgramData(const ProgramData &);
 	ProgramData &operator=(const ProgramData &);
 public:
-	ProgramData();
+	explicit ProgramData(const Program &);
+	ProgramData(const ProgramData &);
 	~ProgramData();
 
+private:
 	void uniform(int, Uniform *);
+public:
 	void uniform(int, int);
 	void uniform(int, float);
 	void uniform(int, float, float);
 	void uniform2(int, const float *);
 	void uniform(int, float, float, float);
+	void uniform(int, const Vector3 &);
 	void uniform3(int, const float *);
 	void uniform(int, float, float, float, float);
+	void uniform(int, const Vector4 &);
+	void uniform(int, const Color &);
 	void uniform4(int, const float *);
 	void uniform_matrix4(int, const float *);
+	void uniform_matrix4(int, const Matrix &);
+
+	void uniform(const std::string &, int);
+	void uniform(const std::string &, float);
+	void uniform(const std::string &, float, float);
+	void uniform2(const std::string &, const float *);
+	void uniform(const std::string &, float, float, float);
+	void uniform(const std::string &, const Vector3 &);
+	void uniform3(const std::string &, const float *);
+	void uniform(const std::string &, float, float, float, float);
+	void uniform(const std::string &, const Vector4 &);
+	void uniform(const std::string &, const Color &);
+	void uniform4(const std::string &, const float *);
+	void uniform_matrix4(const std::string &, const float *);
+	void uniform_matrix4(const std::string &, const Matrix &);
+
 	void apply() const;
 };