libgui|ModelDrawable: Model animator state is serializable

skyjake · Dec 7, 2016 · fe91c63 · fe91c63
1 parent cd2ccff
commit fe91c63
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/doomsday/sdk/libgui/include/de/graphics/modeldrawable.h b/doomsday/sdk/libgui/include/de/graphics/modeldrawable.h
@@ -110,14 +110,14 @@ class LIBGUI_PUBLIC ModelDrawable : public AssetGroup
      *
      * @ingroup gl
      */
-    class LIBGUI_PUBLIC Animator : public Deletable
+    class LIBGUI_PUBLIC Animator : public Deletable, public ISerializable
     {
     public:
         /**
          * Specialized animators may derive from OngoingSequence to extend the amount of
          * data associated with each running animation sequence.
          */
-        class LIBGUI_PUBLIC OngoingSequence
+        class LIBGUI_PUBLIC OngoingSequence : public ISerializable
         {
         public:
             enum Flag
@@ -150,6 +150,10 @@ class LIBGUI_PUBLIC ModelDrawable : public AssetGroup
              */
             bool atEnd() const;
 
+            // ISerializable.
+            void operator >> (Writer &to) const override;
+            void operator << (Reader &from) override;
+
             /**
              * Constructs an OngoingSequence instance. This is used by default if no other
              * constructor is provided.
@@ -264,6 +268,10 @@ class LIBGUI_PUBLIC ModelDrawable : public AssetGroup
          */
         virtual Vector4f extraRotationForNode(String const &nodeName) const;
 
+        // ISerializable.
+        void operator >> (Writer &to) const override;
+        void operator << (Reader &from) override;
+
     private:
         DENG2_PRIVATE(d)
     };

diff --git a/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp b/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp
@@ -1889,6 +1889,7 @@ void ModelDrawable::Animator::stop(int index)
 
 void ModelDrawable::Animator::clear()
 {
+    qDeleteAll(d->anims);
     d->anims.clear();
 }
 
@@ -1913,6 +1914,17 @@ Vector4f ModelDrawable::Animator::extraRotationForNode(String const &) const
     return Vector4f();
 }
 
+void ModelDrawable::Animator::operator >> (Writer &to) const
+{
+    to.writeObjects(d->anims);
+}
+
+void ModelDrawable::Animator::operator << (Reader &from)
+{
+    clear();
+    from.readObjects<OngoingSequence>(d->anims, [this] () { return d->constructor(); });
+}
+
 void ModelDrawable::Animator::OngoingSequence::initialize()
 {}
 
@@ -1921,6 +1933,24 @@ bool ModelDrawable::Animator::OngoingSequence::atEnd() const
     return time >= duration;
 }
 
+void ModelDrawable::Animator::OngoingSequence::operator >> (Writer &to) const
+{
+    to << animId
+       << time
+       << duration
+       << node
+       << duint32(flags);
+}
+
+void ModelDrawable::Animator::OngoingSequence::operator << (Reader &from)
+{
+    from >> animId
+         >> time
+         >> duration
+         >> node;
+    from.readAs<duint32>(flags);
+}
+
 ModelDrawable::Animator::OngoingSequence *
 ModelDrawable::Animator::OngoingSequence::make() // static
 {