Particles: SkScalar -> float
Pulling this cleanup out of a larger CL
Change-Id: Ib3ecff5d242eba72a7f2bc3ce07e09760a9ba7b7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223181
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/modules/particles/src/SkCurve.cpp b/modules/particles/src/SkCurve.cpp
index dbd754b..e0728c2 100644
--- a/modules/particles/src/SkCurve.cpp
+++ b/modules/particles/src/SkCurve.cpp
@@ -26,13 +26,13 @@
}
template <typename T>
-static T eval_cubic(const T* pts, SkScalar x) {
- SkScalar ix = (1 - x);
+static T eval_cubic(const T* pts, float x) {
+ float ix = (1 - x);
return pts[0]*(ix*ix*ix) + pts[1]*(3*ix*ix*x) + pts[2]*(3*ix*x*x) + pts[3]*(x*x*x);
}
template <typename T>
-static T eval_segment(const T* pts, SkScalar x, int type) {
+static T eval_segment(const T* pts, float x, int type) {
switch (type) {
case kLinear_SegmentType:
return pts[0] + (pts[3] - pts[0]) * x;
@@ -44,8 +44,8 @@
}
}
-SkScalar SkCurveSegment::eval(SkScalar x, SkScalar t, bool negate) const {
- SkScalar result = eval_segment(fMin, x, fType);
+float SkCurveSegment::eval(float x, float t, bool negate) const {
+ float result = eval_segment(fMin, x, fType);
if (fRanged) {
result += (eval_segment(fMax, x, fType) - result) * t;
}
@@ -79,7 +79,7 @@
}
}
-SkScalar SkCurve::eval(const SkParticleUpdateParams& params, SkParticleState& ps) const {
+float SkCurve::eval(const SkParticleUpdateParams& params, SkParticleState& ps) const {
SkASSERT(fSegments.count() == fXValues.count() + 1);
float x = fInput.eval(params, ps);
@@ -91,17 +91,17 @@
}
}
- SkScalar rangeMin = (i == 0) ? 0.0f : fXValues[i - 1];
- SkScalar rangeMax = (i == fXValues.count()) ? 1.0f : fXValues[i];
- SkScalar segmentX = (x - rangeMin) / (rangeMax - rangeMin);
- if (!SkScalarIsFinite(segmentX)) {
+ float rangeMin = (i == 0) ? 0.0f : fXValues[i - 1];
+ float rangeMax = (i == fXValues.count()) ? 1.0f : fXValues[i];
+ float segmentX = (x - rangeMin) / (rangeMax - rangeMin);
+ if (!sk_float_isfinite(segmentX)) {
segmentX = rangeMin;
}
SkASSERT(0.0f <= segmentX && segmentX <= 1.0f);
// Always pull t and negate here, so that the stable generator behaves consistently, even if
// our segments use an inconsistent feature-set.
- SkScalar t = ps.fRandom.nextF();
+ float t = ps.fRandom.nextF();
bool negate = ps.fRandom.nextBool();
return fSegments[i].eval(segmentX, t, negate);
}
@@ -121,7 +121,7 @@
}
}
-SkColor4f SkColorCurveSegment::eval(SkScalar x, SkScalar t) const {
+SkColor4f SkColorCurveSegment::eval(float x, float t) const {
SkColor4f result = eval_segment(fMin, x, fType);
if (fRanged) {
result = result + (eval_segment(fMax, x, fType) - result) * t;
@@ -164,10 +164,10 @@
}
}
- SkScalar rangeMin = (i == 0) ? 0.0f : fXValues[i - 1];
- SkScalar rangeMax = (i == fXValues.count()) ? 1.0f : fXValues[i];
- SkScalar segmentX = (x - rangeMin) / (rangeMax - rangeMin);
- if (!SkScalarIsFinite(segmentX)) {
+ float rangeMin = (i == 0) ? 0.0f : fXValues[i - 1];
+ float rangeMax = (i == fXValues.count()) ? 1.0f : fXValues[i];
+ float segmentX = (x - rangeMin) / (rangeMax - rangeMin);
+ if (!sk_float_isfinite(segmentX)) {
segmentX = rangeMin;
}
SkASSERT(0.0f <= segmentX && segmentX <= 1.0f);