X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=e27265d76d5678808f242c3cb89a0553dd1bab6e;hb=2b779717e42b514210f7128cf9aee2276650e003;hp=38803c571ee2e210451ccc6abb3abd41ab005b23;hpb=904de4f7fd994886adbd3a6c03bc1b7c14ebc562;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index 38803c57..e27265d7 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -4,6 +4,7 @@
 #include <map>
 #include <msp/datafile/objectloader.h>
 #include "program.h"
+#include "vector.h"
 
 namespace Msp {
 namespace GL {
@@ -13,8 +14,6 @@ class Color;
 class Matrix;
 class Uniform;
 class UniformBlock;
-class Vector3;
-class Vector4;
 
 /**
 Stores uniform variables for shader programs.  The uniforms are stored in a
@@ -67,10 +66,10 @@ private:
 	mutable Buffer *buffer;
 	mutable Changes changes;
 
-	ProgramData &operator=(const ProgramData &);
 public:
 	ProgramData();
 	ProgramData(const ProgramData &);
+	ProgramData &operator=(const ProgramData &);
 	~ProgramData();
 
 private:
@@ -87,8 +86,10 @@ public:
 	void uniform(const std::string &, const Vector4 &);
 	void uniform(const std::string &, const Color &);
 	void uniform4(const std::string &, const float *);
+	void uniform_matrix2(const std::string &, const float *);
+	void uniform_matrix3(const std::string &, const float *);
+	void uniform(const std::string &, const Matrix &);
 	void uniform_matrix4(const std::string &, const float *);
-	void uniform_matrix4(const std::string &, const Matrix &);
 	void uniform1_array(const std::string &, unsigned, const float *);
 	void uniform2_array(const std::string &, unsigned, const float *);
 	void uniform3_array(const std::string &, unsigned, const float *);