X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fanimation%2Fanimatedobject.h;h=df920755729e05e17da5a617a546d8460f63704c;hb=edd5491943fe7aba6e6865cf53a02da682071a55;hp=f9b8824e1832932786189a99a9b2ca8a58eb2f3d;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git diff --git a/source/animation/animatedobject.h b/source/animation/animatedobject.h index f9b8824e..df920755 100644 --- a/source/animation/animatedobject.h +++ b/source/animation/animatedobject.h @@ -31,21 +31,20 @@ public: private: std::vector pose_data; - ProgramData *shdata; + ProgramData shdata; public: AnimatedObject(const Object &); - ~AnimatedObject(); void set_pose_matrix(unsigned, const Matrix &); - ProgramData &get_shader_data(); - const ProgramData &get_shader_data() const; + ProgramData &get_shader_data() { return shdata; } + const ProgramData &get_shader_data() const { return shdata; } DEPRECATED void set_uniform(const std::string &, const KeyFrame::AnimatedUniform &); virtual const Matrix *get_matrix() const { return &matrix; } - virtual void setup_render(Renderer &, const Tag &) const; + virtual void setup_render(Renderer &, Tag) const; }; } // namespace GL