Remove the specialized setters from UniformBlock

They were not very useful and were also getting in the way of uniform
buffer support.  UniformBlock also no longer clones the uniforms for
itself, reducing overhead.

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 0a2ec6050fa189256d11e349b2b4665ac0f980e7..5bfbd68fe25ece5ef5a016cf61de253b6c31c790 100644 (file)
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -170,7 +170,7 @@ const UniformBlock &ProgramData::get_block(const Program &prog) const
                {
                        int loc = prog.get_uniform_location(j->first);
                        if(loc>=0)
-                               block.uniform(loc, *j->second);
+                               block.attach(loc, *j->second);
                }
                i->second.dirty = false;
        }

diff --git a/source/uniformblock.cpp b/source/uniformblock.cpp
index fe044750d45e3d1cbcb06506843fd46e8beabea0..2ff00fa221295ada6f8578cc89649b6936c70afe 100644 (file)
--- a/source/uniformblock.cpp
+++ b/source/uniformblock.cpp
@@ -10,97 +10,9 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-UniformBlock::~UniformBlock()
+void UniformBlock::attach(int index, const Uniform &uni)
 {
-       for(map<int, Uniform *>::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
-               delete i->second;
-}
-
-void UniformBlock::uniform(int index, Uniform *uni)
-{
-       map<int, Uniform *>::iterator i = uniforms.find(index);
-       if(i!=uniforms.end())
-       {
-               delete i->second;
-               i->second = uni;
-       }
-       else
-               uniforms[index] = uni;
-}
-
-void UniformBlock::uniform(int index, const Uniform &uni)
-{
-       uniform(index, uni.clone());
-}
-
-void UniformBlock::uniform(int index, int v)
-{
-       uniform(index, new Uniform1i(v));
-}
-
-void UniformBlock::uniform(int index, float v)
-{
-       uniform(index, new Uniform1f(v));
-}
-
-void UniformBlock::uniform(int index, float v0, float v1)
-{
-       float va[2] = { v0, v1 };
-       uniform2(index, va);
-}
-
-void UniformBlock::uniform2(int index, const float *v)
-{
-       uniform(index, new Uniform2f(v));
-}
-
-void UniformBlock::uniform(int index, float v0, float v1, float v2)
-{
-       float va[3] = { v0, v1, v2 };
-       uniform3(index, va);
-}
-
-void UniformBlock::uniform(int index, const Vector3 &v)
-{
-       uniform(index, v.x, v.y, v.z);
-}
-
-void UniformBlock::uniform3(int index, const float *v)
-{
-       uniform(index, new Uniform3f(v));
-}
-
-void UniformBlock::uniform(int index, float v0, float v1, float v2, float v3)
-{
-       float va[4] = { v0, v1, v2, v3 };
-       uniform4(index, va);
-}
-
-void UniformBlock::uniform(int index, const Vector4 &v)
-{
-       uniform(index, v.x, v.y, v.z, v.w);
-}
-
-void UniformBlock::uniform(int index, const Color &c)
-{
-       uniform(index, c.r, c.g, c.b, c.a);
-}
-
-void UniformBlock::uniform4(int index, const float *v)
-{
-       uniform(index, new Uniform4f(v));
-}
-
-void UniformBlock::uniform_matrix4(int index, const float *v)
-{
-       uniform(index, new UniformMatrix4x4f(v));
-}
-
-void UniformBlock::uniform_matrix4(int index, const Matrix &m)
-{
-       float v[16];
-       copy(m.data(), m.data()+16, v);
-       uniform_matrix4(index, v);
+       uniforms[index] = &uni;
 }
 
 void UniformBlock::apply(int index) const
@@ -108,7 +20,7 @@ void UniformBlock::apply(int index) const
        if(index>=0)
                throw logic_error("GL_ARB_uniform_buffer_object support not implemented yet");
 
-       for(map<int, Uniform *>::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
+       for(map<int, const Uniform *>::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
                i->second->apply(i->first);
 }
 

diff --git a/source/uniformblock.h b/source/uniformblock.h
index 815f49b1db20cc045bcd7adba81388c621e73c73..3a1cdb959d06e77106024aa1f264f648836664bb 100644 (file)
--- a/source/uniformblock.h
+++ b/source/uniformblock.h
@@ -15,31 +15,14 @@ class Vector4;
 class UniformBlock
 {
 private:
-       std::map<int, Uniform *> uniforms;
+       std::map<int, const Uniform *> uniforms;
 
        UniformBlock(const UniformBlock &);
        UniformBlock &operator=(const UniformBlock &);
 public:
        UniformBlock() { }
-       ~UniformBlock();
 
-private:
-       void uniform(int, Uniform *);
-public:
-       void uniform(int, const Uniform &);
-       void uniform(int, int);
-       void uniform(int, float);
-       void uniform(int, float, float);
-       void uniform2(int, const float *);
-       void uniform(int, float, float, float);
-       void uniform(int, const Vector3 &);
-       void uniform3(int, const float *);
-       void uniform(int, float, float, float, float);
-       void uniform(int, const Vector4 &);
-       void uniform(int, const Color &);
-       void uniform4(int, const float *);
-       void uniform_matrix4(int, const float *);
-       void uniform_matrix4(int, const Matrix &);
+       void attach(int, const Uniform &);
 
        void apply(int) const;
 };