< prev index next >
src/java.desktop/share/classes/sun/java2d/marlin/Dasher.java
Print this page
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -37,15 +37,20 @@
* <p> Issues: in J2Se, a zero length dash segment as drawn as a very
* short dash, whereas Pisces does not draw anything. The PostScript
* semantics are unclear.
*
*/
-final class Dasher implements sun.awt.geom.PathConsumer2D, MarlinConst {
+final class Dasher implements PathConsumer2D, MarlinConst {
static final int REC_LIMIT = 4;
static final float ERR = 0.01f;
- static final float MIN_T_INC = 1f / (1 << REC_LIMIT);
+ static final float MIN_T_INC = 1.0f / (1 << REC_LIMIT);
+
+ // More than 24 bits of mantissa means we can no longer accurately
+ // measure the number of times cycled through the dash array so we
+ // punt and override the phase to just be 0 past that point.
+ static final float MAX_CYCLES = 16000000.0f;
private PathConsumer2D out;
private float[] dash;
private int dashLen;
private float startPhase;
@@ -104,30 +109,60 @@
* @return this instance
*/
Dasher init(final PathConsumer2D out, float[] dash, int dashLen,
float phase, boolean recycleDashes)
{
- if (phase < 0f) {
- throw new IllegalArgumentException("phase < 0 !");
- }
this.out = out;
// Normalize so 0 <= phase < dash[0]
- int idx = 0;
+ int sidx = 0;
dashOn = true;
- float d;
- while (phase >= (d = dash[idx])) {
- phase -= d;
- idx = (idx + 1) % dashLen;
- dashOn = !dashOn;
+ float sum = 0.0f;
+ for (float d : dash) {
+ sum += d;
+ }
+ float cycles = phase / sum;
+ if (phase < 0.0f) {
+ if (-cycles >= MAX_CYCLES) {
+ phase = 0.0f;
+ } else {
+ int fullcycles = FloatMath.floor_int(-cycles);
+ if ((fullcycles & dash.length & 1) != 0) {
+ dashOn = !dashOn;
+ }
+ phase += fullcycles * sum;
+ while (phase < 0.0f) {
+ if (--sidx < 0) {
+ sidx = dash.length - 1;
+ }
+ phase += dash[sidx];
+ dashOn = !dashOn;
+ }
+ }
+ } else if (phase > 0) {
+ if (cycles >= MAX_CYCLES) {
+ phase = 0.0f;
+ } else {
+ int fullcycles = FloatMath.floor_int(cycles);
+ if ((fullcycles & dash.length & 1) != 0) {
+ dashOn = !dashOn;
+ }
+ phase -= fullcycles * sum;
+ float d;
+ while (phase >= (d = dash[sidx])) {
+ phase -= d;
+ sidx = (sidx + 1) % dash.length;
+ dashOn = !dashOn;
+ }
+ }
}
this.dash = dash;
this.dashLen = dashLen;
this.startPhase = this.phase = phase;
this.startDashOn = dashOn;
- this.startIdx = idx;
+ this.startIdx = sidx;
this.starting = true;
needsMoveTo = false;
firstSegidx = 0;
this.recycleDashes = recycleDashes;
@@ -140,19 +175,34 @@
* clean up before reusing this instance
*/
void dispose() {
if (DO_CLEAN_DIRTY) {
// Force zero-fill dirty arrays:
- Arrays.fill(curCurvepts, 0f);
+ Arrays.fill(curCurvepts, 0.0f);
}
// Return arrays:
if (recycleDashes) {
dash = dashes_ref.putArray(dash);
}
firstSegmentsBuffer = firstSegmentsBuffer_ref.putArray(firstSegmentsBuffer);
}
+ float[] copyDashArray(final float[] dashes) {
+ final int len = dashes.length;
+ final float[] newDashes;
+ if (len <= MarlinConst.INITIAL_ARRAY) {
+ newDashes = dashes_ref.initial;
+ } else {
+ if (DO_STATS) {
+ rdrCtx.stats.stat_array_dasher_dasher.add(len);
+ }
+ newDashes = dashes_ref.getArray(len);
+ }
+ System.arraycopy(dashes, 0, newDashes, 0, len);
+ return newDashes;
+ }
+
@Override
public void moveTo(float x0, float y0) {
if (firstSegidx > 0) {
out.moveTo(sx, sy);
emitFirstSegments();
@@ -200,17 +250,16 @@
// buffer below.
private float[] firstSegmentsBuffer; // dynamic array
private int firstSegidx;
// precondition: pts must be in relative coordinates (relative to x0,y0)
- // fullCurve is true iff the curve in pts has not been split.
private void goTo(float[] pts, int off, final int type) {
float x = pts[off + type - 4];
float y = pts[off + type - 3];
if (dashOn) {
if (starting) {
- int len = type - 2 + 1;
+ int len = type - 1; // - 2 + 1
int segIdx = firstSegidx;
float[] buf = firstSegmentsBuffer;
if (segIdx + len > buf.length) {
if (DO_STATS) {
rdrCtx.stats.stat_array_dasher_firstSegmentsBuffer
@@ -245,11 +294,11 @@
public void lineTo(float x1, float y1) {
float dx = x1 - x0;
float dy = y1 - y0;
float len = dx*dx + dy*dy;
- if (len == 0f) {
+ if (len == 0.0f) {
return;
}
len = (float) Math.sqrt(len);
// The scaling factors needed to get the dx and dy of the
@@ -273,21 +322,21 @@
// Advance phase within current dash segment
phase += len;
// TODO: compare float values using epsilon:
if (len == leftInThisDashSegment) {
- phase = 0f;
+ phase = 0.0f;
idx = (idx + 1) % dashLen;
dashOn = !dashOn;
}
return;
}
dashdx = _dash[idx] * cx;
dashdy = _dash[idx] * cy;
- if (phase == 0f) {
+ if (phase == 0.0f) {
_curCurvepts[0] = x0 + dashdx;
_curCurvepts[1] = y0 + dashdy;
} else {
p = leftInThisDashSegment / _dash[idx];
_curCurvepts[0] = x0 + p * dashdx;
@@ -298,11 +347,11 @@
len -= leftInThisDashSegment;
// Advance to next dash segment
idx = (idx + 1) % dashLen;
dashOn = !dashOn;
- phase = 0f;
+ phase = 0.0f;
}
}
// shared instance in Dasher
private final LengthIterator li = new LengthIterator();
@@ -315,34 +364,34 @@
}
li.initializeIterationOnCurve(curCurvepts, type);
// initially the current curve is at curCurvepts[0...type]
int curCurveoff = 0;
- float lastSplitT = 0f;
+ float lastSplitT = 0.0f;
float t;
float leftInThisDashSegment = dash[idx] - phase;
- while ((t = li.next(leftInThisDashSegment)) < 1f) {
- if (t != 0f) {
- Helpers.subdivideAt((t - lastSplitT) / (1f - lastSplitT),
+ while ((t = li.next(leftInThisDashSegment)) < 1.0f) {
+ if (t != 0.0f) {
+ Helpers.subdivideAt((t - lastSplitT) / (1.0f - lastSplitT),
curCurvepts, curCurveoff,
curCurvepts, 0,
curCurvepts, type, type);
lastSplitT = t;
goTo(curCurvepts, 2, type);
curCurveoff = type;
}
// Advance to next dash segment
idx = (idx + 1) % dashLen;
dashOn = !dashOn;
- phase = 0f;
+ phase = 0.0f;
leftInThisDashSegment = dash[idx];
}
goTo(curCurvepts, curCurveoff+2, type);
phase += li.lastSegLen();
if (phase >= dash[idx]) {
- phase = 0f;
+ phase = 0.0f;
idx = (idx + 1) % dashLen;
dashOn = !dashOn;
}
// reset LengthIterator:
li.reset();
@@ -393,11 +442,11 @@
private int recLevel;
private boolean done;
// the lengths of the lines of the control polygon. Only its first
// curveType/2 - 1 elements are valid. This is an optimization. See
- // next(float) for more detail.
+ // next() for more detail.
private final float[] curLeafCtrlPolyLengths = new float[3];
LengthIterator() {
this.recCurveStack = new float[REC_LIMIT + 1][8];
this.sides = new Side[REC_LIMIT];
@@ -418,40 +467,40 @@
// keep data dirty
// as it appears not useful to reset data:
if (DO_CLEAN_DIRTY) {
final int recLimit = recCurveStack.length - 1;
for (int i = recLimit; i >= 0; i--) {
- Arrays.fill(recCurveStack[i], 0f);
+ Arrays.fill(recCurveStack[i], 0.0f);
}
Arrays.fill(sides, Side.LEFT);
- Arrays.fill(curLeafCtrlPolyLengths, 0f);
- Arrays.fill(nextRoots, 0f);
- Arrays.fill(flatLeafCoefCache, 0f);
- flatLeafCoefCache[2] = -1f;
+ Arrays.fill(curLeafCtrlPolyLengths, 0.0f);
+ Arrays.fill(nextRoots, 0.0f);
+ Arrays.fill(flatLeafCoefCache, 0.0f);
+ flatLeafCoefCache[2] = -1.0f;
}
}
void initializeIterationOnCurve(float[] pts, int type) {
// optimize arraycopy (8 values faster than 6 = type):
System.arraycopy(pts, 0, recCurveStack[0], 0, 8);
this.curveType = type;
this.recLevel = 0;
- this.lastT = 0f;
- this.lenAtLastT = 0f;
- this.nextT = 0f;
- this.lenAtNextT = 0f;
+ this.lastT = 0.0f;
+ this.lenAtLastT = 0.0f;
+ this.nextT = 0.0f;
+ this.lenAtNextT = 0.0f;
goLeft(); // initializes nextT and lenAtNextT properly
- this.lenAtLastSplit = 0f;
+ this.lenAtLastSplit = 0.0f;
if (recLevel > 0) {
this.sides[0] = Side.LEFT;
this.done = false;
} else {
// the root of the tree is a leaf so we're done.
this.sides[0] = Side.RIGHT;
this.done = true;
}
- this.lastSegLen = 0f;
+ this.lastSegLen = 0.0f;
}
// 0 == false, 1 == true, -1 == invalid cached value.
private int cachedHaveLowAcceleration = -1;
@@ -460,11 +509,11 @@
final float len1 = curLeafCtrlPolyLengths[0];
final float len2 = curLeafCtrlPolyLengths[1];
// the test below is equivalent to !within(len1/len2, 1, err).
// It is using a multiplication instead of a division, so it
// should be a bit faster.
- if (!Helpers.within(len1, len2, err*len2)) {
+ if (!Helpers.within(len1, len2, err * len2)) {
cachedHaveLowAcceleration = 0;
return false;
}
if (curveType == 8) {
final float len3 = curLeafCtrlPolyLengths[2];
@@ -491,21 +540,21 @@
// caches the coefficients of the current leaf in its flattened
// form (see inside next() for what that means). The cache is
// invalid when it's third element is negative, since in any
// valid flattened curve, this would be >= 0.
- private final float[] flatLeafCoefCache = new float[]{0f, 0f, -1f, 0f};
+ private final float[] flatLeafCoefCache = new float[]{0.0f, 0.0f, -1.0f, 0.0f};
// returns the t value where the remaining curve should be split in
// order for the left subdivided curve to have length len. If len
// is >= than the length of the uniterated curve, it returns 1.
float next(final float len) {
final float targetLength = lenAtLastSplit + len;
while (lenAtNextT < targetLength) {
if (done) {
lastSegLen = lenAtNextT - lenAtLastSplit;
- return 1f;
+ return 1.0f;
}
goToNextLeaf();
}
lenAtLastSplit = targetLength;
final float leaflen = lenAtNextT - lenAtLastT;
@@ -518,23 +567,23 @@
// left with a, b, c which define a 1D Bezier curve. We then
// solve this to get the parameter of the original leaf that
// gives us the desired length.
final float[] _flatLeafCoefCache = flatLeafCoefCache;
- if (_flatLeafCoefCache[2] < 0) {
- float x = 0f + curLeafCtrlPolyLengths[0],
- y = x + curLeafCtrlPolyLengths[1];
+ if (_flatLeafCoefCache[2] < 0.0f) {
+ float x = curLeafCtrlPolyLengths[0],
+ y = x + curLeafCtrlPolyLengths[1];
if (curveType == 8) {
float z = y + curLeafCtrlPolyLengths[2];
- _flatLeafCoefCache[0] = 3f * (x - y) + z;
- _flatLeafCoefCache[1] = 3f * (y - 2f * x);
- _flatLeafCoefCache[2] = 3f * x;
+ _flatLeafCoefCache[0] = 3.0f * (x - y) + z;
+ _flatLeafCoefCache[1] = 3.0f * (y - 2.0f * x);
+ _flatLeafCoefCache[2] = 3.0f * x;
_flatLeafCoefCache[3] = -z;
} else if (curveType == 6) {
- _flatLeafCoefCache[0] = 0f;
- _flatLeafCoefCache[1] = y - 2f * x;
- _flatLeafCoefCache[2] = 2f * x;
+ _flatLeafCoefCache[0] = 0.0f;
+ _flatLeafCoefCache[1] = y - 2.0f * x;
+ _flatLeafCoefCache[2] = 2.0f * x;
_flatLeafCoefCache[3] = -y;
}
}
float a = _flatLeafCoefCache[0];
float b = _flatLeafCoefCache[1];
@@ -542,20 +591,20 @@
float d = t * _flatLeafCoefCache[3];
// we use cubicRootsInAB here, because we want only roots in 0, 1,
// and our quadratic root finder doesn't filter, so it's just a
// matter of convenience.
- int n = Helpers.cubicRootsInAB(a, b, c, d, nextRoots, 0, 0, 1);
+ int n = Helpers.cubicRootsInAB(a, b, c, d, nextRoots, 0, 0.0f, 1.0f);
if (n == 1 && !Float.isNaN(nextRoots[0])) {
t = nextRoots[0];
}
}
// t is relative to the current leaf, so we must make it a valid parameter
// of the original curve.
t = t * (nextT - lastT) + lastT;
- if (t >= 1f) {
- t = 1f;
+ if (t >= 1.0f) {
+ t = 1.0f;
done = true;
}
// even if done = true, if we're here, that means targetLength
// is equal to, or very, very close to the total length of the
// curve, so lastSegLen won't be too high. In cases where len
@@ -598,17 +647,17 @@
}
// go to the leftmost node from the current node. Return its length.
private void goLeft() {
float len = onLeaf();
- if (len >= 0f) {
+ if (len >= 0.0f) {
lastT = nextT;
lenAtLastT = lenAtNextT;
nextT += (1 << (REC_LIMIT - recLevel)) * MIN_T_INC;
lenAtNextT += len;
// invalidate caches
- flatLeafCoefCache[2] = -1f;
+ flatLeafCoefCache[2] = -1.0f;
cachedHaveLowAcceleration = -1;
} else {
Helpers.subdivide(recCurveStack[recLevel], 0,
recCurveStack[recLevel+1], 0,
recCurveStack[recLevel], 0, curveType);
@@ -620,11 +669,11 @@
// this is a bit of a hack. It returns -1 if we're not on a leaf, and
// the length of the leaf if we are on a leaf.
private float onLeaf() {
float[] curve = recCurveStack[recLevel];
- float polyLen = 0f;
+ float polyLen = 0.0f;
float x0 = curve[0], y0 = curve[1];
for (int i = 2; i < curveType; i += 2) {
final float x1 = curve[i], y1 = curve[i+1];
final float len = Helpers.linelen(x0, y0, x1, y1);
@@ -636,13 +685,13 @@
final float lineLen = Helpers.linelen(curve[0], curve[1],
curve[curveType-2],
curve[curveType-1]);
if ((polyLen - lineLen) < ERR || recLevel == REC_LIMIT) {
- return (polyLen + lineLen) / 2f;
+ return (polyLen + lineLen) / 2.0f;
}
- return -1f;
+ return -1.0f;
}
}
@Override
public void curveTo(float x1, float y1,
< prev index next >