ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-11 00:40:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

rlottie: use correct default opacity value.

Browse Source
This commit is contained in:
subhransu mohanty 2019-06-25 19:04:11 +09:00 committed by Subhransu
parent 7339baf3e5
commit 88593df18d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lottie/lottiemodel.h
View File

@ -613,7 +613,7 @@ class LOTFillData : public LOTData
public: public:
LOTFillData():LOTData(LOTData::Type::Fill){} LOTFillData():LOTData(LOTData::Type::Fill){}
LottieColor color(int frameNo) const {return mColor.value(frameNo);} LottieColor color(int frameNo) const {return mColor.value(frameNo);}
float opacity(int frameNo) const {return mOpacity.value(frameNo)/100.0;} float opacity(int frameNo) const {return mOpacity.value(frameNo)/100.0f;}
FillRule fillRule() const {return mFillRule;} FillRule fillRule() const {return mFillRule;}
public: public:
FillRule mFillRule{FillRule::Winding}; /* "r" */ FillRule mFillRule{FillRule::Winding}; /* "r" */
@ -634,7 +634,7 @@ class LOTStrokeData : public LOTData
public: public:
LOTStrokeData():LOTData(LOTData::Type::Stroke){} LOTStrokeData():LOTData(LOTData::Type::Stroke){}
LottieColor color(int frameNo) const {return mColor.value(frameNo);} LottieColor color(int frameNo) const {return mColor.value(frameNo);}
float opacity(int frameNo) const {return mOpacity.value(frameNo)/100.0;} float opacity(int frameNo) const {return mOpacity.value(frameNo)/100.0f;}
float strokeWidth(int frameNo) const {return mWidth.value(frameNo);} float strokeWidth(int frameNo) const {return mWidth.value(frameNo);}
CapStyle capStyle() const {return mCapStyle;} CapStyle capStyle() const {return mCapStyle;}
JoinStyle joinStyle() const {return mJoinStyle;} JoinStyle joinStyle() const {return mJoinStyle;}
@ -712,7 +712,7 @@ class LOTGradient : public LOTData
{ {
public: public:
explicit LOTGradient(LOTData::Type type):LOTData(type){} explicit LOTGradient(LOTData::Type type):LOTData(type){}
inline float opacity(int frameNo) const {return mOpacity.value(frameNo)/100.0;} inline float opacity(int frameNo) const {return mOpacity.value(frameNo)/100.0f;}
void update(std::unique_ptr<VGradient> &grad, int frameNo); void update(std::unique_ptr<VGradient> &grad, int frameNo);
private: private:
@ -723,7 +723,7 @@ public:
LOTAnimatable<VPointF> mEndPoint; /* "e" */ LOTAnimatable<VPointF> mEndPoint; /* "e" */
LOTAnimatable<float> mHighlightLength{0}; /* "h" */ LOTAnimatable<float> mHighlightLength{0}; /* "h" */
LOTAnimatable<float> mHighlightAngle{0}; /* "a" */ LOTAnimatable<float> mHighlightAngle{0}; /* "a" */
LOTAnimatable<int> mOpacity{0}; /* "o" */ LOTAnimatable<float> mOpacity{100}; /* "o" */
LOTAnimatable<LottieGradient> mGradient; /* "g" */ LOTAnimatable<LottieGradient> mGradient; /* "g" */
int mColorPoints{-1}; int mColorPoints{-1};
bool mEnabled{true}; /* "fillEnabled" */ bool mEnabled{true}; /* "fillEnabled" */
@ -789,7 +789,7 @@ public:
bool isStatic() const {return mIsStatic;} bool isStatic() const {return mIsStatic;}
public: public:
LOTAnimatable<LottieShapeData> mShape; LOTAnimatable<LottieShapeData> mShape;
LOTAnimatable<float> mOpacity; LOTAnimatable<float> mOpacity{100};
bool mInv{false}; bool mInv{false};
bool mIsStatic{true}; bool mIsStatic{true};
LOTMaskData::Mode mMode; LOTMaskData::Mode mMode;