diff options
-rw-r--r-- | experimental/skotty/Skotty.cpp | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/experimental/skotty/Skotty.cpp b/experimental/skotty/Skotty.cpp index 84cc08051f..b331547316 100644 --- a/experimental/skotty/Skotty.cpp +++ b/experimental/skotty/Skotty.cpp @@ -60,26 +60,34 @@ bool AttachProperty(const Json::Value& jprop, AttachContext* ctx, const sk_sp<No if (!jprop.isObject()) return false; - if (!ParseBool(jprop["a"], false)) { - // Static property. + const auto& jpropA = jprop["a"]; + const auto& jpropK = jprop["k"]; + + // Older Json versions don't have an "a" animation marker. + // For those, we attempt to parse both ways. + if (jpropA.isNull() || !ParseBool(jpropA, "false")) { ValueT val; - if (!ValueT::Parse(jprop["k"], &val)) { - return LogFail(jprop, "Could not parse static property"); + if (ValueT::Parse(jpropK, &val)) { + // Static property. + apply(node, val.template as<AttrT>()); + return true; } - apply(node, val.template as<AttrT>()); - } else { - // Keyframe property. - using AnimatorT = Animator<ValueT, AttrT, NodeT>; - auto animator = AnimatorT::Make(jprop["k"], node, std::move(apply)); - - if (!animator) { - return LogFail(jprop, "Could not instantiate keyframe animator"); + if (!jpropA.isNull()) { + return LogFail(jprop, "Could not parse (explicit) static property"); } + } + + // Keyframe property. + using AnimatorT = Animator<ValueT, AttrT, NodeT>; + auto animator = AnimatorT::Make(jpropK, node, std::move(apply)); - ctx->fAnimators.push_back(std::move(animator)); + if (!animator) { + return LogFail(jprop, "Could not parse keyframed property"); } + ctx->fAnimators.push_back(std::move(animator)); + return true; } |