vector: convert radial gradient parameter from lottie space to vector space.

Change-Id: I1894dd03eb0ccd0266fa098eaaae4aa4bf1e1d57

diff --git a/src/lottie/lottiemodel.cpp b/src/lottie/lottiemodel.cpp
index 29156e689ea89caa91f74e7d9d267c27ba83ec06..1a7e3b832840eb62d263d487946750c27bafbc73 100644 (file)
--- a/src/lottie/lottiemodel.cpp
+++ b/src/lottie/lottiemodel.cpp
@@ -335,8 +335,12 @@ void LOTGradient::update(std::unique_ptr<VGradient> &grad, int frameNo)
         VPointF end = mEndPoint.value(frameNo);
         grad->radial.cx = start.x();
         grad->radial.cy = start.y();
-        grad->radial.fx = end.x();
-        grad->radial.fy = end.y();
+        grad->radial.cradius = vLineLength(start.x(), start.y(), end.x(), end.y());
+
+        //TODO update focal radius and focal point
+        grad->radial.fx = grad->radial.cx;
+        grad->radial.fy = grad->radial.cy;
+        grad->radial.fradius = 0;
     }
 }
 

diff --git a/src/vector/vglobal.h b/src/vector/vglobal.h
index b531344121e8d24097877d94181047c2f30f8648..fb96f304cfa6cec9fb6466483ce0b85b822007b2 100644 (file)
--- a/src/vector/vglobal.h
+++ b/src/vector/vglobal.h
@@ -96,6 +96,21 @@ static inline bool vIsNull(float f)
     return std::abs(f) <= 0.00001f;
 }
 
+// Approximate sqrt(x*x + y*y) using the alpha max plus beta min algorithm.
+// This uses alpha = 1, beta = 3/8, which results in a maximum error of less
+// than 7% compared to the correct value.
+static inline float
+vLineLength(float x1, float y1, float x2, float y2)
+{
+   float x = x2 - x1;
+   float y = y2 - y1;
+
+   x = x < 0 ? -x : x;
+   y = y < 0 ? -y : y;
+
+   return (x > y ? x + 0.375 * y : y + 0.375 * x);
+}
+
 class vFlagHelper
 {
     int i;