Add inline data items to the collection

[libs/gl.git] / source / animation / keyframe.cpp

diff --git a/source/animation/keyframe.cpp b/source/animation/keyframe.cpp
index f610de2d42afbd08dd118cf97e7f54afa75da7de..6cb8ce6ad1b5d9d5260115bae32821f62961c426 100644 (file)
--- a/source/animation/keyframe.cpp
+++ b/source/animation/keyframe.cpp
@@ -1,4 +1,5 @@
 #include <msp/datafile/collection.h>
+#include <msp/fs/utils.h>
 #include "keyframe.h"
 #include "pose.h"
 
@@ -33,7 +34,6 @@ void KeyFrame::set_uniform(const string &n, const AnimatedUniform &u)
 void KeyFrame::set_pose(const Pose &p)
 {
        pose = &p;
-       pose.keep();
 }
 
 
@@ -73,17 +73,22 @@ void KeyFrame::Loader::init()
        add("scaling", &Loader::scaling);
 }
 
+void KeyFrame::Loader::set_inline_base_name(const string &n)
+{
+       inline_base_name = n;
+}
+
 void KeyFrame::Loader::pose(const string &n)
 {
        obj.pose = &get_collection().get<Pose>(n);
-       obj.pose.keep();
 }
 
 void KeyFrame::Loader::pose_inline()
 {
        RefPtr<Pose> p = new Pose;
        load_sub(*p, get_collection());
-       obj.pose = p;
+       get_collection().add((inline_base_name.empty() ? FS::basename(get_source()) : inline_base_name)+".pose", p.get());
+       obj.pose = p.release();
 }
 
 void KeyFrame::Loader::position(float x, float y, float z)