X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation%2Fanimation.cpp;h=98cfdc87f5398f2813252fb9c0688fdbd69be65a;hp=a9278e3de00836b3eb9e2ebe56ff908e2da207ed;hb=f19366d32cc29287a2730cfba90893e407754081;hpb=f96d553dbf78f9d664d1dbb1fe002fc43f23ad47 diff --git a/source/animation/animation.cpp b/source/animation/animation.cpp index a9278e3d..98cfdc87 100644 --- a/source/animation/animation.cpp +++ b/source/animation/animation.cpp @@ -489,23 +489,12 @@ Matrix Animation::Iterator::get_pose_matrix(unsigned link) const } -Animation::Loader::Loader(Animation &a): - DataFile::CollectionObjectLoader(a, 0) +Animation::Loader::Loader(Animation &a, Collection *c): + DataFile::CollectionObjectLoader(a, c), + start_slope(1), + end_slope(1), + slopes_set(0) { - init(); -} - -Animation::Loader::Loader(Animation &a, Collection &c): - DataFile::CollectionObjectLoader(a, &c) -{ - init(); -} - -void Animation::Loader::init() -{ - start_slope = 1; - end_slope = 1; - slopes_set = 0; add("armature", &Animation::armature); add("control_keyframe", &Loader::control_keyframe); add("control_keyframe", &Loader::control_keyframe_inline);