From 9410d9e32d8aab0e7ba0819677ef2d9fda1cd271 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Mon, 13 Aug 2018 20:16:59 +0900 Subject: [PATCH] lottieplayer: code refactoring. change type to struct and declare type scopes explicitly. Change-Id: If85fbc97917ba324030c3e65765f315e590239ed --- inc/lottieplayer.h | 50 ++++++++++++++++--------------------- src/lottie/lottieplayer.cpp | 4 --- 2 files changed, 21 insertions(+), 33 deletions(-) diff --git a/inc/lottieplayer.h b/inc/lottieplayer.h index 91159771a4..1e98f071ff 100644 --- a/inc/lottieplayer.h +++ b/inc/lottieplayer.h @@ -65,32 +65,31 @@ public: #define ChangeFlagPaint 0x0010 #define ChangeFlagAll (ChangeFlagPath & ChangeFlagPaint) -class LOT_EXPORT LOTNode { -public: - struct PathData { - const float *ptPtr; - int ptCount; - const char * elmPtr; - int elmCount; - }; - struct Color { - unsigned short r, g, b, a; - }; +struct LOTNode { enum BrushType { BrushSolid, BrushGradient }; enum FillRule { EvenOdd, Winding }; - enum JoinStyle { MiterJoin, BevelJoin, RoundJoin }; - enum CapStyle { FlatCap, SquareCap, RoundCap }; + struct PathData { + const float *ptPtr; + int ptCount; + const char* elmPtr; + int elmCount; + }; + + struct Color { + unsigned char r, g, b, a; + }; + struct Stroke { bool enable; int width; CapStyle cap; JoinStyle join; int meterLimit; - float * dashArray; + float* dashArray; int dashArraySize; }; @@ -99,25 +98,18 @@ public: Gradient::Type type; struct { float x, y; - } start, end; - struct { - float x, y; - } center, focal; + } start, end, center, focal; float cradius; float fradius; }; - ~LOTNode(); - LOTNode(); - -public: - int mFlag; - LOTNode::BrushType mType; - FillRule mFillRule; - PathData mPath; - Color mColor; - Stroke mStroke; - Gradient mGradient; + int mFlag; + BrushType mType; + FillRule mFillRule; + PathData mPath; + Color mColor; + Stroke mStroke; + Gradient mGradient; }; #endif // LOTPLAYER_H diff --git a/src/lottie/lottieplayer.cpp b/src/lottie/lottieplayer.cpp index 95368afdac..92566e5b46 100644 --- a/src/lottie/lottieplayer.cpp +++ b/src/lottie/lottieplayer.cpp @@ -270,10 +270,6 @@ bool LOTPlayer::renderSync(float pos, LOTBuffer buffer) return d->render(pos, buffer); } -LOTNode::~LOTNode() {} - -LOTNode::LOTNode() {} - void initLogging() { #if defined(__ARM_NEON__)