diff options
author | 2018-01-22 12:57:06 -0500 | |
---|---|---|
committer | 2018-01-22 18:31:17 +0000 | |
commit | 35efaa8fd7538f636dfd3593f172a961745a5cd8 (patch) | |
tree | 30ecabe76f9e9f826cbc65a729f9656648c69b24 /experimental/skottie/Skottie.h | |
parent | 5d750edfdd4fcf75bc51155f29f553bb0c46b59d (diff) |
[sksg] Animator, Scene
Relocate some reusable logic from Skottie
TBR=
Change-Id: I8764e666c9f1127ed895ee1d16cd66d052469ac5
Reviewed-on: https://skia-review.googlesource.com/98160
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'experimental/skottie/Skottie.h')
-rw-r--r-- | experimental/skottie/Skottie.h | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/experimental/skottie/Skottie.h b/experimental/skottie/Skottie.h index e13bd0ae98..d2486dc946 100644 --- a/experimental/skottie/Skottie.h +++ b/experimental/skottie/Skottie.h @@ -23,12 +23,10 @@ class SkStream; namespace Json { class Value; } -namespace sksg { class RenderNode; } +namespace sksg { class Scene; } namespace skottie { -class AnimatorBase; - class ResourceProvider : public SkNoncopyable { public: virtual ~ResourceProvider() = default; @@ -54,23 +52,20 @@ public: SkScalar inPoint() const { return fInPoint; } SkScalar outPoint() const { return fOutPoint; } - void setShowInval(bool show) { fShowInval = show; } + void setShowInval(bool show); private: Animation(const ResourceProvider&, SkString ver, const SkSize& size, SkScalar fps, const Json::Value&); - SkString fVersion; - SkSize fSize; - SkScalar fFrameRate, - fInPoint, - fOutPoint; - - sk_sp<sksg::RenderNode> fDom; - SkTArray<std::unique_ptr<AnimatorBase>> fAnimators; + SkString fVersion; + SkSize fSize; + SkScalar fFrameRate, + fInPoint, + fOutPoint; - bool fShowInval = false; + std::unique_ptr<sksg::Scene> fScene; typedef SkNoncopyable INHERITED; }; |