ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-05 05:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for layer parent-child cycles.

Browse Source
This commit is contained in:
John Preston 2019-08-30 12:42:03 +03:00
parent d08a03b650
commit ba6b92f341
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lottie/lottieitem.cpp
View File

@ -69,6 +69,16 @@ static bool strokeProp(rlottie::Property prop)
}
}
static bool isGoodParentLayer(LOTLayerItem *parent, LOTLayerItem *child) {
do {
if (parent == child) {
return false;
}
parent = parent->resolvedParentLayer();
} while (parent);
return true;
}
LOTCompItem::LOTCompItem(LOTModel *model)
: mCurFrameNo(-1)
{
@ -520,7 +530,10 @@ LOTCompLayerItem::LOTCompLayerItem(LOTLayerData *layerModel)
auto search =
std::find_if(mLayers.begin(), mLayers.end(),
[id](const auto &val) { return val->id() == id; });
if (search != mLayers.end()) layer->setParentLayer((*search).get());
if (search != mLayers.end() &&
isGoodParentLayer((*search).get(), layer.get())) {
layer->setParentLayer((*search).get());
}
}
}

1
src/lottie/lottieitem.h
View File

@ -107,6 +107,7 @@ public:
int id() const {return mLayerData->id();}
int parentId() const {return mLayerData->parentId();}
void setParentLayer(LOTLayerItem *parent){mParentLayer = parent;}
LOTLayerItem *resolvedParentLayer() const {return mParentLayer;}
void setComplexContent(bool value) { mComplexContent = value;}
bool complexContent() const {return mComplexContent;}
virtual void update(int frameNo, const VMatrix &parentMatrix, float parentAlpha);