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

lottie/text: Support line spacing

Browse source 
Compute line spacing based on the text range selector, applying the maximum spacing value for each line.
issue: https://github.com/thorvg/thorvg/issues/2178
This commit is contained in:
Jinny You 2024-09-10 11:44:32 +09:00 • committed by Hermet Park
parent 371139e220
commit bf3e861b5a
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1003,6 +1003,8 @@ void LottieBuilder::updateText(LottieLayer* layer, float frameNo)
auto scene = Scene::gen(); auto scene = Scene::gen();
int line = 0; int line = 0;
int space = 0; int space = 0;
auto lineSpacing = 0.0f;
auto totalLineSpacing = 0.0f;
//text string //text string
int idx = 0; int idx = 0;
@ -1028,10 +1030,13 @@ void LottieBuilder::updateText(LottieLayer* layer, float frameNo)
if (*p == '\0') break; if (*p == '\0') break;
++p; ++p;
totalLineSpacing += lineSpacing;
lineSpacing = 0.0f;
//new text group, single scene for each line //new text group, single scene for each line
scene = Scene::gen(); scene = Scene::gen();
cursor.x = 0.0f; cursor.x = 0.0f;
cursor.y = ++line * (doc.height / scale); cursor.y = (++line * doc.height + totalLineSpacing) / scale;
continue; continue;
} }
@ -1100,6 +1105,9 @@ void LottieBuilder::updateText(LottieLayer* layer, float frameNo)
shape->stroke(strokeColor.rgb[0], strokeColor.rgb[1], strokeColor.rgb[2], (*s)->style.strokeOpacity(frameNo)); shape->stroke(strokeColor.rgb[0], strokeColor.rgb[1], strokeColor.rgb[2], (*s)->style.strokeOpacity(frameNo));
} }
cursor.x += (*s)->style.letterSpacing(frameNo); cursor.x += (*s)->style.letterSpacing(frameNo);
auto spacing = (*s)->style.lineSpacing(frameNo);
if (spacing > lineSpacing) lineSpacing = spacing;
} }
scene->push(cast(shape)); scene->push(cast(shape));

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

@ -158,6 +158,7 @@ struct LottieTextStyle
LottiePosition position = Point{0, 0}; LottiePosition position = Point{0, 0};
LottiePoint scale = Point{100, 100}; LottiePoint scale = Point{100, 100};
LottieFloat letterSpacing = 0.0f; LottieFloat letterSpacing = 0.0f;
LottieFloat lineSpacing = 0.0f;
LottieFloat strokeWidth = 0.0f; LottieFloat strokeWidth = 0.0f;
LottieFloat rotation = 0.0f; LottieFloat rotation = 0.0f;
LottieOpacity fillOpacity = 255; LottieOpacity fillOpacity = 255;

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

@ -1136,6 +1136,7 @@ void LottieParser::parseTextRange(LottieText* text)
enterObject(); enterObject();
while (auto key = nextObjectKey()) { while (auto key = nextObjectKey()) {
if (KEY_AS("t")) parseProperty<LottieProperty::Type::Float>(selector->style.letterSpacing); if (KEY_AS("t")) parseProperty<LottieProperty::Type::Float>(selector->style.letterSpacing);
else if (KEY_AS("ls")) parseProperty<LottieProperty::Type::Color>(selector->style.lineSpacing);
else if (KEY_AS("fc")) parseProperty<LottieProperty::Type::Color>(selector->style.fillColor); else if (KEY_AS("fc")) parseProperty<LottieProperty::Type::Color>(selector->style.fillColor);
else if (KEY_AS("fo")) parseProperty<LottieProperty::Type::Color>(selector->style.fillOpacity); else if (KEY_AS("fo")) parseProperty<LottieProperty::Type::Color>(selector->style.fillOpacity);
else if (KEY_AS("sw")) parseProperty<LottieProperty::Type::Float>(selector->style.strokeWidth); else if (KEY_AS("sw")) parseProperty<LottieProperty::Type::Float>(selector->style.strokeWidth);