X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Funiform.h;h=216d3be6a65c37cf5b2694a004363bf98a306a18;hb=0070eec93efbf27bcc70720141d8730b059eb964;hp=ac73e99db01347c6de3edcdabf048d9e3916bc47;hpb=97015ec7bddd26aa746f5227e4109b7d32438cca;p=libs%2Fgl.git

diff --git a/source/uniform.h b/source/uniform.h
index ac73e99d..216d3be6 100644
--- a/source/uniform.h
+++ b/source/uniform.h
@@ -1,18 +1,11 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_UNIFORM_H_
 #define MSP_GL_UNIFORM_H_
 
+#include <algorithm>
+
 namespace Msp {
 namespace GL {
 
-class Program;
-
 class Uniform
 {
 protected:
@@ -23,73 +16,114 @@ private:
 public:
 	virtual ~Uniform() { }
 
-	virtual void apply(int) const =0;
-	virtual Uniform *clone() const =0;
+	virtual void apply(int) const = 0;
+	virtual Uniform *clone() const = 0;
 };
 
 
-class Uniform1i: public Uniform
+template<typename T>
+class UniformScalar: public Uniform
 {
-private:
-	int v;
-
 public:
-	Uniform1i(int v_);
+	typedef T BaseType;
+	typedef T Type;
 
-	virtual void apply(int index) const;
-	virtual Uniform1i *clone() const;
-};
-
-
-class Uniform1f: public Uniform
-{
 private:
-	float v;
+	Type value;
 
 public:
-	Uniform1f(float v_);
+	UniformScalar(Type v): value(v) { }
 
-	virtual void apply(int index) const;
-	virtual Uniform1f *clone() const;
+	virtual void apply(int index) const
+	{ apply(index, 1, &value); }
+
+	static void apply(int, unsigned, const T *);
+
+	virtual UniformScalar *clone() const
+	{ return new UniformScalar(value); }
 };
 
+typedef UniformScalar<int> Uniform1i;
+typedef UniformScalar<float> Uniform1f;
+
 
-class Uniform2f: public Uniform
+template<typename T, unsigned vecsize>
+class UniformVector: public Uniform
 {
+public:
+	typedef T BaseType;
+	typedef T Type[vecsize];
+
 private:
-	float v[2];
+	Type value;
 
 public:
-	Uniform2f(float v0, float v1);
+	UniformVector(const T *vp)
+	{ std::copy(vp, vp+vecsize, value); }
+
+	virtual void apply(int index) const
+	{ apply(index, 1, value); }
 
-	virtual void apply(int index) const;
-	virtual Uniform2f *clone() const;
+	static void apply(int index, unsigned size, const T *value);
+
+	virtual UniformVector *clone() const
+	{ return new UniformVector(value); }
 };
 
+typedef UniformVector<float, 2> Uniform2f;
+typedef UniformVector<float, 3> Uniform3f;
+typedef UniformVector<float, 4> Uniform4f;
+
 
-class Uniform3f: public Uniform
+template<typename T, unsigned rows, unsigned cols>
+class UniformMatrix: public Uniform
 {
+public:
+	typedef T BaseType;
+	typedef T Type[rows*cols];
+
 private:
-	float v[3];
+	Type value;
 
 public:
-	Uniform3f(float v0, float v1, float v2);
+	UniformMatrix(const T *vp)
+	{ std::copy(vp, vp+rows*cols, value); }
+
+	virtual void apply(int index) const
+	{ apply(index, 1, value); }
+
+	static void apply(int index, unsigned size, const T *value);
 
-	virtual void apply(int index) const;
-	virtual Uniform3f *clone() const;
+	virtual UniformMatrix *clone() const
+	{ return new UniformMatrix(value); }
 };
 
+typedef UniformMatrix<float, 4, 4> UniformMatrix4x4f;
 
-class Uniform4f: public Uniform
+
+template<typename T>
+class UniformArray: public Uniform
 {
 private:
-	float v[4];
+	typedef typename T::BaseType BaseType;
 
-public:
-	Uniform4f(float v0, float v1, float v2, float v3);
+	BaseType *values;
+	unsigned size;
 
-	virtual void apply(int index) const;
-	virtual Uniform4f *clone() const;
+public:
+	UniformArray(unsigned n, const BaseType *vp):
+		size(n)
+	{
+		unsigned elemsize = sizeof(typename T::Type)/sizeof(typename T::BaseType);
+		values = new BaseType[elemsize*size];
+		std::copy(vp, vp+elemsize*size, values);
+	}
+
+	virtual void apply(int index) const
+	{ T::apply(index, size, values); }
+
+	virtual UniformArray *clone() const
+	{ return new UniformArray(size, values); }
 };
 
 } // namespace GL