Revert of Refactor SkCurveMeasure to use existing eval code

src/utils/SkCurveMeasure.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCurveMeasure.h"
-#include "SkGeometry.h"
 
 // for abs
 #include <cmath>
 
-#define UNIMPLEMENTED SkDEBUGF(("%s:%d unimplemented\n", __FILE__, __LINE__))
-
-/// Used inside SkCurveMeasure::getTime's Newton's iteration
-static inline SkPoint evaluate(const SkPoint pts[4], SkSegType segType,
-                               SkScalar t) {
-    SkPoint pos;
-    switch (segType) {
-        case kQuad_SegType:
-            pos = SkEvalQuadAt(pts, t);
-            break;
-        case kLine_SegType:
-            pos = SkPoint::Make(SkScalarInterp(pts[0].x(), pts[1].x(), t),
-                                SkScalarInterp(pts[0].y(), pts[1].y(), t));
-            break;
-        case kCubic_SegType:
-            SkEvalCubicAt(pts, t, &pos, nullptr, nullptr);
-            break;
-        case kConic_SegType: {
-            SkConic conic(pts, pts[3].x());
-            conic.evalAt(t, &pos);
-        }
-            break;
-        default:
-            UNIMPLEMENTED;
-    }
-
-    return pos;
-}
-
-/// Used inside SkCurveMeasure::getTime's Newton's iteration
-static inline SkVector evaluateDerivative(const SkPoint pts[4],
-                                          SkSegType segType, SkScalar t) {
-    SkVector tan;
-    switch (segType) {
-        case kQuad_SegType:
-            tan = SkEvalQuadTangentAt(pts, t);
-            break;
-        case kLine_SegType:
-            tan = pts[1] - pts[0];
-            break;
-        case kCubic_SegType:
-            SkEvalCubicAt(pts, t, nullptr, &tan, nullptr);
-            break;
-        case kConic_SegType: {
-            SkConic conic(pts, pts[3].x());
-            conic.evalAt(t, nullptr, &tan);
-        }
-            break;
-        default:
-            UNIMPLEMENTED;
-    }
-
-    return tan;
-}
-/// Used in ArcLengthIntegrator::computeLength
 static inline Sk8f evaluateDerivativeLength(const Sk8f& ts,
                                             const Sk8f (&xCoeff)[3],
                                             const Sk8f (&yCoeff)[3],
                                             const SkSegType segType) {
     Sk8f x;
     Sk8f y;
     switch (segType) {
         case kQuad_SegType:
             x = xCoeff[0]*ts + xCoeff[1];
             y = yCoeff[0]*ts + yCoeff[1];
             break;
         case kLine_SegType:
-            // length of line derivative is constant
-            // and we precompute it in the constructor
-            return xCoeff[0];
+            SkDebugf("Unimplemented");
+            break;
         case kCubic_SegType:
             x = (xCoeff[0]*ts + xCoeff[1])*ts + xCoeff[2];
             y = (yCoeff[0]*ts + yCoeff[1])*ts + yCoeff[2];
             break;
         case kConic_SegType:
-            UNIMPLEMENTED;
+            SkDebugf("Unimplemented");
             break;
         default:
-            UNIMPLEMENTED;
+            SkDebugf("Unimplemented");
     }
 
     x = x * x;
     y = y * y;
 
     return (x + y).sqrt();
 }
-
 ArcLengthIntegrator::ArcLengthIntegrator(const SkPoint* pts, SkSegType segType)
     : fSegType(segType) {
     switch (fSegType) {
         case kQuad_SegType: {
             float Ax = pts[0].x();
             float Bx = pts[1].x();
             float Cx = pts[2].x();
             float Ay = pts[0].y();
             float By = pts[1].y();
             float Cy = pts[2].y();
 
             // precompute coefficients for derivative
             xCoeff[0] = Sk8f(2.0f*(Ax - 2*Bx + Cx));
             xCoeff[1] = Sk8f(2.0f*(Bx - Ax));
 
             yCoeff[0] = Sk8f(2.0f*(Ay - 2*By + Cy));
             yCoeff[1] = Sk8f(2.0f*(By - Ay));
         }
             break;
-        case kLine_SegType: {
-            // the length of the derivative of a line is constant
-            // we put in in both coeff arrays for consistency's sake
-            SkScalar length = (pts[1] - pts[0]).length();
-            xCoeff[0] = Sk8f(length);
-            yCoeff[0] = Sk8f(length);
-        }
+        case kLine_SegType:
+            SkDEBUGF(("Unimplemented"));
             break;
         case kCubic_SegType:
         {
             float Ax = pts[0].x();
             float Bx = pts[1].x();
             float Cx = pts[2].x();
             float Dx = pts[3].x();
             float Ay = pts[0].y();
             float By = pts[1].y();
             float Cy = pts[2].y();
             float Dy = pts[3].y();
 
-            // precompute coefficients for derivative
             xCoeff[0] = Sk8f(3.0f*(-Ax + 3.0f*(Bx - Cx) + Dx));
             xCoeff[1] = Sk8f(3.0f*(2.0f*(Ax - 2.0f*Bx + Cx)));
             xCoeff[2] = Sk8f(3.0f*(-Ax + Bx));
 
             yCoeff[0] = Sk8f(3.0f*(-Ay + 3.0f*(By - Cy) + Dy));
             yCoeff[1] = Sk8f(3.0f * -Ay + By + 2.0f*(Ay - 2.0f*By + Cy));
             yCoeff[2] = Sk8f(3.0f*(-Ay + By));
         }
             break;
         case kConic_SegType:
-            UNIMPLEMENTED;
+            SkDEBUGF(("Unimplemented"));
             break;
         default:
-            UNIMPLEMENTED;
+            SkDEBUGF(("Unimplemented"));
     }
 }
 
 // We use Gaussian quadrature
 // (https://en.wikipedia.org/wiki/Gaussian_quadrature)
 // to approximate the arc length integral here, because it is amenable to SIMD.
 SkScalar ArcLengthIntegrator::computeLength(SkScalar t) {
     SkScalar length = 0.0f;
 
     Sk8f lengths = evaluateDerivativeLength(absc*t, xCoeff, yCoeff, fSegType);
@@ skipping 10 matching lines @@
 
 SkCurveMeasure::SkCurveMeasure(const SkPoint* pts, SkSegType segType)
     : fSegType(segType) {
     switch (fSegType) {
         case SkSegType::kQuad_SegType:
             for (size_t i = 0; i < 3; i++) {
                 fPts[i] = pts[i];
             }
             break;
         case SkSegType::kLine_SegType:
-            fPts[0] = pts[0];
-            fPts[1] = pts[1];
+            SkDebugf("Unimplemented");
             break;
         case SkSegType::kCubic_SegType:
             for (size_t i = 0; i < 4; i++) {
                 fPts[i] = pts[i];
             }
             break;
         case SkSegType::kConic_SegType:
-            for (size_t i = 0; i < 4; i++) {
-                fPts[i] = pts[i];
-            }
+            SkDebugf("Unimplemented");
             break;
         default:
-            UNIMPLEMENTED;
+            SkDEBUGF(("Unimplemented"));
             break;
     }
     fIntegrator = ArcLengthIntegrator(fPts, fSegType);
 }
 
 SkScalar SkCurveMeasure::getLength() {
     if (-1.0f == fLength) {
         fLength = fIntegrator.computeLength(1.0f);
     }
     return fLength;
@@ skipping 50 matching lines @@
         // on the t value
         // because we may not have enough precision in the t to get close enough
         // in the length.
         if ((std::abs(lengthDiff) < kTolerance) ||
             (std::abs(prevT - currentT) < kTolerance)) {
             break;
         }
 
         prevT = currentT;
         if (iterations < kNewtonIters) {
+            // TODO(hstern) switch here on curve type.
             // This is just newton's formula.
-            SkScalar dt = evaluateDerivative(fPts, fSegType, currentT).length();
+            SkScalar dt = evaluateQuadDerivative(currentT).length();
             newT = currentT - (lengthDiff / dt);
 
             // If newT is out of bounds, bisect inside newton.
             if ((newT < 0.0f) || (newT > 1.0f)) {
                 newT = (minT + maxT) * 0.5f;
             }
         } else if (iterations < kNewtonIters + kBisectIters) {
             if (lengthDiff > 0.0f) {
                 maxT = currentT;
             } else {
                 minT = currentT;
             }
             // TODO(hstern) do a lerp here instead of a bisection
             newT = (minT + maxT) * 0.5f;
         } else {
             SkDEBUGF(("%.7f %.7f didn't get close enough after bisection.\n",
-                      currentT, currentLength));
+                     currentT, currentLength));
             break;
         }
         currentT = newT;
 
         SkASSERT(minT <= maxT);
 
         iterations++;
     }
 
     // debug. is there an SKDEBUG or something for ifdefs?
     fIters = iterations;
 
     return currentT;
 }
 
 void SkCurveMeasure::getPosTanTime(SkScalar targetLength, SkPoint* pos,
-                                   SkVector* tan, SkScalar* time) {
+                               SkVector* tan, SkScalar* time) {
     SkScalar t = getTime(targetLength);
 
     if (time) {
         *time = t;
     }
     if (pos) {
-        *pos = evaluate(fPts, fSegType, t);
+        // TODO(hstern) switch here on curve type.
+        *pos = evaluateQuad(t);
     }
     if (tan) {
-        *tan = evaluateDerivative(fPts, fSegType, t);
+        // TODO(hstern) switch here on curve type.
+        *tan = evaluateQuadDerivative(t);
     }
 }
+
+// this is why I feel that the ArcLengthIntegrator should be combined
+// with some sort of evaluator that caches the constants computed from the
+// control points. this is basically the same code in ArcLengthIntegrator
+SkPoint SkCurveMeasure::evaluateQuad(SkScalar t) {
+    SkScalar ti = 1.0f - t;
+
+    SkScalar Ax = fPts[0].x();
+    SkScalar Bx = fPts[1].x();
+    SkScalar Cx = fPts[2].x();
+    SkScalar Ay = fPts[0].y();
+    SkScalar By = fPts[1].y();
+    SkScalar Cy = fPts[2].y();
+
+    SkScalar x = Ax*ti*ti + 2.0f*Bx*t*ti + Cx*t*t;
+    SkScalar y = Ay*ti*ti + 2.0f*By*t*ti + Cy*t*t;
+    return SkPoint::Make(x, y);
+}
+
+SkVector SkCurveMeasure::evaluateQuadDerivative(SkScalar t) {
+    SkScalar Ax = fPts[0].x();
+    SkScalar Bx = fPts[1].x();
+    SkScalar Cx = fPts[2].x();
+    SkScalar Ay = fPts[0].y();
+    SkScalar By = fPts[1].y();
+    SkScalar Cy = fPts[2].y();
+
+    SkScalar A2BCx = 2.0f*(Ax - 2*Bx + Cx);
+    SkScalar A2BCy = 2.0f*(Ay - 2*By + Cy);
+    SkScalar ABx = 2.0f*(Bx - Ax);
+    SkScalar ABy = 2.0f*(By - Ay);
+
+    return SkPoint::Make(A2BCx*t + ABx, A2BCy*t + ABy);
+}