ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-25 17:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

lottie/model: refactored path direction handling.

Browse Source 
Change-Id: I6a41f72e3635f3ad91f188d99868b3e8e44d3174
This commit is contained in:
subhransu mohanty 2018-07-19 10:06:05 +09:00
parent 8779be1e9f
commit 95004fcf34
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lottie/lottieitem.cpp
View File

@ -655,15 +655,6 @@ void LOTShapeLayerItem::renderList(std::vector<VDrawable *> &list)
mRoot->renderList(list); mRoot->renderList(list);
} }
VPath::Direction LOTContentItem::direction(bool isCW)
{
if (isCW)
return VPath::Direction::CW;
else
return VPath::Direction::CCW;
}
LOTContentGroupItem::LOTContentGroupItem(LOTShapeGroupData *data):mData(data) LOTContentGroupItem::LOTContentGroupItem(LOTShapeGroupData *data):mData(data)
{ {
addChildren(mData); addChildren(mData);
@ -813,7 +804,7 @@ VPath LOTRectItem::getPath(int frameNo)
VRectF r(pos.x() - size.x()/2, pos.y() - size.y()/2, size.x(), size.y()); VRectF r(pos.x() - size.x()/2, pos.y() - size.y()/2, size.x(), size.y());
VPath path; VPath path;
path.addRoundRect(r, radius, radius, direction(mData->isDirectionCW())); path.addRoundRect(r, radius, radius, mData->direction());
return path; return path;
} }
@ -830,7 +821,7 @@ VPath LOTEllipseItem::getPath(int frameNo)
VRectF r(pos.x() - size.x()/2, pos.y() - size.y()/2, size.x(), size.y()); VRectF r(pos.x() - size.x()/2, pos.y() - size.y()/2, size.x(), size.y());
VPath path; VPath path;
path.addOval(r, direction(mData->isDirectionCW())); path.addOval(r, mData->direction());
return path; return path;
} }
@ -884,11 +875,11 @@ VPath LOTPolystarItem::getPath(int frameNo)
path.addPolystarStar(0.0, 0.0, 0.0, points, path.addPolystarStar(0.0, 0.0, 0.0, points,
innerRadius, outerRadius, innerRadius, outerRadius,
innerRoundness, outerRoundness, innerRoundness, outerRoundness,
direction(mData->isDirectionCW())); mData->direction());
} else { } else {
path.addPolystarPolygon(0.0, 0.0, 0.0, points, path.addPolystarPolygon(0.0, 0.0, 0.0, points,
outerRadius, outerRoundness, outerRadius, outerRoundness,
direction(mData->isDirectionCW())); mData->direction());
} }
m.translate(pos.x(), pos.y()).rotate(rotation); m.translate(pos.x(), pos.y()).rotate(rotation);

1
src/lottie/lottieitem.h
View File

@ -215,7 +215,6 @@ public:
virtual ~LOTContentItem(){} virtual ~LOTContentItem(){}
virtual void update(int frameNo, const VMatrix &parentMatrix, float parentAlpha, const DirtyFlag &flag) = 0; virtual void update(int frameNo, const VMatrix &parentMatrix, float parentAlpha, const DirtyFlag &flag) = 0;
virtual void renderList(std::vector<VDrawable *> &list){} virtual void renderList(std::vector<VDrawable *> &list){}
VPath::Direction direction(bool isCW);
}; };
class LOTContentGroupItem: public LOTContentItem class LOTContentGroupItem: public LOTContentItem

5
src/lottie/lottiemodel.h
View File

@ -608,8 +608,9 @@ public:
class LOTPath : public LOTData class LOTPath : public LOTData
{ {
public: public:
LOTPath(LOTData::Type type):LOTData(type), mDirection(3){} LOTPath(LOTData::Type type):LOTData(type), mDirection(1){}
bool isDirectionCW() const { return ((mDirection == 3) ? false : true );} VPath::Direction direction() { if (mDirection == 3) return VPath::Direction::CCW;
else return VPath::Direction::CW;}
public: public:
int mDirection; int mDirection;
std::vector<std::shared_ptr<LOTData>> mPathOperations; std::vector<std::shared_ptr<LOTData>> mPathOperations;