mirror of
https://github.com/konvajs/konva.git
synced 2025-06-28 02:03:47 +08:00
little refactoring
This commit is contained in:
Anton Lavrenov
parent
390bd3e10b
commit
742c08599a
4
konva.min.js
vendored
4
konva.min.js
vendored
File diff suppressed because one or more lines are too long
@ -1,4 +1,5 @@
|
||||
// Credits: rveciana/svg-path-properties
|
||||
|
||||
// Legendre-Gauss abscissae (xi values, defined at i=n as the roots of the nth order Legendre polynomial Pn(x))
|
||||
export const tValues = [
|
||||
[],
|
||||
@ -689,3 +690,138 @@ export const cValues = [
|
||||
|
||||
// LUT for binomial coefficient arrays per curve order 'n'
|
||||
export const binomialCoefficients = [[1], [1, 1], [1, 2, 1], [1, 3, 3, 1]];
|
||||
|
||||
export const getCubicArcLength = (xs: number[], ys: number[], t: number) => {
|
||||
let z: number;
|
||||
let sum: number;
|
||||
let correctedT: number;
|
||||
|
||||
/*if (xs.length >= tValues.length) {
|
||||
throw new Error('too high n bezier');
|
||||
}*/
|
||||
|
||||
const n = 20;
|
||||
|
||||
z = t / 2;
|
||||
sum = 0;
|
||||
for (let i = 0; i < n; i++) {
|
||||
correctedT = z * tValues[n][i] + z;
|
||||
sum += cValues[n][i] * BFunc(xs, ys, correctedT);
|
||||
}
|
||||
return z * sum;
|
||||
};
|
||||
|
||||
export const getQuadraticArcLength = (
|
||||
xs: number[],
|
||||
ys: number[],
|
||||
t: number
|
||||
) => {
|
||||
if (t === undefined) {
|
||||
t = 1;
|
||||
}
|
||||
const ax = xs[0] - 2 * xs[1] + xs[2];
|
||||
const ay = ys[0] - 2 * ys[1] + ys[2];
|
||||
const bx = 2 * xs[1] - 2 * xs[0];
|
||||
const by = 2 * ys[1] - 2 * ys[0];
|
||||
|
||||
const A = 4 * (ax * ax + ay * ay);
|
||||
const B = 4 * (ax * bx + ay * by);
|
||||
const C = bx * bx + by * by;
|
||||
|
||||
if (A === 0) {
|
||||
return (
|
||||
t * Math.sqrt(Math.pow(xs[2] - xs[0], 2) + Math.pow(ys[2] - ys[0], 2))
|
||||
);
|
||||
}
|
||||
const b = B / (2 * A);
|
||||
const c = C / A;
|
||||
const u = t + b;
|
||||
const k = c - b * b;
|
||||
|
||||
const uuk = u * u + k > 0 ? Math.sqrt(u * u + k) : 0;
|
||||
const bbk = b * b + k > 0 ? Math.sqrt(b * b + k) : 0;
|
||||
const term =
|
||||
b + Math.sqrt(b * b + k) !== 0
|
||||
? k * Math.log(Math.abs((u + uuk) / (b + bbk)))
|
||||
: 0;
|
||||
|
||||
return (Math.sqrt(A) / 2) * (u * uuk - b * bbk + term);
|
||||
};
|
||||
|
||||
function BFunc(xs: number[], ys: number[], t: number) {
|
||||
const xbase = getDerivative(1, t, xs);
|
||||
const ybase = getDerivative(1, t, ys);
|
||||
const combined = xbase * xbase + ybase * ybase;
|
||||
return Math.sqrt(combined);
|
||||
}
|
||||
|
||||
/**
|
||||
* Compute the curve derivative (hodograph) at t.
|
||||
*/
|
||||
const getDerivative = (derivative: number, t: number, vs: number[]): number => {
|
||||
// the derivative of any 't'-less function is zero.
|
||||
const n = vs.length - 1;
|
||||
let _vs;
|
||||
let value;
|
||||
|
||||
if (n === 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// direct values? compute!
|
||||
if (derivative === 0) {
|
||||
value = 0;
|
||||
for (let k = 0; k <= n; k++) {
|
||||
value +=
|
||||
binomialCoefficients[n][k] *
|
||||
Math.pow(1 - t, n - k) *
|
||||
Math.pow(t, k) *
|
||||
vs[k];
|
||||
}
|
||||
return value;
|
||||
} else {
|
||||
// Still some derivative? go down one order, then try
|
||||
// for the lower order curve's.
|
||||
_vs = new Array(n);
|
||||
for (let k = 0; k < n; k++) {
|
||||
_vs[k] = n * (vs[k + 1] - vs[k]);
|
||||
}
|
||||
return getDerivative(derivative - 1, t, _vs);
|
||||
}
|
||||
};
|
||||
|
||||
export const t2length = (
|
||||
length: number,
|
||||
totalLength: number,
|
||||
func: (t: number) => number
|
||||
): number => {
|
||||
let error = 1;
|
||||
let t = length / totalLength;
|
||||
let step = (length - func(t)) / totalLength;
|
||||
|
||||
let numIterations = 0;
|
||||
while (error > 0.001) {
|
||||
const increasedTLength = func(t + step);
|
||||
const increasedTError = Math.abs(length - increasedTLength) / totalLength;
|
||||
if (increasedTError < error) {
|
||||
error = increasedTError;
|
||||
t += step;
|
||||
} else {
|
||||
const decreasedTLength = func(t - step);
|
||||
const decreasedTError = Math.abs(length - decreasedTLength) / totalLength;
|
||||
if (decreasedTError < error) {
|
||||
error = decreasedTError;
|
||||
t -= step;
|
||||
} else {
|
||||
step /= 2;
|
||||
}
|
||||
}
|
||||
|
||||
numIterations++;
|
||||
if (numIterations > 500) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return t;
|
||||
};
|
||||
@ -7,7 +7,7 @@ import {
|
||||
getCubicArcLength,
|
||||
getQuadraticArcLength,
|
||||
t2length,
|
||||
} from './bezier/functions';
|
||||
} from '../BezierFunctions';
|
||||
|
||||
export interface PathConfig extends ShapeConfig {
|
||||
data?: string;
|
||||
|
||||
@ -117,6 +117,12 @@ export class TextPath extends Shape<TextPathConfig> {
|
||||
return null;
|
||||
}
|
||||
|
||||
const totalLength = this.pathLength;
|
||||
// -1px for rounding of the last symbol
|
||||
if (length - 1 > totalLength) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Path.getPointAtLengthOfDataArray(length, this.dataArray);
|
||||
}
|
||||
|
||||
|
||||
@ -1,140 +0,0 @@
|
||||
// Credits: rveciana/svg-path-properties
|
||||
|
||||
import { tValues, cValues, binomialCoefficients } from './values';
|
||||
|
||||
export const getCubicArcLength = (xs: number[], ys: number[], t: number) => {
|
||||
let z: number;
|
||||
let sum: number;
|
||||
let correctedT: number;
|
||||
|
||||
/*if (xs.length >= tValues.length) {
|
||||
throw new Error('too high n bezier');
|
||||
}*/
|
||||
|
||||
const n = 20;
|
||||
|
||||
z = t / 2;
|
||||
sum = 0;
|
||||
for (let i = 0; i < n; i++) {
|
||||
correctedT = z * tValues[n][i] + z;
|
||||
sum += cValues[n][i] * BFunc(xs, ys, correctedT);
|
||||
}
|
||||
return z * sum;
|
||||
};
|
||||
|
||||
|
||||
export const getQuadraticArcLength = (
|
||||
xs: number[],
|
||||
ys: number[],
|
||||
t: number
|
||||
) => {
|
||||
if (t === undefined) {
|
||||
t = 1;
|
||||
}
|
||||
const ax = xs[0] - 2 * xs[1] + xs[2];
|
||||
const ay = ys[0] - 2 * ys[1] + ys[2];
|
||||
const bx = 2 * xs[1] - 2 * xs[0];
|
||||
const by = 2 * ys[1] - 2 * ys[0];
|
||||
|
||||
const A = 4 * (ax * ax + ay * ay);
|
||||
const B = 4 * (ax * bx + ay * by);
|
||||
const C = bx * bx + by * by;
|
||||
|
||||
if (A === 0) {
|
||||
return (
|
||||
t * Math.sqrt(Math.pow(xs[2] - xs[0], 2) + Math.pow(ys[2] - ys[0], 2))
|
||||
);
|
||||
}
|
||||
const b = B / (2 * A);
|
||||
const c = C / A;
|
||||
const u = t + b;
|
||||
const k = c - b * b;
|
||||
|
||||
const uuk = u * u + k > 0 ? Math.sqrt(u * u + k) : 0;
|
||||
const bbk = b * b + k > 0 ? Math.sqrt(b * b + k) : 0;
|
||||
const term =
|
||||
b + Math.sqrt(b * b + k) !== 0
|
||||
? k * Math.log(Math.abs((u + uuk) / (b + bbk)))
|
||||
: 0;
|
||||
|
||||
return (Math.sqrt(A) / 2) * (u * uuk - b * bbk + term);
|
||||
};
|
||||
|
||||
|
||||
function BFunc(xs: number[], ys: number[], t: number) {
|
||||
const xbase = getDerivative(1, t, xs);
|
||||
const ybase = getDerivative(1, t, ys);
|
||||
const combined = xbase * xbase + ybase * ybase;
|
||||
return Math.sqrt(combined);
|
||||
}
|
||||
|
||||
/**
|
||||
* Compute the curve derivative (hodograph) at t.
|
||||
*/
|
||||
const getDerivative = (derivative: number, t: number, vs: number[]): number => {
|
||||
// the derivative of any 't'-less function is zero.
|
||||
const n = vs.length - 1;
|
||||
let _vs;
|
||||
let value;
|
||||
|
||||
if (n === 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// direct values? compute!
|
||||
if (derivative === 0) {
|
||||
value = 0;
|
||||
for (let k = 0; k <= n; k++) {
|
||||
value +=
|
||||
binomialCoefficients[n][k] *
|
||||
Math.pow(1 - t, n - k) *
|
||||
Math.pow(t, k) *
|
||||
vs[k];
|
||||
}
|
||||
return value;
|
||||
} else {
|
||||
// Still some derivative? go down one order, then try
|
||||
// for the lower order curve's.
|
||||
_vs = new Array(n);
|
||||
for (let k = 0; k < n; k++) {
|
||||
_vs[k] = n * (vs[k + 1] - vs[k]);
|
||||
}
|
||||
return getDerivative(derivative - 1, t, _vs);
|
||||
}
|
||||
};
|
||||
|
||||
export const t2length = (
|
||||
length: number,
|
||||
totalLength: number,
|
||||
func: (t: number) => number
|
||||
): number => {
|
||||
let error = 1;
|
||||
let t = length / totalLength;
|
||||
let step = (length - func(t)) / totalLength;
|
||||
|
||||
let numIterations = 0;
|
||||
while (error > 0.001) {
|
||||
const increasedTLength = func(t + step);
|
||||
const increasedTError = Math.abs(length - increasedTLength) / totalLength;
|
||||
if (increasedTError < error) {
|
||||
error = increasedTError;
|
||||
t += step;
|
||||
} else {
|
||||
const decreasedTLength = func(t - step);
|
||||
const decreasedTError = Math.abs(length - decreasedTLength) / totalLength;
|
||||
if (decreasedTError < error) {
|
||||
error = decreasedTError;
|
||||
t -= step;
|
||||
} else {
|
||||
step /= 2;
|
||||
}
|
||||
}
|
||||
|
||||
numIterations++;
|
||||
if (numIterations > 500) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return t;
|
||||
};
|
||||
@ -227,6 +227,6 @@ describe('Arrow', function () {
|
||||
arrow.cache();
|
||||
layer.draw();
|
||||
|
||||
cloneAndCompareLayer(layer, 200);
|
||||
cloneAndCompareLayer(layer, 255, 50);
|
||||
});
|
||||
});
|
||||
|
||||
@ -488,12 +488,12 @@ describe('Caching', function () {
|
||||
context.stroke();
|
||||
context.restore();
|
||||
|
||||
compareLayerAndCanvas(layer, canvas, 150);
|
||||
compareLayerAndCanvas(layer, canvas, 210, 20);
|
||||
|
||||
// recache
|
||||
group.cache();
|
||||
layer.draw();
|
||||
compareLayerAndCanvas(layer, canvas, 150);
|
||||
compareLayerAndCanvas(layer, canvas, 210, 20);
|
||||
});
|
||||
|
||||
it('cache group with rectangle and text', function () {
|
||||
|
||||
@ -138,8 +138,9 @@ describe('Star', function () {
|
||||
});
|
||||
|
||||
layer.add(star);
|
||||
star.cache();
|
||||
|
||||
stage.add(layer);
|
||||
star.cache();
|
||||
|
||||
assert.deepEqual(star.getSelfRect(), {
|
||||
x: -50,
|
||||
|
||||
@ -77,10 +77,10 @@ describe('TextPath', function () {
|
||||
|
||||
layer.draw();
|
||||
|
||||
var trace = layer.getContext().getTrace();
|
||||
var trace = layer.getContext().getTrace(true);
|
||||
assert.equal(
|
||||
trace,
|
||||
'clearRect(0,0,578,200);clearRect(0,0,578,200);save();transform(1,0,0,1,0,0);beginPath();moveTo(10,10);lineTo(60,10);lineWidth=1;strokeStyle=red;stroke();restore();save();transform(1,0,0,1,0,0);font=normal normal 24px Arial;textBaseline=middle;textAlign=left;save();save();translate(10,10);rotate(0);fillStyle=orange;fillText(T,0,0);restore();save();translate(24.66,10);rotate(0);fillStyle=orange;fillText(h,0,0);restore();save();translate(38.008,10);rotate(0);fillStyle=orange;fillText(e,0,0);restore();save();translate(51.355,10);rotate(0);fillStyle=orange;fillText( ,0,0);restore();restore();restore();'
|
||||
'clearRect();clearRect();save();transform();beginPath();moveTo();lineTo();lineWidth;strokeStyle;stroke();restore();save();transform();font;textBaseline;textAlign;save();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();restore();restore();'
|
||||
);
|
||||
});
|
||||
|
||||
@ -761,7 +761,7 @@ describe('TextPath', function () {
|
||||
assert.equal(rect.height, 0, 'check height');
|
||||
});
|
||||
|
||||
it.only('dashes on line', function () {
|
||||
it('dashes on line', function () {
|
||||
var stage = addStage();
|
||||
stage.draggable(true);
|
||||
|
||||
@ -773,9 +773,8 @@ describe('TextPath', function () {
|
||||
fontSize: 16,
|
||||
scaleX: 0.8,
|
||||
scaleY: 0.8,
|
||||
text: '----------------',
|
||||
text: '_______________',
|
||||
data: 'M 0,10 L 300 10',
|
||||
textDecoration: 'underline',
|
||||
y: 5,
|
||||
});
|
||||
layer.add(textpath);
|
||||
@ -791,18 +790,10 @@ describe('TextPath', function () {
|
||||
var rect = textpath.getClientRect();
|
||||
|
||||
// just different results in different envs
|
||||
if (isBrowser) {
|
||||
assert.equal(Math.round(rect.height), 331, 'check height');
|
||||
} else {
|
||||
assert.equal(Math.round(rect.height), 333, 'check height');
|
||||
}
|
||||
|
||||
textpath.text('');
|
||||
rect = textpath.getClientRect();
|
||||
assert.equal(rect.height, 0, 'check height');
|
||||
assert.equal(Math.round(rect.height), 13, 'check height');
|
||||
});
|
||||
|
||||
it.only('check bad calculations', function () {
|
||||
it('check bad calculations', function () {
|
||||
var stage = addStage();
|
||||
stage.draggable(true);
|
||||
|
||||
@ -814,11 +805,19 @@ describe('TextPath', function () {
|
||||
fontSize: 16,
|
||||
scaleX: 0.8,
|
||||
scaleY: 0.8,
|
||||
textDecoration: 'underline',
|
||||
text: '__________________________________________________________________________________________________________________________________________________________________________________________________________________',
|
||||
text: '___________________________________________________________________________________________________________________________________________________________________________________________________________________',
|
||||
data: 'M 109.98618090452261 138.6656132223618 C 135.94577638190955 48.80547503140701 149.91187876884422 79.79800957914573 151.40954773869348 117.23973382537689 S 123.00811620603017 419.616741991206 122.84170854271358 460.0538041771357 S 134.33883542713568 469.8304329459799 149.98115577889448 464.33898005653265 S 245.4620163316583 411.5856081972362 257.1105527638191 412.91686950376885 S 239.31850251256282 474.434854428392 249.96859296482413 475.76611573492465 S 338.21036306532665 425.67526648869347 348.5276381909548 424.3440051821608 S 337.3640408291457 461.1772344535176 338.5288944723618 464.33898005653265 S 346.8778454773869 466.79295744346734 358.52638190954775 451.4834524183417',
|
||||
});
|
||||
layer.add(textpath);
|
||||
|
||||
layer.draw();
|
||||
|
||||
var trace = layer.getContext().getTrace(true);
|
||||
assert.equal(
|
||||
trace,
|
||||
'restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();save();translate();rotate();fillStyle;fillText();restore();restore();restore();'
|
||||
);
|
||||
|
||||
var path = new Konva.Path({
|
||||
stroke: 'red',
|
||||
scaleX: 0.8,
|
||||
@ -881,10 +880,11 @@ describe('TextPath', function () {
|
||||
layer.draw();
|
||||
|
||||
var rect = textpath.getClientRect();
|
||||
assert.equal(Math.round(rect.width), 299);
|
||||
if (isBrowser) {
|
||||
assert.equal(Math.round(rect.width), 299);
|
||||
assert.equal(Math.round(rect.height), 171);
|
||||
} else {
|
||||
assert.equal(Math.round(rect.width), 298);
|
||||
assert.equal(Math.round(rect.height), 170);
|
||||
}
|
||||
});
|
||||
|
||||
Loading…
Reference in New Issue
Block a user