rlottie: refactor VGradient to remove unnecessary inheritance

diff --git a/src/lottie/lottiemodel.cpp b/src/lottie/lottiemodel.cpp
index a657b61..4156c9f 100644 (file)
--- a/src/lottie/lottiemodel.cpp
+++ b/src/lottie/lottiemodel.cpp
@@ -265,9 +265,9 @@ void LOTGradient::update(std::unique_ptr<VGradient> &grad, int frameNo)
     bool init = false;
     if (!grad) {
         if (mGradientType == 1)
-            grad = std::make_unique<VLinearGradient>(0, 0, 0, 0);
+            grad = std::make_unique<VGradient>(VGradient::Type::Linear);
         else
-            grad = std::make_unique<VRadialGradient>(0, 0, 0, 0, 0, 0);
+            grad = std::make_unique<VGradient>(VGradient::Type::Radial);
         grad->mSpread = VGradient::Spread::Pad;
         init = true;
     }

diff --git a/src/vector/vbrush.cpp b/src/vector/vbrush.cpp
index cdc114e..11ec6eb 100644 (file)
--- a/src/vector/vbrush.cpp
+++ b/src/vector/vbrush.cpp
@@ -25,6 +25,11 @@ VGradient::VGradient(VGradient::Type type)
       mSpread(VGradient::Spread::Pad),
       mMode(VGradient::Mode::Absolute)
 {
+    if (mType == Type::Linear)
+        linear.x1 = linear.y1 = linear.x2 = linear.y2 = 0.0f;
+    else
+        radial.cx = radial.cy = radial.fx =
+        radial.fy = radial.cradius = radial.fradius = 0.0f;
 }
 
 void VGradient::setStops(const VGradientStops &stops)
@@ -32,49 +37,6 @@ void VGradient::setStops(const VGradientStops &stops)
     mStops = stops;
 }
 
-VLinearGradient::VLinearGradient(const VPointF &start, const VPointF &stop)
-    : VGradient(VGradient::Type::Linear)
-{
-    linear.x1 = start.x();
-    linear.y1 = start.y();
-    linear.x1 = stop.x();
-    linear.y1 = stop.y();
-}
-
-VLinearGradient::VLinearGradient(float xStart, float yStart, float xStop,
-                                 float yStop)
-    : VGradient(VGradient::Type::Linear)
-{
-    linear.x1 = xStart;
-    linear.y1 = yStart;
-    linear.x1 = xStop;
-    linear.y1 = yStop;
-}
-
-VRadialGradient::VRadialGradient(const VPointF &center, float cradius,
-                                 const VPointF &focalPoint, float fradius)
-    : VGradient(VGradient::Type::Radial)
-{
-    radial.cx = center.x();
-    radial.cy = center.y();
-    radial.fx = focalPoint.x();
-    radial.fy = focalPoint.y();
-    radial.cradius = cradius;
-    radial.fradius = fradius;
-}
-
-VRadialGradient::VRadialGradient(float cx, float cy, float cradius, float fx,
-                                 float fy, float fradius)
-    : VGradient(VGradient::Type::Radial)
-{
-    radial.cx = cx;
-    radial.cy = cy;
-    radial.fx = fx;
-    radial.fy = fy;
-    radial.cradius = cradius;
-    radial.fradius = fradius;
-}
-
 VBrush::VBrush(const VColor &color) : mType(VBrush::Type::Solid), mColor(color)
 {
 }

diff --git a/src/vector/vbrush.h b/src/vector/vbrush.h
index 348e2ec..94db6d0 100644 (file)
--- a/src/vector/vbrush.h
+++ b/src/vector/vbrush.h
@@ -58,20 +58,6 @@ public:
     VMatrix mMatrix;
 };
 
-class VLinearGradient : public VGradient {
-public:
-    VLinearGradient(const VPointF &start, const VPointF &stop);
-    VLinearGradient(float xStart, float yStart, float xStop, float yStop);
-};
-
-class VRadialGradient : public VGradient {
-public:
-    VRadialGradient(const VPointF &center, float cradius,
-                    const VPointF &focalPoint, float fradius);
-    VRadialGradient(float cx, float cy, float cradius, float fx, float fy,
-                    float fradius);
-};
-
 class VBrush {
 public:
     enum class Type { NoBrush, Solid, LinearGradient, RadialGradient, Texture };