QtLottie: Apply even inactive parent transforms.

This commit is contained in:
John Preston 2019-05-10 12:04:41 +03:00
parent 3f1ec52e6c
commit 801580c46f
5 changed files with 7 additions and 8 deletions

@ -1 +1 @@
Subproject commit 9162dace0879b9190cefac0468c4dc4f92579488
Subproject commit 5630703850784e58aad0a02394004e07b1cd3c8b

View File

@ -53,11 +53,9 @@ public:
enum MatteClipMode {NoClip, Alpha, InvertedAlpha, Luminence, InvertedLuminence};
BMLayer() = default;
explicit BMLayer (const BMLayer &other);
explicit BMLayer (const BMLayer &other);
~BMLayer() override;
BMBase *clone() const override;
static BMLayer *construct(QJsonObject definition);
bool active(int frame) const override;
@ -97,6 +95,8 @@ protected:
int m_td = 0;
MatteClipMode m_clipMode = NoClip;
bool m_updated = false;
private:
void parseEffects(const QJsonArray &definition, BMBase *effectRoot = nullptr);

View File

@ -52,7 +52,7 @@ class BMShape;
class BMTrimPath;
class BMBasicTransform;
class BODYMOVIN_EXPORT BMNullLayer : public BMLayer
class BODYMOVIN_EXPORT BMNullLayer final : public BMLayer
{
public:
BMNullLayer() = default;
@ -62,7 +62,6 @@ public:
BMBase *clone() const override;
void updateProperties(int frame) override;
void render(LottieRenderer &render, int frame) const override;
};

View File

@ -52,7 +52,7 @@ class BMShape;
class BMTrimPath;
class BMBasicTransform;
class BODYMOVIN_EXPORT BMPreCompLayer : public BMLayer
class BODYMOVIN_EXPORT BMPreCompLayer final : public BMLayer
{
public:
BMPreCompLayer() = default;

View File

@ -52,7 +52,7 @@ class BMShape;
class BMTrimPath;
class BMBasicTransform;
class BODYMOVIN_EXPORT BMShapeLayer : public BMLayer
class BODYMOVIN_EXPORT BMShapeLayer final : public BMLayer
{
public:
BMShapeLayer() = default;