X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimatedobject.cpp;h=257e1368def51c6c3a40fef4ebd5f04473320ff9;hp=269665f6d12ff834a6f2827fba10c444bfb2fad5;hb=944deb38084e5e5bc82182faab2db2be156b971c;hpb=3f7c493e13b7108098539078b729cffc095c304b diff --git a/source/animatedobject.cpp b/source/animatedobject.cpp index 269665f6..257e1368 100644 --- a/source/animatedobject.cpp +++ b/source/animatedobject.cpp @@ -26,11 +26,6 @@ AnimatedObject::~AnimatedObject() delete shdata; } -void AnimatedObject::set_matrix(const Matrix &m) -{ - matrix = m; -} - void AnimatedObject::set_pose_matrix(unsigned link, const Matrix &m) { if(shdata) @@ -42,6 +37,20 @@ void AnimatedObject::set_pose_matrix(unsigned link, const Matrix &m) } } +ProgramData &AnimatedObject::get_shader_data() +{ + if(!shdata) + throw invalid_operation("AnimatedObject::get_shader_data"); + return *shdata; +} + +const ProgramData &AnimatedObject::get_shader_data() const +{ + if(!shdata) + throw invalid_operation("AnimatedObject::get_shader_data"); + return *shdata; +} + void AnimatedObject::set_uniform(const string &name, const KeyFrame::AnimatedUniform &uni) { if(!shdata)