X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Funiform.h;h=5d288cf50e29485701bb125830aebe4504d0ae07;hb=4af69ec90120a0be828a1ae475a38674087110b5;hp=f8a59f2a441e5fd2b3ec2ba55cdd604b50ab0477;hpb=8eb9a8d90e5597154dab666481037b306b7bbca2;p=libs%2Fgl.git

diff --git a/source/uniform.h b/source/uniform.h
index f8a59f2a..5d288cf5 100644
--- a/source/uniform.h
+++ b/source/uniform.h
@@ -36,6 +36,8 @@ private:
 public:
 	UniformScalar(Type v): value(v) { }
 
+	Type get() const { return value; }
+
 	virtual void apply(int index) const
 	{ apply(index, 1, &value); }
 
@@ -69,6 +71,8 @@ public:
 	UniformVector(const T *vp)
 	{ std::copy(vp, vp+vecsize, value); }
 
+	BaseType get(unsigned i) const { return value[i]; }
+
 	virtual void apply(int index) const
 	{ apply(index, 1, value); }
 
@@ -84,8 +88,11 @@ public:
 	{ return new UniformVector(value); }
 };
 
+typedef UniformVector<int, 2> Uniform2i;
 typedef UniformVector<float, 2> Uniform2f;
+typedef UniformVector<int, 3> Uniform3i;
 typedef UniformVector<float, 3> Uniform3f;
+typedef UniformVector<int, 4> Uniform4i;
 typedef UniformVector<float, 4> Uniform4f;
 
 
@@ -121,6 +128,15 @@ public:
 	{ return new UniformMatrix(value); }
 };
 
+// The naming of these types follows the OpenGL convention of columns x rows
+typedef UniformMatrix<float, 2, 2> UniformMatrix2x2f;
+typedef UniformMatrix<float, 2, 3> UniformMatrix3x2f;
+typedef UniformMatrix<float, 2, 4> UniformMatrix4x2f;
+typedef UniformMatrix<float, 3, 2> UniformMatrix2x3f;
+typedef UniformMatrix<float, 3, 3> UniformMatrix3x3f;
+typedef UniformMatrix<float, 3, 4> UniformMatrix4x3f;
+typedef UniformMatrix<float, 4, 2> UniformMatrix2x4f;
+typedef UniformMatrix<float, 4, 3> UniformMatrix3x4f;
 typedef UniformMatrix<float, 4, 4> UniformMatrix4x4f;
 
 
@@ -142,6 +158,11 @@ public:
 		std::copy(vp, vp+elemsize*size, values);
 	}
 
+	~UniformArray()
+	{
+		delete[] values;
+	}
+
 	virtual void apply(int index) const
 	{ T::apply(index, size, values); }