Remove the deprecated ProgramBuilder class

[libs/gl.git] / source / uniform.h

diff --git a/source/uniform.h b/source/uniform.h
index f8a59f2a441e5fd2b3ec2ba55cdd604b50ab0477..bc78bab8c1c891ad55086397f2bbcc9250d949a4 100644 (file)
--- a/source/uniform.h
+++ b/source/uniform.h
@@ -36,6 +36,10 @@ private:
 public:
        UniformScalar(Type v): value(v) { }
 
+       void set(Type v) { value = v; }
+
+       Type get() const { return value; }
+
        virtual void apply(int index) const
        { apply(index, 1, &value); }
 
@@ -66,9 +70,13 @@ private:
        Type value;
 
 public:
-       UniformVector(const T *vp)
+       UniformVector(const T *vp) { set(vp); }
+
+       void set(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 +92,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;
 
 
@@ -100,7 +111,9 @@ private:
        Type value;
 
 public:
-       UniformMatrix(const T *vp)
+       UniformMatrix(const T *vp) { set(vp); }
+
+       void set(const T *vp)
        { std::copy(vp, vp+rows*cols, value); }
 
        virtual void apply(int index) const
@@ -121,6 +134,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;
 
 
@@ -131,28 +153,38 @@ private:
        typedef typename T::BaseType BaseType;
        enum { elemsize = sizeof(typename T::Type)/sizeof(typename T::BaseType) };
 
+       unsigned size_;
        BaseType *values;
-       unsigned size;
 
 public:
        UniformArray(unsigned n, const BaseType *vp):
-               size(n)
+               size_(n),
+               values(new BaseType[elemsize*size_])
        {
-               values = new BaseType[elemsize*size];
-               std::copy(vp, vp+elemsize*size, values);
+               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); }
+       { T::apply(index, size_, values); }
 
        virtual void store(const Program::UniformInfo &info, void *buffer) const
        {
-               for(unsigned i=0; i<size; ++i)
+               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); }
+       { return new UniformArray(size_, values); }
 };
 
 } // namespace GL