Skip to content

fix(sector): don't use normalizeArcAngles anymore. #871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pissang merged 2 commits into from
Jan 13, 2022
Merged

fix(sector): don't use normalizeArcAngles anymore. #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a40f31a
fix(srctor): 1) don't use `normalizeArcAngles` anymore. 2) optimize t…
plainheart Jan 13, 2022
25033ef
fix(sector): remove unused import.
plainheart Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 55 additions & 50 deletions src/graphic/helper/roundSector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import PathProxy, { normalizeArcAngles } from '../../core/PathProxy';
import PathProxy from '../../core/PathProxy';
import { isArray } from '../../core/util';

const PI = Math.PI;
Expand Down Expand Up @@ -148,17 +148,9 @@ export function buildPath(ctx: CanvasRenderingContext2D | PathProxy, shape: {
const clockwise = !!shape.clockwise;
const { startAngle, endAngle, cx, cy, cornerRadius } = shape;

// PENDING: whether normalizing angles is required?
let arc: number;
// FIXME: there may be a precision issue in `normalizeArcAngles`
if (startAngle === endAngle) {
arc = 0;
}
else {
const tmpAngles = [startAngle, endAngle];
normalizeArcAngles(tmpAngles, !clockwise);
arc = mathAbs(tmpAngles[0] - tmpAngles[1]);
}
let arc = mathAbs(endAngle - startAngle);
const mod = arc && arc % PI2;
mod && (arc = mod);

// is a point
if (!(radius > e)) {
Expand Down Expand Up @@ -186,58 +178,71 @@ export function buildPath(ctx: CanvasRenderingContext2D | PathProxy, shape: {
let icrEnd;
let ocrStart;
let ocrEnd;
if (cornerRadius) {
[icrStart, icrEnd, ocrStart, ocrEnd] = normalizeCornerRadius(cornerRadius);
}

const halfRd = mathAbs(radius - innerRadius) / 2;
const ocrs = mathMin(halfRd, ocrStart);
const ocre = mathMin(halfRd, ocrEnd);
const icrs = mathMin(halfRd, icrStart);
const icre = mathMin(halfRd, icrEnd);
let ocrs;
let ocre;
let icrs;
let icre;

const ocrMax = mathMax(ocrs, ocre);
const icrMax = mathMax(icrs, icre);
let limitedOcrMax = ocrMax;
let limitedIcrMax = icrMax;
let ocrMax;
let icrMax;
let limitedOcrMax;
let limitedIcrMax;

let xre;
let yre;
let xirs;
let yirs;

const xrs = radius * mathCos(startAngle);
const yrs = radius * mathSin(startAngle);
const xire = innerRadius * mathCos(endAngle);
const yire = innerRadius * mathSin(endAngle);

let xre;
let yre;
let xirs;
let yirs;
const hasArc = arc > e;
if (hasArc) {
if (cornerRadius) {
[icrStart, icrEnd, ocrStart, ocrEnd] = normalizeCornerRadius(cornerRadius);
}

const halfRd = mathAbs(radius - innerRadius) / 2;
ocrs = mathMin(halfRd, ocrStart);
ocre = mathMin(halfRd, ocrEnd);
icrs = mathMin(halfRd, icrStart);
icre = mathMin(halfRd, icrEnd);

limitedOcrMax = ocrMax = mathMax(ocrs, ocre);
limitedIcrMax = icrMax = mathMax(icrs, icre);

// draw corner radius
if (ocrMax > e || icrMax > e) {
xre = radius * mathCos(endAngle);
yre = radius * mathSin(endAngle);
xirs = innerRadius * mathCos(startAngle);
yirs = innerRadius * mathSin(startAngle);
// draw corner radius
if (ocrMax > e || icrMax > e) {
xre = radius * mathCos(endAngle);
yre = radius * mathSin(endAngle);
xirs = innerRadius * mathCos(startAngle);
yirs = innerRadius * mathSin(startAngle);

// restrict the max value of corner radius
if (arc < PI) {
const it = intersect(xrs, yrs, xirs, yirs, xre, yre, xire, yire);
if (it) {
const x0 = xrs - it[0];
const y0 = yrs - it[1];
const x1 = xre - it[0];
const y1 = yre - it[1];
const a = 1 / mathSin(
mathACos((x0 * x1 + y0 * y1) / (mathSqrt(x0 * x0 + y0 * y0) * mathSqrt(x1 * x1 + y1 * y1))) / 2
);
const b = mathSqrt(it[0] * it[0] + it[1] * it[1]);
limitedOcrMax = mathMin(ocrMax, (radius - b) / (a + 1));
limitedIcrMax = mathMin(icrMax, (innerRadius - b) / (a - 1));
// restrict the max value of corner radius
if (arc < PI) {
const it = intersect(xrs, yrs, xirs, yirs, xre, yre, xire, yire);
if (it) {
const x0 = xrs - it[0];
const y0 = yrs - it[1];
const x1 = xre - it[0];
const y1 = yre - it[1];
const a = 1 / mathSin(
// eslint-disable-next-line max-len
mathACos((x0 * x1 + y0 * y1) / (mathSqrt(x0 * x0 + y0 * y0) * mathSqrt(x1 * x1 + y1 * y1))) / 2
);
const b = mathSqrt(it[0] * it[0] + it[1] * it[1]);
limitedOcrMax = mathMin(ocrMax, (radius - b) / (a + 1));
limitedIcrMax = mathMin(icrMax, (innerRadius - b) / (a - 1));
}
}
}
}

// the sector is collapsed to a line
if (!(arc > e)) {
if (!hasArc) {
ctx.moveTo(cx + xrs, cy + yrs);
}
// the outer ring has corners
Expand Down Expand Up @@ -271,7 +276,7 @@ export function buildPath(ctx: CanvasRenderingContext2D | PathProxy, shape: {
}

// no inner ring, is a circular sector
if (!(innerRadius > e) || !(arc > e)) {
if (!(innerRadius > e) || !hasArc) {
ctx.lineTo(cx + xire, cy + yire);
}
// the inner ring has corners
Expand Down
31 changes: 30 additions & 1 deletion test/sector.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,35 @@
}
}));

zr.add(new zrender.Sector({
position: [100, 300],
scale: [1, 1],
style: {
stroke: 'black'
},
shape: {
startAngle: 0.6981317007977319,
endAngle: 0.6981317007977318,
r: 100,
//clockwise: false
}
}));

zr.add(new zrender.Sector({
position: [100, 550],
scale: [1, 1],
style: {
stroke: 'black'
},
shape: {
startAngle: Math.PI * 2,
endAngle: -1,
cornerRadius: 20,
r: 100,
//clockwise: false
}
}));

zr.add(new zrender.Sector({
position: [400, 150],
scale: [1, 1],
Expand Down Expand Up @@ -146,6 +175,6 @@
}
}));
</script>
<div id="main" style="width:1000px;height:600px;"></div>
<div id="main" style="width:1000px;height:800px;"></div>
</body>
</html>