Use uniform arrays in Bloom and AnimatedObject

diff --git a/source/animatedobject.cpp b/source/animatedobject.cpp
index 086666339800ec022484d33660fd6292da3c5f1b..e4aa00445f4b42f83f63400b798772aa583777c1 100644 (file)
--- a/source/animatedobject.cpp
+++ b/source/animatedobject.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <msp/strings/format.h>
 #include "animatedobject.h"
 #include "object.h"
@@ -5,6 +6,8 @@
 #include "renderer.h"
 #include "technique.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
@@ -25,7 +28,12 @@ void AnimatedObject::set_matrix(const Matrix &m)
 void AnimatedObject::set_pose_matrix(unsigned link, const Matrix &m)
 {
        if(shdata)
-               shdata->uniform_matrix4(format("pose[%d]", link), m);
+       {
+               if(link*16>=pose_data.size())
+                       pose_data.resize((link+1)*16);
+               copy(m.data(), m.data()+16, &pose_data[link*16]);
+               shdata->uniform_matrix4_array("pose[0]", pose_data.size()/16, &pose_data[0]);
+       }
 }
 
 void AnimatedObject::setup_render(Renderer &renderer, const Tag &) const

diff --git a/source/animatedobject.h b/source/animatedobject.h
index acec4322af1d08ee15c755fe1cdea9368c9af41e..3f8487ba323768e51b292550abf5296579c16b53 100644 (file)
--- a/source/animatedobject.h
+++ b/source/animatedobject.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_ANIMATEDOBJECT_H_
 #define MSP_GL_ANIMATEDOBJECT_H_
 
+#include <vector>
 #include "matrix.h"
 #include "objectinstance.h"
 
@@ -15,6 +16,7 @@ class AnimatedObject: public ObjectInstance
 {
 private:
        Matrix matrix;
+       std::vector<float> pose_data;
        ProgramData *shdata;
 
 public:

diff --git a/source/bloom.cpp b/source/bloom.cpp
index 896147c2e885074620866da9e9e8dacb836ad1a6..8a6ddbcd73b9ebda371518ded5a4a96502c5d5e8 100644 (file)
--- a/source/bloom.cpp
+++ b/source/bloom.cpp
@@ -82,9 +82,10 @@ void Bloom::set_radius(float r)
        r = 2*r*r;
        for(int i=-size; i<=size; ++i)
                sum += (factors[size+i] = exp(-i*i/r));
-
        for(int i=0; i<=size*2; ++i)
-               blur_shdata_common.uniform(format("factors[%d]", i), factors[i]/sum);
+               factors[i] /= sum;
+
+       blur_shdata_common.uniform1_array("factors[0]", size*2+1, &factors.front());
 }
 
 void Bloom::set_strength(float s)