i->second = i->second->clone();
}
+ProgramData &ProgramData::operator=(const ProgramData &other)
+{
+ for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
+ delete i->second;
+ uniforms.clear();
+
+ for(UniformMap::const_iterator i=other.uniforms.begin(); i!=other.uniforms.end(); ++i)
+ uniforms.insert(uniforms.end(), UniformMap::value_type(i->first, i->second->clone()));
+
+ for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ delete i->second.block;
+ blocks.clear();
+
+ changes = NO_CHANGES;
+
+ return *this;
+}
+
ProgramData::~ProgramData()
{
for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
uniform(name, new Uniform4f(v));
}
-void ProgramData::uniform_matrix4(const string &name, const float *v)
+void ProgramData::uniform_matrix2(const string &name, const float *v)
{
- uniform(name, new UniformMatrix4x4f(v));
+ uniform(name, new UniformMatrix2x2f(v));
+}
+
+void ProgramData::uniform_matrix3(const string &name, const float *v)
+{
+ uniform(name, new UniformMatrix3x3f(v));
}
-void ProgramData::uniform_matrix4(const string &name, const Matrix &m)
+void ProgramData::uniform(const string &name, const Matrix &m)
{
float v[16];
copy(m.data(), m.data()+16, v);
uniform_matrix4(name, v);
}
+void ProgramData::uniform_matrix4(const string &name, const float *v)
+{
+ uniform(name, new UniformMatrix4x4f(v));
+}
+
void ProgramData::uniform1_array(const string &name, unsigned n, const float *v)
{
uniform(name, new UniformArray<Uniform1f>(n, v));