ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-09 03:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] Lottie

Browse Source
This commit is contained in:
Isaac 2024-05-15 01:02:32 +04:00
parent e926ad9776
commit 059e8b9eaf
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
submodules/TelegramUI/Components/LottieCpp/PublicHeaders/LottieCpp/RenderTreeNode.h
View File

@ -344,7 +344,9 @@ public:
public:
bool isGroup = false;
CATransform3D transform = CATransform3D::identity();
std::vector<std::shared_ptr<RenderTreeNodeContentShadingVariant>> shadings;
std::vector<std::shared_ptr<RenderTreeNodeContentItem>> subItems;
};
class RenderTreeNodeContentShadingVariant {
@ -358,7 +360,6 @@ public:
std::optional<std::vector<BezierPath>> explicitPath;
size_t subItemLimit = 0;
bool isGroup = false;
};
class ProcessedRenderTreeNodeData {

19
submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/ShapeCompositionLayer.cpp
View File

@ -925,11 +925,13 @@ public:
std::shared_ptr<RenderTreeNode> _renderTree;
private:
std::vector<TransformedPath> collectPaths(size_t subItemLimit, CATransform3D parentTransform) {
std::vector<TransformedPath> collectPaths(size_t subItemLimit, CATransform3D const &parentTransform, bool skipApplyTransform) {
std::vector<TransformedPath> mappedPaths;
CATransform3D effectiveTransform = parentTransform;
CATransform3D effectiveChildTransform = parentTransform;
if (!skipApplyTransform && isGroup && transform) {
effectiveTransform = transform->transform() * effectiveTransform;
}
size_t maxSubitem = std::min(subItems.size(), subItemLimit);
@ -939,22 +941,13 @@ public:
for (size_t i = 0; i < maxSubitem; i++) {
auto &subItem = subItems[i];
CATransform3D subItemTransform = effectiveChildTransform;
if (subItem->isGroup && subItem->transform) {
//update?
//subItem->transform->update(frameTime);
subItemTransform = subItem->transform->transform() * subItemTransform;
}
std::optional<TrimParams> currentTrim;
if (!trims.empty()) {
//update?
//trims[0]->update(frameTime);
currentTrim = trims[0]->trimParams();
}
auto subItemPaths = subItem->collectPaths(INT32_MAX, subItemTransform);
auto subItemPaths = subItem->collectPaths(INT32_MAX, effectiveTransform, false);
if (currentTrim) {
CompoundBezierPath tempPath;
@ -1104,7 +1097,7 @@ public:
}
CompoundBezierPath compoundPath;
auto paths = collectPaths(shadingVariant.subItemLimit, CATransform3D::identity());
auto paths = collectPaths(shadingVariant.subItemLimit, CATransform3D::identity(), true);
for (const auto &path : paths) {
compoundPath.appendPath(path.path.copyUsingTransform(path.transform));
}