Style update: add spaces around assignment operators

[libs/gl.git] / source / programdata.cpp

diff --git a/source/programdata.cpp b/source/programdata.cpp
index a7a9b037ef5b30861b4ce64f6eb66419506fb3e3..9ab0731d8164852352f12f38808e36a2f7aed37d 100644 (file)
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -20,6 +20,13 @@ ProgramData::ProgramData()
        static RequireExtension _ext("GL_ARB_shader_objects");
 }
 
+ProgramData::ProgramData(const ProgramData &other):
+       data(other.data)
+{
+       for(map<int, Uniform *>::iterator i=data.begin(); i!=data.end(); ++i)
+               i->second = i->second->clone();
+}
+
 ProgramData::~ProgramData()
 {
        for(map<int, Uniform *>::iterator i=data.begin(); i!=data.end(); ++i)
@@ -34,14 +41,14 @@ void ProgramData::uniform(int index, Uniform *uni)
                return;
        }
 
-       map<int, Uniform *>::iterator i=data.find(index);
+       map<int, Uniform *>::iterator i = data.find(index);
        if(i!=data.end())
        {
                delete i->second;
-               i->second=uni;
+               i->second = uni;
        }
        else
-               data[index]=uni;
+               data[index] = uni;
 }
 
 void ProgramData::uniform(int index, int v)
@@ -92,7 +99,7 @@ void ProgramData::apply() const
 
 
 ProgramData::Loader::Loader(ProgramData &pd, Program &pr):
-       pdata(pd),
+       DataFile::ObjectLoader<ProgramData>(pd),
        prog(pr)
 {
        add("uniform1i", &Loader::uniform1i);
@@ -104,27 +111,27 @@ ProgramData::Loader::Loader(ProgramData &pd, Program &pr):
 
 void ProgramData::Loader::uniform1i(const string &n, int v)
 {
-       pdata.uniform(prog.get_uniform_location(n), v);
+       obj.uniform(prog.get_uniform_location(n), v);
 }
 
 void ProgramData::Loader::uniform1f(const string &n, float v)
 {
-       pdata.uniform(prog.get_uniform_location(n), v);
+       obj.uniform(prog.get_uniform_location(n), v);
 }
 
 void ProgramData::Loader::uniform2f(const string &n, float v0, float v1)
 {
-       pdata.uniform(prog.get_uniform_location(n), v0, v1);
+       obj.uniform(prog.get_uniform_location(n), v0, v1);
 }
 
 void ProgramData::Loader::uniform3f(const string &n, float v0, float v1, float v2)
 {
-       pdata.uniform(prog.get_uniform_location(n), v0, v1, v2);
+       obj.uniform(prog.get_uniform_location(n), v0, v1, v2);
 }
 
 void ProgramData::Loader::uniform4f(const string &n, float v0, float v1, float v2, float v3)
 {
-       pdata.uniform(prog.get_uniform_location(n), v0, v1, v2, v3);
+       obj.uniform(prog.get_uniform_location(n), v0, v1, v2, v3);
 }
 
 } // namespace GL