ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-15 21:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Isaac 2024-05-16 17:03:42 +04:00
parent 0225f74d30
commit ebb7798cff
3 changed files with 32 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/LottieMetalTest/Sources/ViewController.swift
View File

@ -78,7 +78,7 @@ private final class ReferenceCompareTest {
}
var continueFromName: String?
continueFromName = "1391391008142393362.json"
//continueFromName = "1391391008142393362.json"
let _ = await processAnimationFolderAsync(basePath: bundlePath, path: "", stopOnFailure: true, process: { path, name, alwaysDraw in
if let continueFromNameValue = continueFromName {

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

@ -909,10 +909,6 @@ public:
transform = std::move(transform_);
}
std::shared_ptr<RenderTreeNode> const &renderTree() const {
return _renderTree;
}
private:
std::unique_ptr<PathOutput> path;
std::unique_ptr<TransformOutput> transform;
@ -922,7 +918,8 @@ public:
std::vector<std::shared_ptr<ContentItem>> subItems;
std::shared_ptr<RenderTreeNode> _renderTree;
public:
std::shared_ptr<RenderTreeNodeContentItem> _contentItem;
private:
std::vector<TransformedPath> collectPaths(size_t subItemLimit, CATransform3D const &parentTransform, bool skipApplyTransform) {
@ -993,20 +990,8 @@ public:
public:
void initializeRenderChildren() {
_renderTree = std::make_shared<RenderTreeNode>(
CGRect(0.0, 0.0, 0.0, 0.0),
Vector2D(0.0, 0.0),
CATransform3D::identity(),
1.0,
false,
false,
std::vector<std::shared_ptr<RenderTreeNode>>(),
nullptr,
false
);
_renderTree->_contentItem = std::make_shared<RenderTreeNodeContentItem>();
_renderTree->_contentItem->isGroup = isGroup;
_contentItem = std::make_shared<RenderTreeNodeContentItem>();
_contentItem->isGroup = isGroup;
if (!shadings.empty()) {
for (int i = 0; i < shadings.size(); i++) {
@ -1025,7 +1010,7 @@ public:
}
itemShadingVariant->subItemLimit = shadingVariant.subItemLimit;
_renderTree->_contentItem->shadings.push_back(itemShadingVariant);
_contentItem->shadings.push_back(itemShadingVariant);
}
}
@ -1033,23 +1018,8 @@ public:
std::vector<std::shared_ptr<RenderTreeNode>> subItemNodes;
for (int i = (int)subItems.size() - 1; i >= 0; i--) {
subItems[i]->initializeRenderChildren();
subItemNodes.push_back(subItems[i]->_renderTree);
_renderTree->_contentItem->subItems.push_back(subItems[i]->_renderTree->_contentItem);
_contentItem->subItems.push_back(subItems[i]->_contentItem);
}
/*if (!subItemNodes.empty()) {
_renderTree->_subnodes.push_back(std::make_shared<RenderTreeNode>(
CGRect(0.0, 0.0, 0.0, 0.0),
Vector2D(0.0, 0.0),
CATransform3D::identity(),
1.0,
false,
false,
subItemNodes,
nullptr,
false
));
}*/
}
}
@ -1087,11 +1057,8 @@ public:
containerTransform = transform->transform();
containerOpacity = transform->opacity();
}
_renderTree->_contentItem->transform = containerTransform;
_renderTree->_contentItem->alpha = containerOpacity;
_renderTree->_transform = containerTransform;
_renderTree->_alpha = containerOpacity;
_contentItem->transform = containerTransform;
_contentItem->alpha = containerOpacity;
for (int i = 0; i < shadings.size(); i++) {
const auto &shadingVariant = shadings[i];
@ -1121,7 +1088,7 @@ public:
resultPaths.push_back(path);
}
_renderTree->_contentItem->shadings[i]->explicitPath = resultPaths;
_contentItem->shadings[i]->explicitPath = resultPaths;
}
if (isGroup && !subItems.empty()) {
@ -1321,8 +1288,22 @@ std::shared_ptr<RenderTreeNode> ShapeCompositionLayer::renderTreeNode() {
}
if (!_renderTreeNode) {
_contentRenderTreeNode = std::make_shared<RenderTreeNode>(
CGRect(0.0, 0.0, 0.0, 0.0),
Vector2D(0.0, 0.0),
CATransform3D::identity(),
1.0,
false,
false,
std::vector<std::shared_ptr<RenderTreeNode>>(),
nullptr,
false
);
_contentRenderTreeNode->_contentItem = _contentTree->itemTree->_contentItem;
std::vector<std::shared_ptr<RenderTreeNode>> subnodes;
subnodes.push_back(_contentTree->itemTree->renderTree());
//subnodes.push_back(_contentTree->itemTree->renderTree());
subnodes.push_back(_contentRenderTreeNode);
std::shared_ptr<RenderTreeNode> maskNode;
bool invertMask = false;
@ -1354,12 +1335,12 @@ void ShapeCompositionLayer::updateRenderTree() {
_matteLayer->updateRenderTree();
}
_contentTree->itemTree->renderTree()->_bounds = _contentsLayer->bounds();
_contentTree->itemTree->renderTree()->_position = _contentsLayer->position();
_contentTree->itemTree->renderTree()->_transform = _contentsLayer->transform();
_contentTree->itemTree->renderTree()->_alpha = _contentsLayer->opacity();
_contentTree->itemTree->renderTree()->_masksToBounds = _contentsLayer->masksToBounds();
_contentTree->itemTree->renderTree()->_isHidden = _contentsLayer->isHidden();
_contentRenderTreeNode->_bounds = _contentsLayer->bounds();
_contentRenderTreeNode->_position = _contentsLayer->position();
_contentRenderTreeNode->_transform = _contentsLayer->transform();
_contentRenderTreeNode->_alpha = _contentsLayer->opacity();
_contentRenderTreeNode->_masksToBounds = _contentsLayer->masksToBounds();
_contentRenderTreeNode->_isHidden = _contentsLayer->isHidden();
assert(position() == Vector2D::Zero());
assert(transform().isIdentity());

1
submodules/TelegramUI/Components/LottieCpp/Sources/Lottie/Private/MainThread/LayerContainers/CompLayers/ShapeCompositionLayer.hpp
View File

@ -27,6 +27,7 @@ private:
bool _frameTimeInitialized = false;
std::shared_ptr<RenderTreeNode> _renderTreeNode;
std::shared_ptr<RenderTreeNode> _contentRenderTreeNode;
};
}