X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation%2Fkeyframe.cpp;h=d1f1a7ea298251818b60d2b4c401edd0f0b07a91;hp=6cb8ce6ad1b5d9d5260115bae32821f62961c426;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=3ac3a51c623271da815c8ee60c484445871753bf diff --git a/source/animation/keyframe.cpp b/source/animation/keyframe.cpp index 6cb8ce6a..d1f1a7ea 100644 --- a/source/animation/keyframe.cpp +++ b/source/animation/keyframe.cpp @@ -8,13 +8,6 @@ using namespace std; namespace Msp { namespace GL { -// Avoid synthesizing RefPtr c'tor and d'tor in files including keyframe.h -KeyFrame::KeyFrame() -{ } - -KeyFrame::~KeyFrame() -{ } - void KeyFrame::set_transform(const Transform &t) { transform = t; @@ -47,19 +40,8 @@ KeyFrame::AnimatedUniform::AnimatedUniform(unsigned s, float v0, float v1, float } -KeyFrame::Loader::Loader(KeyFrame &k): - DataFile::CollectionObjectLoader(k, 0) -{ - init(); -} - -KeyFrame::Loader::Loader(KeyFrame &k, Collection &c): - DataFile::CollectionObjectLoader(k, &c) -{ - init(); -} - -void KeyFrame::Loader::init() +KeyFrame::Loader::Loader(KeyFrame &k, Collection *c): + DataFile::CollectionObjectLoader(k, c) { add("pose", &Loader::pose); add("pose", &Loader::pose_inline);