X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=69fcdbe0e91fca03b968f355ef397dbaaae273de;hb=7699570b9a07ef1fbe2b3b8badfa923de2fdd0a1;hp=1ecd3a1dc42eaef6a62785f3fa4f07e1809a6405;hpb=8f7d5b6460ef68e7316c7f556b7152d9c9f7bfe2;p=libs%2Fgl.git

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 1ecd3a1d..69fcdbe0 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -33,6 +33,24 @@ ProgramData::ProgramData(const ProgramData &other):
 		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)
@@ -129,18 +147,18 @@ void ProgramData::uniform_matrix3(const string &name, const float *v)
 	uniform(name, new UniformMatrix3x3f(v));
 }
 
-void ProgramData::uniform_matrix4(const string &name, const float *v)
-{
-	uniform(name, new UniformMatrix4x4f(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));