git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-08 05:33:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

lottie: support Tritone LayerEffect

Browse source 
issue: https://github.com/thorvg/thorvg/issues/2718
This commit is contained in:
Hermet Park 2024-12-17 15:57:55 +09:00
parent 8ec2eee6e3
commit 4a1fc2bff0
4 changed files with 78 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/loaders/lottie/tvgLottieBuilder.cpp
View file

@ -1314,17 +1314,9 @@ void LottieBuilder::updateEffect(LottieLayer* layer, float frameNo)
for (auto ef = layer->effects.begin(); ef < layer->effects.end(); ++ef) {
if (!(*ef)->enable) continue;
switch ((*ef)->type) {
case LottieEffect::Tint: {
auto effect = static_cast<LottieFxTint*>(*ef);
auto black = effect->black(frameNo);
auto white = effect->white(frameNo);
layer->scene->push(SceneEffect::Tint, black.rgb[0], black.rgb[1], black.rgb[2], white.rgb[0], white.rgb[1], white.rgb[2], effect->intensity(frameNo));
break;
}
case LottieEffect::Fill: {
auto effect = static_cast<LottieFxFill*>(*ef);
auto color = effect->color(frameNo);
layer->scene->push(SceneEffect::Fill, color.rgb[0], color.rgb[1], color.rgb[2], (int)(255.0f *effect->opacity(frameNo)));
case LottieEffect::GaussianBlur: {
auto effect = static_cast<LottieFxGaussianBlur*>(*ef);
layer->scene->push(SceneEffect::GaussianBlur, effect->blurness(frameNo) * BLUR_TO_SIGMA, effect->direction(frameNo) - 1, effect->wrap(frameNo), QUALITY);
break;
}
case LottieEffect::DropShadow: {
@ -1333,9 +1325,25 @@ void LottieBuilder::updateEffect(LottieLayer* layer, float frameNo)
layer->scene->push(SceneEffect::DropShadow, color.rgb[0], color.rgb[1], color.rgb[2], (int)effect->opacity(frameNo), effect->angle(frameNo), effect->distance(frameNo), effect->blurness(frameNo) * BLUR_TO_SIGMA, QUALITY);
break;
}
case LottieEffect::GaussianBlur: {
auto effect = static_cast<LottieFxGaussianBlur*>(*ef);
layer->scene->push(SceneEffect::GaussianBlur, effect->blurness(frameNo) * BLUR_TO_SIGMA, effect->direction(frameNo) - 1, effect->wrap(frameNo), QUALITY);
case LottieEffect::Fill: {
auto effect = static_cast<LottieFxFill*>(*ef);
auto color = effect->color(frameNo);
layer->scene->push(SceneEffect::Fill, color.rgb[0], color.rgb[1], color.rgb[2], (int)(255.0f *effect->opacity(frameNo)));
break;
}
case LottieEffect::Tint: {
auto effect = static_cast<LottieFxTint*>(*ef);
auto black = effect->black(frameNo);
auto white = effect->white(frameNo);
layer->scene->push(SceneEffect::Tint, black.rgb[0], black.rgb[1], black.rgb[2], white.rgb[0], white.rgb[1], white.rgb[2], effect->intensity(frameNo));
break;
}
case LottieEffect::Tritone: {
auto effect = static_cast<LottieFxTritone*>(*ef);
auto dark = effect->dark(frameNo);
auto midtone = effect->midtone(frameNo);
auto bright = effect->bright(frameNo);
layer->scene->push(SceneEffect::Tritone, dark.rgb[0], dark.rgb[1], dark.rgb[2], midtone.rgb[0], midtone.rgb[1], midtone.rgb[2], bright.rgb[0], bright.rgb[1], bright.rgb[2]);
break;
}
default: break;

35
src/loaders/lottie/tvgLottieModel.h
View file

@ -79,34 +79,26 @@ struct LottieStroke
struct LottieEffect
{
enum Type : uint8_t
{
DropShadow = 0,
GaussianBlur,
Fill,
Tint
};
enum Type : uint8_t {Tint = 20, Fill, Tritone = 23, DropShadow = 25, GaussianBlur = 29};
virtual ~LottieEffect() {}
Type type;
bool enable = false;
};
struct LottieFxFill : LottieEffect
{
//LottieFloat fillMask?
//int16_t mask layer
//LottieDropDown allMask?
LottieColor color;
//LottieDropDown inverted
//LottieSlider horizontalFeather
//LottieSlider verticalFeather
LottieSlider opacity = 0;
LottieSlider opacity;
LottieFxFill()
{
type = Fill;
type = LottieEffect::Fill;
}
};
@ -118,7 +110,19 @@ struct LottieFxTint : LottieEffect
LottieFxTint()
{
type = Tint;
type = LottieEffect::Tint;
}
};
struct LottieFxTritone : LottieEffect
{
LottieColor bright;
LottieColor midtone;
LottieColor dark;
LottieFxTritone()
{
type = LottieEffect::Tritone;
}
};
@ -132,11 +136,10 @@ struct LottieFxDropShadow : LottieEffect
LottieFxDropShadow()
{
type = DropShadow;
type = LottieEffect::DropShadow;
}
};
struct LottieFxGaussianBlur : LottieEffect
{
LottieSlider blurness = 0.0f;
@ -145,7 +148,7 @@ struct LottieFxGaussianBlur : LottieEffect
LottieFxGaussianBlur()
{
type = GaussianBlur;
type = LottieEffect::GaussianBlur;
}
};

42
src/loaders/lottie/tvgLottieParser.cpp
View file

@ -60,10 +60,11 @@ static unsigned long _int2str(int num)
LottieEffect* LottieParser::getEffect(int type)
{
switch (type) {
case 20: return new LottieFxTint;
case 21: return new LottieFxFill;
case 25: return new LottieFxDropShadow;
case 29: return new LottieFxGaussianBlur;
case LottieEffect::Tint: return new LottieFxTint;
case LottieEffect::Fill: return new LottieFxFill;
case LottieEffect::Tritone: return new LottieFxTritone;
case LottieEffect::DropShadow: return new LottieFxDropShadow;
case LottieEffect::GaussianBlur: return new LottieFxGaussianBlur;
default: return nullptr;
}
}
@ -1294,6 +1295,31 @@ void LottieParser::parseTint(LottieFxTint* effect)
}
void LottieParser::parseTritone(LottieFxTritone* effect)
{
int idx = 0; //bright, midtone, dark
enterArray();
while (nextArrayValue()) {
enterObject();
while (auto key = nextObjectKey()) {
if (KEY_AS("v")) {
enterObject();
while (auto key = nextObjectKey()) {
if (KEY_AS("k")) {
if (idx == 0) parsePropertyInternal(effect->bright);
else if (idx == 1) parsePropertyInternal(effect->midtone);
else if (idx == 2) parsePropertyInternal(effect->dark);
else skip();
} else skip();
}
++idx;
} else skip();
}
}
}
void LottieParser::parseFill(LottieFxFill* effect)
{
int idx = 0; //fill mask -> all mask -> color -> invert -> h feather -> v feather -> opacity
@ -1378,14 +1404,18 @@ void LottieParser::parseEffect(LottieEffect* effect)
parseFill(static_cast<LottieFxFill*>(effect));
break;
}
case LottieEffect::GaussianBlur: {
parseGaussianBlur(static_cast<LottieFxGaussianBlur*>(effect));
case LottieEffect::Tritone: {
parseTritone(static_cast<LottieFxTritone*>(effect));
break;
}
case LottieEffect::DropShadow: {
parseDropShadow(static_cast<LottieFxDropShadow*>(effect));
break;
}
case LottieEffect::GaussianBlur: {
parseGaussianBlur(static_cast<LottieFxGaussianBlur*>(effect));
break;
}
default: break;
}
}

1
src/loaders/lottie/tvgLottieParser.h
View file

@ -98,6 +98,7 @@ private:
LottieFont* parseFont();
LottieMarker* parseMarker();
void parseTritone(LottieFxTritone* effect);
void parseTint(LottieFxTint* effect);
void parseFill(LottieFxFill* effect);
void parseGaussianBlur(LottieFxGaussianBlur* effect);