X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Funiform.h;h=bc78bab8c1c891ad55086397f2bbcc9250d949a4;hp=72a1bd2c074121625136015e0af845807347d6d3;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=5172d32d67595ea0b70184fadcfcb8e023cccbc8

diff --git a/source/uniform.h b/source/uniform.h
index 72a1bd2c..bc78bab8 100644
--- a/source/uniform.h
+++ b/source/uniform.h
@@ -1,18 +1,12 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_UNIFORM_H_
 #define MSP_GL_UNIFORM_H_
 
+#include <algorithm>
+#include "program.h"
+
 namespace Msp {
 namespace GL {
 
-class Program;
-
 class Uniform
 {
 protected:
@@ -23,86 +17,174 @@ private:
 public:
 	virtual ~Uniform() { }
 
-	virtual void apply(int) const =0;
-	virtual Uniform *clone() const =0;
+	virtual void apply(int) const = 0;
+	virtual void store(const Program::UniformInfo &, void *) const = 0;
+	virtual Uniform *clone() const = 0;
 };
 
 
-class Uniform1i: public Uniform
+template<typename T>
+class UniformScalar: public Uniform
 {
+public:
+	typedef T BaseType;
+	typedef T Type;
+
 private:
-	int v;
+	Type value;
 
 public:
-	Uniform1i(int v_);
+	UniformScalar(Type v): value(v) { }
 
-	virtual void apply(int index) const;
-	virtual Uniform1i *clone() const;
-};
+	void set(Type v) { value = v; }
 
+	Type get() const { return value; }
 
-class Uniform1f: public Uniform
-{
-private:
-	float v;
+	virtual void apply(int index) const
+	{ apply(index, 1, &value); }
 
-public:
-	Uniform1f(float v_);
+	static void apply(int, unsigned, const T *);
+
+	virtual void store(const Program::UniformInfo &info, void *buffer) const
+	{ store(info, buffer, &value); }
+
+	static void store(const Program::UniformInfo &, void *buffer, const T *value)
+	{ *reinterpret_cast<T *>(buffer) = *value; }
 
-	virtual void apply(int index) const;
-	virtual Uniform1f *clone() const;
+	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) { set(vp); }
 
-	virtual void apply(int index) const;
-	virtual Uniform2f *clone() const;
-};
+	void set(const T *vp)
+	{ std::copy(vp, vp+vecsize, value); }
 
+	BaseType get(unsigned i) const { return value[i]; }
 
-class Uniform3f: public Uniform
-{
-private:
-	float v[3];
+	virtual void apply(int index) const
+	{ apply(index, 1, value); }
 
-public:
-	Uniform3f(float v0, float v1, float v2);
+	static void apply(int index, unsigned size, const T *value);
+
+	virtual void store(const Program::UniformInfo &info, void *buffer) const
+	{ store(info, buffer, value); }
 
-	virtual void apply(int index) const;
-	virtual Uniform3f *clone() const;
+	static void store(const Program::UniformInfo &, void *buffer, const T *value)
+	{ std::copy(value, value+vecsize, reinterpret_cast<T *>(buffer)); }
+
+	virtual UniformVector *clone() const
+	{ 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;
+
 
-class Uniform4f: 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[4];
+	Type value;
 
 public:
-	Uniform4f(float v0, float v1, float v2, float v3);
+	UniformMatrix(const T *vp) { set(vp); }
 
-	virtual void apply(int index) const;
-	virtual Uniform4f *clone() const;
+	void set(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 store(const Program::UniformInfo &info, void *buffer) const
+	{ store(info, buffer, value); }
+
+	static void store(const Program::UniformInfo &info, void *buffer, const T *value)
+	{
+		for(unsigned i=0; i<cols; ++i)
+			UniformVector<T, rows>::store(info, reinterpret_cast<char *>(buffer)+i*info.matrix_stride, value+i*rows);
+	}
+
+	virtual UniformMatrix *clone() const
+	{ 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;
+
 
-class UniformMatrix4x4f: public Uniform
+template<typename T>
+class UniformArray: public Uniform
 {
 private:
-	float v[16];
+	typedef typename T::BaseType BaseType;
+	enum { elemsize = sizeof(typename T::Type)/sizeof(typename T::BaseType) };
 
-public:
-	UniformMatrix4x4f(const float *);
+	unsigned size_;
+	BaseType *values;
 
-	virtual void apply(int index) const;
-	virtual UniformMatrix4x4f *clone() const;
+public:
+	UniformArray(unsigned n, const BaseType *vp):
+		size_(n),
+		values(new BaseType[elemsize*size_])
+	{
+		set(vp);
+	}
+
+	~UniformArray()
+	{
+		delete[] values;
+	}
+
+	unsigned size() const { return size_; }
+
+	void set(const BaseType *vp)
+	{ std::copy(vp, vp+elemsize*size_, values); }
+
+	virtual void apply(int index) const
+	{ T::apply(index, size_, values); }
+
+	virtual void store(const Program::UniformInfo &info, void *buffer) const
+	{
+		for(unsigned i=0; i<size_; ++i)
+			T::store(info, reinterpret_cast<char *>(buffer)+i*info.array_stride, values+i*elemsize);
+	}
+
+	virtual UniformArray *clone() const
+	{ return new UniformArray(size_, values); }
 };
 
 } // namespace GL