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

lottie/parser: fix code indentations and a duplicated code

Browse Source 
Change-Id: I01280529f6ada36ded67a31d24833049762f52ca
This commit is contained in:
Youngbok Shin 2018-09-12 16:48:39 +09:00
parent 3756e7cb93
commit 02cb018c75
1 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/lottie/lottieparser.cpp
View File

@ -746,9 +746,7 @@ std::shared_ptr<LOTData> LottieParserImpl::parseLayer()
parenting and expressions.*/ parenting and expressions.*/
RAPIDJSON_ASSERT(PeekType() == kNumberType); RAPIDJSON_ASSERT(PeekType() == kNumberType);
layer->mId = GetInt(); layer->mId = GetInt();
} else if (0 == } else if (0 == strcmp(key, "parent")) { /*Layer Parent. Uses "ind" of parent.*/
strcmp(key,
"parent")) { /*Layer Parent. Uses "ind" of parent.*/
RAPIDJSON_ASSERT(PeekType() == kNumberType); RAPIDJSON_ASSERT(PeekType() == kNumberType);
layer->mParentId = GetInt(); layer->mParentId = GetInt();
} else if (0 == strcmp(key, "refId")) { /*preComp Layer reference id*/ } else if (0 == strcmp(key, "refId")) { /*preComp Layer reference id*/
@ -789,8 +787,6 @@ std::shared_ptr<LOTData> LottieParserImpl::parseLayer()
layer->mSolidLayer.mColor = toColor(GetString()); layer->mSolidLayer.mColor = toColor(GetString());
} else if (0 == strcmp(key, "tt")) { } else if (0 == strcmp(key, "tt")) {
layer->mMatteType = getMatteType(); layer->mMatteType = getMatteType();
} else if (0 == strcmp(key, "tt")) {
layer->mMatteType = getMatteType();
} else if (0 == strcmp(key, "hasMask")) { } else if (0 == strcmp(key, "hasMask")) {
layer->mHasMask = GetBool(); layer->mHasMask = GetBool();
} else if (0 == strcmp(key, "masksProperties")) { } else if (0 == strcmp(key, "masksProperties")) {
@ -1865,31 +1861,31 @@ class LOTDataInspector {
public: public:
void visit(LOTCompositionData *obj, std::string level) void visit(LOTCompositionData *obj, std::string level)
{ {
vDebug <<" { " vDebug << " { "
<<level << level
<<"Composition:: a: " << !obj->isStatic() << "Composition:: a: " << !obj->isStatic()
<< ", v: " << obj->mVersion << ", v: " << obj->mVersion
<< ", stFm: "<< obj->startFrame() << ", stFm: " << obj->startFrame()
<< ", endFm: "<< obj->endFrame()<<"\n"; << ", endFm: " << obj->endFrame()<< "\n";
level.append("\t"); level.append("\t");
visit(obj->mRootLayer.get(), level); visit(obj->mRootLayer.get(), level);
level.erase(level.end() -1 , level.end()); level.erase(level.end() - 1, level.end());
vDebug << " } " <<level<<"Composition End \n"; vDebug << " } " << level << "Composition End\n";
} }
void visit(LOTLayerData *obj, std::string level) void visit(LOTLayerData *obj, std::string level)
{ {
vDebug << level vDebug << level
<<"{ " << "{ "
<<layerType(obj->mLayerType) << layerType(obj->mLayerType)
<< ", id:" << obj->mId << " Pid:" << obj->mParentId << ", id:" << obj->mId << " Pid:" << obj->mParentId
<< ", a:" << !obj->isStatic() << ", a:" << !obj->isStatic()
<< ", inFm:" << obj->mInFrame << ", inFm:" << obj->mInFrame
<< ", outFm:" << obj->mOutFrame << ", outFm:" << obj->mOutFrame
<<"\n"; << "\n";
visitChildren(static_cast<LOTGroupData *>(obj), level); visitChildren(static_cast<LOTGroupData *>(obj), level);
vDebug << level vDebug << level
<<"} " << "} "
<<layerType(obj->mLayerType).c_str() << layerType(obj->mLayerType).c_str()
<< ", id: " << obj->mId << "\n"; << ", id: " << obj->mId << "\n";
} }
void visitChildren(LOTGroupData *obj, std::string level) void visitChildren(LOTGroupData *obj, std::string level)
@ -1901,15 +1897,15 @@ public:
void visit(LOTData *obj, std::string level) { void visit(LOTData *obj, std::string level) {
switch (obj->mType) { switch (obj->mType) {
case LOTData::Type::Repeater: { case LOTData::Type::Repeater: {
vDebug << level<<"{ Repeater:"; vDebug << level << "{ Repeater:";
visitChildren(static_cast<LOTGroupData *>(obj), level); visitChildren(static_cast<LOTGroupData *>(obj), level);
vDebug << level<<"} Repeater"; vDebug << level << "} Repeater";
break; break;
} }
case LOTData::Type::ShapeGroup: { case LOTData::Type::ShapeGroup: {
vDebug << level <<"{ ShapeGroup: a:" << !obj->isStatic(); vDebug << level << "{ ShapeGroup: a:" << !obj->isStatic();
visitChildren(static_cast<LOTGroupData *>(obj), level); visitChildren(static_cast<LOTGroupData *>(obj), level);
vDebug << level <<"} ShapeGroup"; vDebug << level << "} ShapeGroup";
break; break;
} }
case LOTData::Type::Layer:{ case LOTData::Type::Layer:{
@ -1917,44 +1913,44 @@ public:
break; break;
} }
case LOTData::Type::Trim:{ case LOTData::Type::Trim:{
vDebug << level<<"{ Trim: a:" << !obj->isStatic() << " }"; vDebug << level << "{ Trim: a:" << !obj->isStatic() << " }";
break; break;
} }
case LOTData::Type::Rect:{ case LOTData::Type::Rect:{
vDebug <<level<< "{ Rect: a:" << !obj->isStatic() << " }"; vDebug << level << "{ Rect: a:" << !obj->isStatic() << " }";
break; break;
} }
case LOTData::Type::Ellipse:{ case LOTData::Type::Ellipse:{
vDebug << level<<"{ Ellipse: a:" << !obj->isStatic() << " }"; vDebug << level << "{ Ellipse: a:" << !obj->isStatic() << " }";
break; break;
} }
case LOTData::Type::Shape:{ case LOTData::Type::Shape:{
vDebug << level<<"{ Shape: a:" << !obj->isStatic() << " }"; vDebug << level << "{ Shape: a:" << !obj->isStatic() << " }";
break; break;
} }
case LOTData::Type::Polystar:{ case LOTData::Type::Polystar:{
vDebug << level<<"{ Polystar: a:" << !obj->isStatic() << " }"; vDebug << level << "{ Polystar: a:" << !obj->isStatic() << " }";
break; break;
} }
case LOTData::Type::Transform:{ case LOTData::Type::Transform:{
vDebug << level<<"{ Transform: a: " << !obj->isStatic() << " }"; vDebug << level << "{ Transform: a: " << !obj->isStatic() << " }";
break; break;
} }
case LOTData::Type::Stroke:{ case LOTData::Type::Stroke:{
vDebug << level<<"{ Stroke: a:" << !obj->isStatic() << " }"; vDebug << level << "{ Stroke: a:" << !obj->isStatic() << " }";
break; break;
} }
case LOTData::Type::GStroke:{ case LOTData::Type::GStroke:{
vDebug << level<<"{ GStroke: a:" << !obj->isStatic() << " }"; vDebug << level << "{ GStroke: a:" << !obj->isStatic() << " }";
break; break;
} }
case LOTData::Type::Fill:{ case LOTData::Type::Fill:{
vDebug << level<<"{ Fill: a:" << !obj->isStatic() << " }"; vDebug << level << "{ Fill: a:" << !obj->isStatic() << " }";
break; break;
} }
case LOTData::Type::GFill:{ case LOTData::Type::GFill:{
auto f = static_cast<LOTGFillData *>(obj); auto f = static_cast<LOTGFillData *>(obj);
vDebug << level<<"{ GFill: a:" << !f->isStatic() vDebug << level << "{ GFill: a:" << !f->isStatic()
<< ", ty:" << f->mGradientType << ", s:" << f->mStartPoint.value(0) << ", ty:" << f->mGradientType << ", s:" << f->mStartPoint.value(0)
<< ", e:" << f->mEndPoint.value(0) << " }"; << ", e:" << f->mEndPoint.value(0) << " }";
break; break;
@ -2012,7 +2008,7 @@ std::shared_ptr<LOTModel> LottieParser::model()
#ifdef DEBUG_PRINT_TREE #ifdef DEBUG_PRINT_TREE
LOTDataInspector inspector; LOTDataInspector inspector;
inspector.visit(model->mRoot.get(),""); inspector.visit(model->mRoot.get(), "");
#endif #endif
return model; return model;