RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support new skin color modifiers in rlottie.

This commit is contained in:
John Preston 2021-11-26 20:16:53 +04:00
parent 47074b48d6
commit 92e398e0b7
3 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
View File

@ -55,49 +55,24 @@ constexpr auto kRefreshTimeout = 7200 * crl::time(1000);
Expects(index >= 1 && index <= 5);
static const auto color1 = Lottie::ColorReplacements{
{
{ 0xf77e41U, 0xcb7b55U },
{ 0xffb139U, 0xf6b689U },
{ 0xffd140U, 0xffcda7U },
{ 0xffdf79U, 0xffdfc5U },
},
1,
.modifier = Lottie::SkinModifier::Color1,
.tag = 1,
};
static const auto color2 = Lottie::ColorReplacements{
{
{ 0xf77e41U, 0xa45a38U },
{ 0xffb139U, 0xdf986bU },
{ 0xffd140U, 0xedb183U },
{ 0xffdf79U, 0xf4c3a0U },
},
2,
.modifier = Lottie::SkinModifier::Color2,
.tag = 2,
};
static const auto color3 = Lottie::ColorReplacements{
{
{ 0xf77e41U, 0x703a17U },
{ 0xffb139U, 0xab673dU },
{ 0xffd140U, 0xc37f4eU },
{ 0xffdf79U, 0xd89667U },
},
3,
.modifier = Lottie::SkinModifier::Color3,
.tag = 3,
};
static const auto color4 = Lottie::ColorReplacements{
{
{ 0xf77e41U, 0x4a2409U },
{ 0xffb139U, 0x7d3e0eU },
{ 0xffd140U, 0x965529U },
{ 0xffdf79U, 0xa96337U },
},
4,
.modifier = Lottie::SkinModifier::Color4,
.tag = 4,
};
static const auto color5 = Lottie::ColorReplacements{
{
{ 0xf77e41U, 0x200f0aU },
{ 0xffb139U, 0x412924U },
{ 0xffd140U, 0x593d37U },
{ 0xffdf79U, 0x63453fU },
},
5,
.modifier = Lottie::SkinModifier::Color5,
.tag = 5,
};
static const auto list = std::array{
&color1,

2
Telegram/ThirdParty/rlottie vendored

@ -1 +1 @@
Subproject commit cbd43984ebdf783e94c8303c41385bf82aa36d5b
Subproject commit 8c69fc20cf2e150db304311f1233a4b55a8892d7

2
Telegram/lib_lottie

@ -1 +1 @@
Subproject commit c75d91f75ef87077f07ea6f7087343274b3eb5ff
Subproject commit fd4d8576adb611780d1dc7dcce4fe0115eabc9c0