X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation%2Fkeyframe.h;h=5e70aa730c970bf11ac51231c72ad8defd695344;hp=7a96447e656d5ef533a381b099a9e39e17abc44d;hb=HEAD;hpb=3ac3a51c623271da815c8ee60c484445871753bf diff --git a/source/animation/keyframe.h b/source/animation/keyframe.h index 7a96447e..5e70aa73 100644 --- a/source/animation/keyframe.h +++ b/source/animation/keyframe.h @@ -23,10 +23,10 @@ public: std::string inline_base_name; public: - Loader(KeyFrame &); - Loader(KeyFrame &, Collection &); + Loader(KeyFrame &k): Loader(k, 0) { } + Loader(KeyFrame &k, Collection &c): Loader(k, &c) { } private: - void init(); + Loader(KeyFrame &, Collection *); public: void set_inline_base_name(const std::string &); @@ -67,12 +67,9 @@ public: private: Transform transform; UniformMap uniforms; - const Pose *pose; + const Pose *pose = 0; public: - KeyFrame(); - ~KeyFrame(); - void set_transform(const Transform &); void set_matrix(const Matrix &); void set_uniform(const std::string &, const AnimatedUniform &);