X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Funiform.h;h=5d288cf50e29485701bb125830aebe4504d0ae07;hb=47853d7a557bf81131512832a9e531cb04d273ca;hp=8dc43ab5791a7e48b8055297003d5eb3c7f77e4b;hpb=9885c5465db78b6a1d9cc8bf7ffa7a79fb116afc;p=libs%2Fgl.git

diff --git a/source/uniform.h b/source/uniform.h
index 8dc43ab5..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); }
 
@@ -124,8 +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;