X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation.h;h=929cb13f497318c3a91492cc1cf18d36584f267e;hp=1ae571e7db217e8e624c6475dc6c4731ebf08a9d;hb=573ea4e5602c4321cc1d75daf9ed0beed5cde280;hpb=3f7c493e13b7108098539078b729cffc095c304b diff --git a/source/animation.h b/source/animation.h index 1ae571e7..929cb13f 100644 --- a/source/animation.h +++ b/source/animation.h @@ -73,8 +73,6 @@ private: void prepare(); }; - typedef std::list KeyFrameList; - struct UniformInfo { std::string name; @@ -87,8 +85,8 @@ public: class Iterator { private: - const Animation &animation; - KeyFrameList::const_iterator iter; + const Animation *animation; + std::vector::const_iterator iter; Time::TimeDelta time_since_keyframe; bool end; @@ -105,7 +103,7 @@ public: private: const Armature *armature; - KeyFrameList keyframes; + std::vector keyframes; bool looping; std::vector uniforms;