Remove SkScalarSinCos
This differed from the separate versions in that it snapped to zero.
It was also strictly worse than calling the two separate versions.
Most clients don't need the snapping, so just call the two existing
functions. For clients that need the snapping, call new variants of
each that do snap.
Change-Id: Ia4e09fd9651932fe15caeab1399df7f6281bdc17
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/205303
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Reed <reed@google.com>
diff --git a/gm/polygonoffset.cpp b/gm/polygonoffset.cpp
index 92552cd..2775215 100644
--- a/gm/polygonoffset.cpp
+++ b/gm/polygonoffset.cpp
@@ -11,7 +11,7 @@
#include "gm.h"
static void create_ngon(int n, SkPoint* pts, SkScalar w, SkScalar h, SkPath::Direction dir) {
- float angleStep = 360.0f / n, angle = 0.0f, sin, cos;
+ float angleStep = 360.0f / n, angle = 0.0f;
if ((n % 2) == 1) {
angle = angleStep/2.0f;
}
@@ -21,9 +21,8 @@
}
for (int i = 0; i < n; ++i) {
- sin = SkScalarSinCos(SkDegreesToRadians(angle), &cos);
- pts[i].fX = -sin * w;
- pts[i].fY = cos * h;
+ pts[i].fX = -SkScalarSin(SkDegreesToRadians(angle)) * w;
+ pts[i].fY = SkScalarCos(SkDegreesToRadians(angle)) * h;
angle += angleStep;
}
}