X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=1287914005055ff91bb2102260daf4b28d50e710;hb=fa5b232a16e11d7950e80764497f0167ec9e3b41;hp=ed4b0a292b339ddc8c8bea858281949e96fca118;hpb=6afbace895a7bbcf216ab8e48280ea0303ab5892;p=libs%2Fgl.git

diff --git a/source/programdata.cpp b/source/programdata.cpp
index ed4b0a29..12879140 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -1,4 +1,4 @@
-#include "arb_shader_objects.h"
+#include <msp/gl/extensions/arb_shader_objects.h>
 #include "buffer.h"
 #include "color.h"
 #include "error.h"
@@ -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)
@@ -119,16 +137,24 @@ void ProgramData::uniform4(const string &name, const float *v)
 	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);
+	uniform_matrix4(name, m.data());
+}
+
+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)