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); }
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); }
{ 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;
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
{ 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;
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