QtLottie: Drop expressions.

Telegram/ThirdParty/qtlottie

@@ -1 +1 @@
-Subproject commit 2a529ab07bd105e0cac1a58ad5cb77f2fdc8f20d
+Subproject commit 18b8ae7d9980f7e46980abfb275439782fc4c239

Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmbase_p.h

@@ -69,14 +69,11 @@ public:
     virtual bool setProperty(BMLiteral::PropertyType propertyType, QVariant value);
 
     QString name() const;
-    void setName(const QString &name);
 
     int type() const;
     void setType(int type);
     virtual void parse(const QJsonObject &definition);
 
-    const QJsonObject& definition() const;
-
     virtual bool active(int frame) const;
     bool hidden() const;
 
@@ -96,11 +93,9 @@ public:
 protected:
     virtual BMScene *resolveTopRoot() const;
     BMScene *topRoot() const;
-    const QJsonObject resolveExpression(const QJsonObject& definition);
 
 protected:
-    QJsonObject m_definition;
+    int m_type = 0;
-    int m_type;
     bool m_hidden = false;
     QString m_name;
     QString m_matchName;

Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmproperty_p.h

@@ -91,7 +91,6 @@ public:
             qCWarning(lcLottieQtBodymovinParser)
                     << "Property is split into separate x and y but it is not supported";
 
-        bool fromExpression = definition.value(QLatin1String("fromExpression")).toBool();
         m_animated = definition.value(QLatin1String("a")).toDouble() > 0;
         if (m_animated) {
             QJsonArray keyframes = definition.value(QLatin1String("k")).toArray();
@@ -99,15 +98,13 @@ public:
 			QJsonArray::const_iterator previous;
             while (it != keyframes.constEnd()) {
 				QJsonObject keyframe = (*it).toObject();
-                EasingSegment<T> easing = parseKeyframe(keyframe,
+                EasingSegment<T> easing = parseKeyframe(keyframe);
-                                                        fromExpression);
                 addEasing(easing);
 
 				if (m_easingCurves.length() > 1) {
 					postprocessEasingCurve(
 						m_easingCurves[m_easingCurves.length() - 2],
-						(*previous).toObject(),
+						(*previous).toObject());
-						fromExpression);
 				}
 				previous = it;
                 ++it;
@@ -118,8 +115,7 @@ public:
 				if (last.state == EasingSegmentState::Complete) {
 					postprocessEasingCurve(
 						last,
-						(*previous).toObject(),
+						(*previous).toObject());
-						fromExpression);
 				}
 			}
             m_value = T();
@@ -214,11 +210,8 @@ protected:
         return m_currentEasing;
     }
 
-    virtual EasingSegment<T> parseKeyframe(const QJsonObject keyframe,
+    virtual EasingSegment<T> parseKeyframe(const QJsonObject keyframe)
-                                           bool fromExpression)
     {
-        Q_UNUSED(fromExpression);
-
         EasingSegment<T> easing;
 
         int startTime = keyframe.value(QLatin1String("t")).toVariant().toInt();
@@ -274,8 +267,7 @@ protected:
 
 	virtual void postprocessEasingCurve(
 		EasingSegment<T> &easing,
-		const QJsonObject keyframe,
+		const QJsonObject keyframe) {
-		bool fromExpression) {
 	}
 
     virtual T getValue(const QJsonValue &value)
@@ -327,8 +319,7 @@ protected:
             return T();
     }
 
-    EasingSegment<T> parseKeyframe(const QJsonObject keyframe,
+    EasingSegment<T> parseKeyframe(const QJsonObject keyframe) override
-                                   bool fromExpression) override
     {
         QJsonArray startValues = keyframe.value(QLatin1String("s")).toArray();
         QJsonArray endValues = keyframe.value(QLatin1String("e")).toArray();
@@ -363,15 +354,8 @@ protected:
             this->m_startFrame = startTime;
 
         qreal xs, ys;
-        // Keyframes originating from an expression use only scalar values.
+        xs = startValues.at(0).toDouble();
-        // They must be expanded for both x and y coordinates
+        ys = startValues.at(1).toDouble();
-        if (fromExpression) {
-            xs = startValues.at(0).toDouble();
-            ys = startValues.at(0).toDouble();
-        } else {
-            xs = startValues.at(0).toDouble();
-            ys = startValues.at(1).toDouble();
-        }
         T s(xs, ys);
 
         QJsonObject easingIn = keyframe.value(QLatin1String("i")).toObject();
@@ -381,15 +365,8 @@ protected:
         easingCurve.startValue = s;
         if (!endValues.isEmpty()) {
             qreal xe, ye;
-            // Keyframes originating from an expression use only scalar values.
+            xe = endValues.at(0).toDouble();
-            // They must be expanded for both x and y coordinates
+            ye = endValues.at(1).toDouble();
-            if (fromExpression) {
-                xe = endValues.at(0).toDouble();
-                ye = endValues.at(0).toDouble();
-            } else {
-                xe = endValues.at(0).toDouble();
-                ye = endValues.at(1).toDouble();
-            }
             T e(xe, ye);
             easingCurve.endValue = e;
             easingCurve.state = EasingSegmentState::Complete;

Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmscene_p.h

@@ -94,6 +94,9 @@ private:
 
 	bool _unsupported = false;
 
+	// Parsing stage.
+	bool _parsing = false;
+
 };
 
 QT_END_NAMESPACE

Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmspatialproperty_p.h

@@ -59,37 +59,21 @@ public:
 
 	virtual void postprocessEasingCurve(
 			EasingSegment<QPointF> &easing,
-			const QJsonObject keyframe,
+			const QJsonObject keyframe) override {
-			bool fromExpression) override {
         // No need to parse further incomplete keyframes (i.e. last keyframes)
         if (easing.state != EasingSegmentState::Complete) {
             return;
         }
 
         qreal tix = 0, tiy = 0, tox = 0, toy = 0;
-        if (fromExpression) {
+        QJsonArray tiArr = keyframe.value(QLatin1String("ti")).toArray();
-            // If spatial property definition originates from
+        QJsonArray toArr = keyframe.value(QLatin1String("to")).toArray();
-            // an expression (specifically Slider), it contains scalar
-            // property. It must be expanded to both x and y coordinates
-            QJsonArray iArr = keyframe.value(QLatin1String("i")).toArray();
-            QJsonArray oArr = keyframe.value(QLatin1String("o")).toArray();
 
-            if (iArr.count() && oArr.count()) {
+        if (tiArr.count() && toArr.count()) {
-                tix = iArr.at(0).toDouble();
+            tix = tiArr.at(0).toDouble();
-                tiy = tix;
+            tiy = tiArr.at(1).toDouble();
-                tox = oArr.at(0).toDouble();
+            tox = toArr.at(0).toDouble();
-                toy = tox;
+            toy = toArr.at(1).toDouble();
-            }
-        } else {
-            QJsonArray tiArr = keyframe.value(QLatin1String("ti")).toArray();
-            QJsonArray toArr = keyframe.value(QLatin1String("to")).toArray();
-
-            if (tiArr.count() && toArr.count()) {
-                tix = tiArr.at(0).toDouble();
-                tiy = tiArr.at(1).toDouble();
-                tox = toArr.at(0).toDouble();
-                toy = toArr.at(1).toDouble();
-            }
         }
         QPointF s(easing.startValue);
         QPointF e(easing.endValue);