Style update: add spaces around assignment operators

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

diff --git a/source/programdata.cpp b/source/programdata.cpp
index af2679a5965bbd932082b679ffe88f135ff47434..9ab0731d8164852352f12f38808e36a2f7aed37d 100644 (file)
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -17,7 +17,14 @@ namespace GL {
 
 ProgramData::ProgramData()
 {
-       require_extension("GL_ARB_shader_objects");
+       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()
@@ -29,16 +36,19 @@ ProgramData::~ProgramData()
 void ProgramData::uniform(int index, Uniform *uni)
 {
        if(index<0)
+       {
+               delete 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)
@@ -89,33 +99,39 @@ void ProgramData::apply() const
 
 
 ProgramData::Loader::Loader(ProgramData &pd, Program &pr):
-       pdata(pd),
+       DataFile::ObjectLoader<ProgramData>(pd),
        prog(pr)
 {
-       add("uniform1", &Loader::uniform1);
-       add("uniform2", &Loader::uniform2);
-       add("uniform3", &Loader::uniform3);
-       add("uniform4", &Loader::uniform4);
+       add("uniform1i", &Loader::uniform1i);
+       add("uniform1f", &Loader::uniform1f);
+       add("uniform2f", &Loader::uniform2f);
+       add("uniform3f", &Loader::uniform3f);
+       add("uniform4f", &Loader::uniform4f);
+}
+
+void ProgramData::Loader::uniform1i(const string &n, int v)
+{
+       obj.uniform(prog.get_uniform_location(n), v);
 }
 
-void ProgramData::Loader::uniform1(const string &n, float 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::uniform2(const string &n, float v0, float v1)
+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::uniform3(const string &n, float v0, float v1, float v2)
+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::uniform4(const string &n, float v0, float v1, float v2, float v3)
+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