mirror of https://github.com/procxx/kepka.git
QtLottie: Apply even inactive parent transforms.
This commit is contained in:
parent
3f1ec52e6c
commit
801580c46f
|
@ -1 +1 @@
|
||||||
Subproject commit 9162dace0879b9190cefac0468c4dc4f92579488
|
Subproject commit 5630703850784e58aad0a02394004e07b1cd3c8b
|
|
@ -56,8 +56,6 @@ public:
|
||||||
explicit BMLayer (const BMLayer &other);
|
explicit BMLayer (const BMLayer &other);
|
||||||
~BMLayer() override;
|
~BMLayer() override;
|
||||||
|
|
||||||
BMBase *clone() const override;
|
|
||||||
|
|
||||||
static BMLayer *construct(QJsonObject definition);
|
static BMLayer *construct(QJsonObject definition);
|
||||||
|
|
||||||
bool active(int frame) const override;
|
bool active(int frame) const override;
|
||||||
|
@ -97,6 +95,8 @@ protected:
|
||||||
int m_td = 0;
|
int m_td = 0;
|
||||||
MatteClipMode m_clipMode = NoClip;
|
MatteClipMode m_clipMode = NoClip;
|
||||||
|
|
||||||
|
bool m_updated = false;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void parseEffects(const QJsonArray &definition, BMBase *effectRoot = nullptr);
|
void parseEffects(const QJsonArray &definition, BMBase *effectRoot = nullptr);
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ class BMShape;
|
||||||
class BMTrimPath;
|
class BMTrimPath;
|
||||||
class BMBasicTransform;
|
class BMBasicTransform;
|
||||||
|
|
||||||
class BODYMOVIN_EXPORT BMNullLayer : public BMLayer
|
class BODYMOVIN_EXPORT BMNullLayer final : public BMLayer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
BMNullLayer() = default;
|
BMNullLayer() = default;
|
||||||
|
@ -62,7 +62,6 @@ public:
|
||||||
|
|
||||||
BMBase *clone() const override;
|
BMBase *clone() const override;
|
||||||
|
|
||||||
void updateProperties(int frame) override;
|
|
||||||
void render(LottieRenderer &render, int frame) const override;
|
void render(LottieRenderer &render, int frame) const override;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -52,7 +52,7 @@ class BMShape;
|
||||||
class BMTrimPath;
|
class BMTrimPath;
|
||||||
class BMBasicTransform;
|
class BMBasicTransform;
|
||||||
|
|
||||||
class BODYMOVIN_EXPORT BMPreCompLayer : public BMLayer
|
class BODYMOVIN_EXPORT BMPreCompLayer final : public BMLayer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
BMPreCompLayer() = default;
|
BMPreCompLayer() = default;
|
||||||
|
|
|
@ -52,7 +52,7 @@ class BMShape;
|
||||||
class BMTrimPath;
|
class BMTrimPath;
|
||||||
class BMBasicTransform;
|
class BMBasicTransform;
|
||||||
|
|
||||||
class BODYMOVIN_EXPORT BMShapeLayer : public BMLayer
|
class BODYMOVIN_EXPORT BMShapeLayer final : public BMLayer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
BMShapeLayer() = default;
|
BMShapeLayer() = default;
|
||||||
|
|
Loading…
Reference in New Issue