Skip to content

Commit 3ba2094

Browse files
committed
Review comments
1 parent 1b069a1 commit 3ba2094

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/elements/element.line.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import defaults from '../core/core.defaults';
44
import Element from '../core/core.element';
55
import {_steppedLineTo, _bezierCurveTo} from '../helpers/helpers.canvas';
6-
import {_angleDiff, _angleDiffCW, _normalizeAngle, _pointInLine, _steppedInterpolation, _bezierInterpolation} from '../helpers/helpers.math';
6+
import {_angleDiff, _angleDiffPD, _normalizeAngle, _pointInLine, _steppedInterpolation, _bezierInterpolation} from '../helpers/helpers.math';
77

88
const defaultColor = defaults.global.defaultColor;
99

@@ -169,7 +169,7 @@ function useFastPath(vm, options) {
169169

170170
function angleBetween(a, s, e) {
171171
return a === s || a === e ||
172-
(_angleDiffCW(a, s) > _angleDiffCW(a, e) && _angleDiffCW(s, a) < _angleDiffCW(e, a));
172+
(_angleDiffPD(a, s) > _angleDiffPD(a, e) && _angleDiffPD(s, a) < _angleDiffPD(e, a));
173173
}
174174

175175
function propertyFn(property) {

src/helpers/helpers.math.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,22 +181,25 @@ export function _bezierInterpolation(p1, p2, t) {
181181
}
182182

183183
/**
184+
* Shortest distance between agnles, in either direction.
184185
* @private
185186
*/
186187
export function _angleDiff(a, b) {
187188
return (a - b + PITAU) % TAU - PI;
188189
}
189190

190191
/**
192+
* Normalize angle to be between 0 and 2*PI
191193
* @private
192194
*/
193195
export function _normalizeAngle(a) {
194-
return (a + TAU) % TAU;
196+
return (a % TAU + TAU) % TAU;
195197
}
196198

197199
/**
200+
* Angle difference in positive direction.
198201
* @private
199202
*/
200-
export function _angleDiffCW(a, b) {
201-
return (_normalizeAngle(b) - _normalizeAngle(a) + TAU) % TAU;
203+
export function _angleDiffPD(a, b) {
204+
return _normalizeAngle(_normalizeAngle(b) - _normalizeAngle(a));
202205
}

0 commit comments

Comments
 (0)