replace older/slower/scaler version of conic evalAt

src/core/SkGeometry.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGeometry.h"
 #include "SkMatrix.h"
 #include "SkNx.h"
@@ skipping 1128 matching lines @@
 //
 // F = (A (1 - t)^2 + C t^2 + 2 B (1 - t) t w)
 //     ------------------------------------------
 //         ((1 - t)^2 + t^2 + 2 (1 - t) t w)
 //
 //   = {t^2 (P0 + P2 - 2 P1 w), t (-2 P0 + 2 P1 w), P0}
 //     ------------------------------------------------
 //             {t^2 (2 - 2 w), t (-2 + 2 w), 1}
 //
 
-static SkScalar conic_eval_pos(const SkScalar src[], SkScalar w, SkScalar t) {
-    SkASSERT(src);
-    SkASSERT(t >= 0 && t <= SK_Scalar1);
-
-    SkScalar    src2w = SkScalarMul(src[2], w);
-    SkScalar    C = src[0];
-    SkScalar    A = src[4] - 2 * src2w + C;
-    SkScalar    B = 2 * (src2w - C);
-    SkScalar numer = SkScalarMulAdd(SkScalarMulAdd(A, t, B), t, C);
-
-    B = 2 * (w - SK_Scalar1);
-    C = SK_Scalar1;
-    A = -B;
-    SkScalar denom = SkScalarMulAdd(SkScalarMulAdd(A, t, B), t, C);
-
-    return numer / denom;
-}
-
 // F' = 2 (C t (1 + t (-1 + w)) - A (-1 + t) (t (-1 + w) - w) + B (1 - 2 t) w)
 //
 //  t^2 : (2 P0 - 2 P2 - 2 P0 w + 2 P2 w)
 //  t^1 : (-2 P0 + 2 P2 + 4 P0 w - 4 P1 w)
 //  t^0 : -2 P0 w + 2 P1 w
 //
 //  We disregard magnitude, so we can freely ignore the denominator of F', and
 //  divide the numerator by 2
 //
 //    coeff[0] for t^2
@@ skipping 46 matching lines @@
     dst[3] = SkScalarInterp(ab, bc, t);
     dst[6] = bc;
 }
 
 static void ratquad_mapTo3D(const SkPoint src[3], SkScalar w, SkP3D dst[]) {
     dst[0].set(src[0].fX * 1, src[0].fY * 1, 1);
     dst[1].set(src[1].fX * w, src[1].fY * w, w);
     dst[2].set(src[2].fX * 1, src[2].fY * 1, 1);
 }
 
-void SkConic::evalAt(SkScalar t, SkPoint* pt, SkVector* tangent) const {
-    SkASSERT(t >= 0 && t <= SK_Scalar1);
-
-    if (pt) {
-        pt->set(conic_eval_pos(&fPts[0].fX, fW, t),
-                conic_eval_pos(&fPts[0].fY, fW, t));
-    }
-    if (tangent) {
-        *tangent = evalTangentAt(t);
-    }
-}
-
 void SkConic::chopAt(SkScalar t, SkConic dst[2]) const {
     SkP3D tmp[3], tmp2[3];
 
     ratquad_mapTo3D(fPts, fW, tmp);
 
     p3d_interp(&tmp[0].fX, &tmp2[0].fX, t);
     p3d_interp(&tmp[0].fY, &tmp2[0].fY, t);
     p3d_interp(&tmp[0].fZ, &tmp2[0].fZ, t);
 
     dst[0].fPts[0] = fPts[0];
@@ skipping 55 matching lines @@
     Sk2s p20 = p2 - p0;
     Sk2s p10 = p1 - p0;
 
     Sk2s C = ww * p10;
     Sk2s A = ww * p20 - p20;
     Sk2s B = p20 - C - C;
 
     return to_vector(quad_poly_eval(A, B, C, Sk2s(t)));
 }
 
+void SkConic::evalAt(SkScalar t, SkPoint* pt, SkVector* tangent) const {
+    SkASSERT(t >= 0 && t <= SK_Scalar1);
+    
+    if (pt) {
+        *pt = this->evalAt(t);
+    }
+    if (tangent) {
+        *tangent = this->evalTangentAt(t);
+    }
+}
+
 static SkScalar subdivide_w_value(SkScalar w) {
     return SkScalarSqrt(SK_ScalarHalf + w * SK_ScalarHalf);
 }
 
 static Sk2s twice(const Sk2s& value) {
     return value + value;
 }
 
 void SkConic::chop(SkConic * SK_RESTRICT dst) const {
     Sk2s scale = Sk2s(SkScalarInvert(SK_Scalar1 + fW));
@@ skipping 260 matching lines @@
         matrix.preScale(SK_Scalar1, -SK_Scalar1);
     }
     if (userMatrix) {
         matrix.postConcat(*userMatrix);
     }
     for (int i = 0; i < conicCount; ++i) {
         matrix.mapPoints(dst[i].fPts, 3);
     }
     return conicCount;
 }