Minor fixes, courtesy of Apple's compiler

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

diff --git a/source/animatedobject.cpp b/source/animatedobject.cpp
index 086666339800ec022484d33660fd6292da3c5f1b..63a25112a769428374e37dd0634251b4f2c2c8b7 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 {
 
@@ -17,6 +20,11 @@ AnimatedObject::AnimatedObject(const Object &o):
                        shdata = new ProgramData;
 }
 
+AnimatedObject::~AnimatedObject()
+{
+       delete shdata;
+}
+
 void AnimatedObject::set_matrix(const Matrix &m)
 {
        matrix = m;
@@ -25,14 +33,19 @@ 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
 {
        renderer.matrix_stack() *= matrix;
        if(shdata)
-               renderer.add_shader_data(shdata);
+               renderer.add_shader_data(*shdata);
 }
 
 } // namespace GL