flo-mat 3.0.10 → 3.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/__tests__/jsog/check-jsog-eql-calc.spec.ts +81 -0
- package/__tests__/jsog/decode-jsog.ts +85 -0
- package/__tests__/jsog/get-mats1.ts +41 -0
- package/__tests__/{cp-node/fs → jsog}/mat-dummys.ts +51 -564
- package/__tests__/jsog/to-jsog-breath-first.ts +107 -0
- package/__tests__/jsog/to-jsog-depth-first.ts +55 -0
- package/browser/index.js +87 -46
- package/browser/index.min.js +1 -1
- package/node/add-n-prong.ts/join-spokes.js.map +1 -1
- package/node/closest-boundary-point/dd-deflate-with-running-error.js.map +1 -1
- package/node/closest-boundary-point/get-close-boundary-points-certified.js.map +1 -1
- package/node/contact-point/contact-point.js.map +1 -1
- package/node/corner/get-corner.js.map +1 -1
- package/node/corner/get-interface-ccw.js.map +1 -1
- package/node/cp-node/cp-node-fs.d.ts +2 -1
- package/node/cp-node/cp-node-fs.js +1 -2
- package/node/cp-node/cp-node-fs.js.map +1 -1
- package/node/cp-node/fs/cp-node-comparator.d.ts +3 -0
- package/node/cp-node/fs/cp-node-comparator.js +6 -0
- package/node/cp-node/fs/cp-node-comparator.js.map +1 -0
- package/node/cp-node/fs/find-first.js.map +1 -1
- package/node/cp-node/fs/get-all-on-loop.js.map +1 -1
- package/node/cp-node/fs/get-branch-beziers.js.map +1 -1
- package/node/cp-node/fs/get-branch.js.map +1 -1
- package/node/cp-node/fs/get-children.js.map +1 -1
- package/node/cp-node/fs/get-first-exit.js.map +1 -1
- package/node/cp-node/fs/get-mat-curve-to-next.js.map +1 -1
- package/node/cp-node/fs/get-mat-curves-between.js.map +1 -1
- package/node/cp-node/fs/get-prong-count.js.map +1 -1
- package/node/cp-node/fs/get-real-prong-count.js.map +1 -1
- package/node/cp-node/fs/get-vertex-forward-children.js.map +1 -1
- package/node/cp-node/fs/is-fully-terminating.d.ts +1 -1
- package/node/cp-node/fs/is-fully-terminating.js.map +1 -1
- package/node/cp-node/fs/is-one-prong.js.map +1 -1
- package/node/cp-node/fs/is-sharp.js.map +1 -1
- package/node/cp-node/fs/is-terminating.js.map +1 -1
- package/node/cp-node/fs/traverse-cp.js.map +1 -1
- package/node/cp-node/fs/traverse-edges.js.map +1 -1
- package/node/cp-node/fs/traverse-vertices.js.map +1 -1
- package/node/debug/functions/draw-elem/bounding-hull.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-cp-node.js +1 -1
- package/node/debug/functions/draw-elem/draw-cp-node.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-cull.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-dull-corner.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-elem.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-leaves.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-loose-bounding-box.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-max-vertex.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-min-y.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-one-prong-at-dull-corner.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-one-prong.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-sharp-corner.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-speed.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-three-prong.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-tight-bounding-box.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-two-prong.js.map +1 -1
- package/node/debug/functions/draw-elem/draw-vertex.js.map +1 -1
- package/node/debug/functions/general.js.map +1 -1
- package/node/find-2-prong/add-1-prong.js.map +1 -1
- package/node/find-2-prong/find-2-prong.js.map +1 -1
- package/node/find-2-prong/find-equidistant-point-on-line-dd.js.map +1 -1
- package/node/find-3-prong.ts/find-3-prong.js.map +1 -1
- package/node/find-3-prong.ts/find-and-add-3-prong.js.map +1 -1
- package/node/find-3-prong.ts/find-and-add-3-prongs.js.map +1 -1
- package/node/find-mat/find-mats.js.map +1 -1
- package/node/geometry/get-closest-square-distance-to-rect.js.map +1 -1
- package/node/geometry/get-closest-squared-distance-to-rotated-rect.js.map +1 -1
- package/node/index.d.ts +35 -1
- package/node/index.js +36 -1
- package/node/index.js.map +1 -1
- package/node/mat/create-new-cp-tree.js.map +1 -1
- package/node/mat/get-largest-vertex.js.map +1 -1
- package/node/mat/trim-mat.js.map +1 -1
- package/node/memoize-primitive.js.map +1 -1
- package/node/sat/add-debug-info.js.map +1 -1
- package/node/sat/get-leaves.js.map +1 -1
- package/node/svg/get-loop-bounds.js.map +1 -1
- package/node/svg/get-min-y-pos.js.map +1 -1
- package/node/sweep-line/sweep-line.js.map +1 -1
- package/package.json +2 -2
- package/src/add-n-prong.ts/join-spokes.ts +11 -11
- package/src/closest-boundary-point/dd-deflate-with-running-error.ts +22 -22
- package/src/closest-boundary-point/get-close-boundary-points-certified.ts +38 -38
- package/src/contact-point/contact-point.ts +13 -13
- package/src/corner/get-corner.ts +39 -39
- package/src/corner/get-interface-ccw.ts +3 -3
- package/src/cp-node/cp-node-fs.ts +132 -135
- package/src/cp-node/cp-node.ts +30 -30
- package/src/cp-node/fs/clone.ts +4 -4
- package/src/cp-node/fs/cp-node-comparator.ts +13 -0
- package/src/cp-node/fs/find-first.ts +6 -6
- package/src/cp-node/fs/get-all-on-loop.ts +1 -1
- package/src/cp-node/fs/get-branch-beziers.ts +1 -1
- package/src/cp-node/fs/get-branch.ts +1 -1
- package/src/cp-node/fs/get-children.ts +8 -8
- package/src/cp-node/fs/get-first-exit.ts +11 -11
- package/src/cp-node/fs/get-mat-curve-to-next.ts +1 -1
- package/src/cp-node/fs/get-mat-curves-between.ts +1 -1
- package/src/cp-node/fs/get-prong-count.ts +8 -8
- package/src/cp-node/fs/get-real-prong-count.ts +3 -3
- package/src/cp-node/fs/get-vertex-forward-children.ts +10 -10
- package/src/cp-node/fs/is-fully-terminating.ts +3 -3
- package/src/cp-node/fs/is-one-prong.ts +8 -8
- package/src/cp-node/fs/is-sharp.ts +1 -1
- package/src/cp-node/fs/is-terminating.ts +1 -1
- package/src/cp-node/fs/iterate-all-on-loop.ts +6 -6
- package/src/cp-node/fs/traverse-all-forward.ts +11 -11
- package/src/cp-node/fs/traverse-cp.ts +19 -17
- package/src/cp-node/fs/traverse-edges.ts +10 -10
- package/src/cp-node/fs/traverse-vertices.ts +17 -17
- package/src/curve/curve.ts +26 -26
- package/src/debug/functions/cmp-cp-on-delta.ts +1 -1
- package/src/debug/functions/draw-elem/bounding-hull.ts +2 -2
- package/src/debug/functions/draw-elem/culls.ts +2 -2
- package/src/debug/functions/draw-elem/draw-cp-node.ts +30 -30
- package/src/debug/functions/draw-elem/draw-cull.ts +2 -2
- package/src/debug/functions/draw-elem/draw-dull-corner.ts +7 -7
- package/src/debug/functions/draw-elem/draw-elem.ts +28 -28
- package/src/debug/functions/draw-elem/draw-leaves.ts +12 -12
- package/src/debug/functions/draw-elem/draw-loose-bounding-box.ts +7 -7
- package/src/debug/functions/draw-elem/draw-max-vertex.ts +2 -2
- package/src/debug/functions/draw-elem/draw-min-y.ts +2 -2
- package/src/debug/functions/draw-elem/draw-one-prong-at-dull-corner.ts +1 -1
- package/src/debug/functions/draw-elem/draw-one-prong.ts +1 -1
- package/src/debug/functions/draw-elem/draw-sharp-corner.ts +6 -6
- package/src/debug/functions/draw-elem/draw-speed.ts +2 -2
- package/src/debug/functions/draw-elem/draw-three-prong.ts +28 -28
- package/src/debug/functions/draw-elem/draw-tight-bounding-box.ts +4 -4
- package/src/debug/functions/draw-elem/draw-two-prong.ts +51 -51
- package/src/debug/functions/draw-elem/draw-vertex.ts +12 -12
- package/src/debug/functions/draw-elem/dull-corner.ts +7 -7
- package/src/debug/functions/draw-elem/leaves.ts +2 -2
- package/src/debug/functions/draw-elem/loose-bounding-box.ts +7 -7
- package/src/debug/functions/draw-elem/max-vertex.ts +2 -2
- package/src/debug/functions/draw-elem/min-y.ts +2 -2
- package/src/debug/functions/draw-elem/one-prong-at-dull-corner.ts +1 -1
- package/src/debug/functions/draw-elem/one-prong.ts +1 -1
- package/src/debug/functions/draw-elem/sharp-corner.ts +6 -6
- package/src/debug/functions/draw-elem/three-prong.ts +19 -19
- package/src/debug/functions/draw-elem/tight-bounding-box.ts +4 -4
- package/src/debug/functions/draw-elem/two-prong.ts +34 -34
- package/src/debug/functions/draw-elem/vertex.ts +28 -28
- package/src/debug/functions/general.ts +18 -18
- package/src/debug/functions/three-prong.ts +184 -184
- package/src/debug/functions/two-prong.ts +112 -112
- package/src/find-2-prong/add-1-prong.ts +25 -25
- package/src/find-2-prong/find-2-prong.ts +156 -156
- package/src/find-2-prong/find-equidistant-point-on-line-dd.ts +50 -50
- package/src/find-2-prong/find-equidistant-point-on-line.ts +27 -27
- package/src/find-3-prong.ts/find-3-prong-for-delta3s.ts +1 -1
- package/src/find-3-prong.ts/find-3-prong.ts +23 -23
- package/src/find-3-prong.ts/find-and-add-3-prong.ts +37 -37
- package/src/find-3-prong.ts/find-and-add-3-prongs.ts +30 -30
- package/src/find-mat/add-2-prongs-by-error.ts +1 -1
- package/src/find-mat/find-mats.ts +49 -49
- package/src/find-mat/fix-ordering.ts +2 -2
- package/src/find-mat/get-total-by.ts +12 -12
- package/src/geometry/get-closest-square-distance-to-rect.ts +37 -37
- package/src/geometry/get-closest-squared-distance-to-rotated-rect.ts +14 -14
- package/src/get-curve/get-curve-between.ts +1 -1
- package/src/index.ts +40 -3
- package/src/mat/cmp-cp-on-delta.ts +1 -1
- package/src/mat/create-new-cp-tree.ts +12 -12
- package/src/mat/get-edges-as-array.ts +9 -9
- package/src/mat/get-largest-3-prong.ts +8 -8
- package/src/mat/get-largest-three-prong.ts +5 -5
- package/src/mat/get-largest-vertex.ts +6 -6
- package/src/mat/get-two-prong-type.ts +3 -3
- package/src/mat/trim-mat.ts +1 -1
- package/src/memoize-primitive.ts +14 -14
- package/src/sat/add-debug-info.ts +4 -4
- package/src/sat/cull-by-salience.ts +1 -1
- package/src/sat/get-leaves.ts +0 -1
- package/src/svg/get-extreme.ts +8 -8
- package/src/svg/get-loop-bounds.ts +84 -84
- package/src/svg/get-min-y-pos.ts +1 -1
- package/src/sweep-line/sweep-line.ts +23 -23
- package/__tests__/cp-node/fs/check-jsog-eql-calc.spec.ts +0 -30
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import type { Mat } from '../../src/mat/mat.js';
|
|
2
|
+
import { expect, test } from '@jest/globals';
|
|
3
|
+
import { squares4 } from 'squares-rng';
|
|
4
|
+
import { mats1_, getMats1 } from './mat-dummys.js';
|
|
5
|
+
import { CpNode, getAllOnLoop } from '../../src/index.js';
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
test('Check MAT objects equal (JSOG)', function() {
|
|
9
|
+
const mats1 = getMats1();
|
|
10
|
+
|
|
11
|
+
// too hard for Jest due to circular references
|
|
12
|
+
// expect(mats_obj1).toEqual(mats_calc1);
|
|
13
|
+
|
|
14
|
+
// Fast path: check root array structure and length
|
|
15
|
+
expect(Array.isArray(mats1_)).toBe(true);
|
|
16
|
+
expect(Array.isArray(mats1)).toBe(true);
|
|
17
|
+
expect(mats1_.length).toBe(mats1.length);
|
|
18
|
+
|
|
19
|
+
// Verify key properties of the MAT objects instead of deep comparison
|
|
20
|
+
const mats1_0_ = mats1_[0];
|
|
21
|
+
const mats1_0 = mats1[0];
|
|
22
|
+
|
|
23
|
+
// Check critical structure exists
|
|
24
|
+
expect(mats1_0_).toHaveProperty('cpNode');
|
|
25
|
+
expect(mats1_0).toHaveProperty('cpNode');
|
|
26
|
+
|
|
27
|
+
// Verify circular reference integrity
|
|
28
|
+
if (mats1_0_.cpNode && mats1_0_.cpNode.nextOnCircle) {
|
|
29
|
+
expect(mats1_0_.cpNode.nextOnCircle).toBeDefined();
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
getAllOnLoop(mats1_0_.cpNode).length; //?
|
|
33
|
+
|
|
34
|
+
// Perform a random walk on the calculated MAT to ensure it behaves as expected
|
|
35
|
+
let testCpNode = mats1_0.cpNode;
|
|
36
|
+
let testCpNode_ = mats1_0_.cpNode;
|
|
37
|
+
|
|
38
|
+
const N = 10;
|
|
39
|
+
let reachCpNodes = new Set<CpNode>();
|
|
40
|
+
for (let i=0; i<N; i++) {
|
|
41
|
+
testCpNode = randomWalk(testCpNode, i*N, N);
|
|
42
|
+
testCpNode_ = randomWalk(testCpNode_, i*N, N);
|
|
43
|
+
|
|
44
|
+
// testCpNode.cp.pointOnShape.p; //?
|
|
45
|
+
// testCpNode_.cp.pointOnShape.p;//?
|
|
46
|
+
|
|
47
|
+
reachCpNodes.add(testCpNode);
|
|
48
|
+
|
|
49
|
+
expect(testCpNode.cp.pointOnShape).toEqual(testCpNode_.cp.pointOnShape);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
reachCpNodes.size; //?
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
const NEXT = 0;
|
|
57
|
+
const PREV = 1;
|
|
58
|
+
const NEXT_ON_CIRCLE = 2;
|
|
59
|
+
const PREV_ON_CIRCLE = 3;
|
|
60
|
+
|
|
61
|
+
function randomWalk(
|
|
62
|
+
cpNode: CpNode,
|
|
63
|
+
seed: number,
|
|
64
|
+
steps: number) {
|
|
65
|
+
|
|
66
|
+
for (let i=0; i<steps; i++) {
|
|
67
|
+
const direction = squares4(seed + i) % 4;
|
|
68
|
+
|
|
69
|
+
if (direction === NEXT) {
|
|
70
|
+
cpNode = cpNode.next;
|
|
71
|
+
} else if (direction === PREV) {
|
|
72
|
+
cpNode = cpNode.prev;
|
|
73
|
+
} else if (direction === NEXT_ON_CIRCLE) {
|
|
74
|
+
cpNode = cpNode.nextOnCircle;
|
|
75
|
+
} else if (direction === PREV_ON_CIRCLE) {
|
|
76
|
+
cpNode = cpNode.prevOnCircle;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
return cpNode;
|
|
81
|
+
}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
|
|
2
|
+
/**
|
|
3
|
+
* Decodes a JSOG-encoded object back into a live circular graph.
|
|
4
|
+
*/
|
|
5
|
+
function decodeJSOG(jsog: any) {
|
|
6
|
+
const idMap = new Map<string, any>();
|
|
7
|
+
|
|
8
|
+
// Pass 1: catalog all objects that have an @id.
|
|
9
|
+
function findIds(obj: any) {
|
|
10
|
+
if (!obj || typeof obj !== 'object') return;
|
|
11
|
+
|
|
12
|
+
if (Array.isArray(obj)) {
|
|
13
|
+
obj.forEach(findIds);
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
if (obj['@id'] !== undefined) {
|
|
18
|
+
const id = String(obj['@id']);
|
|
19
|
+
if (!idMap.has(id)) {
|
|
20
|
+
if (obj['@type'] === 'Map') {
|
|
21
|
+
idMap.set(id, new Map());
|
|
22
|
+
} else if (obj['@type'] === 'Set') {
|
|
23
|
+
idMap.set(id, new Set());
|
|
24
|
+
} else {
|
|
25
|
+
idMap.set(id, {});
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
Object.entries(obj).forEach(([key, val]) => {
|
|
31
|
+
if (key !== '@ref') {
|
|
32
|
+
findIds(val);
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
// Pass 2: reconstruct the graph by swapping @ref for the actual object.
|
|
38
|
+
function resolve(obj: any): any {
|
|
39
|
+
if (!obj || typeof obj !== 'object') return obj;
|
|
40
|
+
|
|
41
|
+
if (Array.isArray(obj)) {
|
|
42
|
+
return obj.map(resolve);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
if (obj['@ref'] !== undefined) {
|
|
46
|
+
const refId = String(obj['@ref']);
|
|
47
|
+
if (!idMap.has(refId)) {
|
|
48
|
+
throw new Error(`Invalid JSOG: missing @id for @ref "${refId}".`);
|
|
49
|
+
}
|
|
50
|
+
return idMap.get(refId);
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
const result = obj['@id'] !== undefined
|
|
54
|
+
? idMap.get(String(obj['@id']))
|
|
55
|
+
: {};
|
|
56
|
+
|
|
57
|
+
if (obj['@type'] === 'Map') {
|
|
58
|
+
for (const pair of obj.entries ?? []) {
|
|
59
|
+
if (!Array.isArray(pair) || pair.length !== 2) continue;
|
|
60
|
+
result.set(resolve(pair[0]), resolve(pair[1]));
|
|
61
|
+
}
|
|
62
|
+
return result;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
if (obj['@type'] === 'Set') {
|
|
66
|
+
for (const value of obj.values ?? []) {
|
|
67
|
+
result.add(resolve(value));
|
|
68
|
+
}
|
|
69
|
+
return result;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
for (const key in obj) {
|
|
73
|
+
if (key === '@id' || key === '@type') continue;
|
|
74
|
+
result[key] = resolve(obj[key]);
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
return result;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
findIds(jsog);
|
|
81
|
+
return resolve(jsog);
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
|
|
85
|
+
export { decodeJSOG }
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import type { Mat } from "../../src/mat/mat.js";
|
|
2
|
+
import { findMats } from "../../src/find-mat/find-mats.js";
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
/** mat-demo: "achispado" font, "comma" glyph */
|
|
6
|
+
const loops1 = [
|
|
7
|
+
[
|
|
8
|
+
[[139, 8], [82, -101]],
|
|
9
|
+
[[82, -101], [24, 8]],
|
|
10
|
+
[[24, 8], [46, 8]],
|
|
11
|
+
[[46, 8], [46, 54]],
|
|
12
|
+
[[46, 54], [117, 54]],
|
|
13
|
+
[[117, 54], [117, 8]],
|
|
14
|
+
[[117, 8], [139, 8]],
|
|
15
|
+
[[139, 8], [139, 8]]
|
|
16
|
+
]
|
|
17
|
+
];
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
// Cache
|
|
21
|
+
let mats1: Mat[] | undefined = undefined;
|
|
22
|
+
function getMats1() {
|
|
23
|
+
if (mats1) { return mats1; }
|
|
24
|
+
|
|
25
|
+
mats1 = findMats(loops1, {
|
|
26
|
+
applySat: false,
|
|
27
|
+
simplify: true,
|
|
28
|
+
satScale: 1.675,
|
|
29
|
+
maxCurviness: 0.05,
|
|
30
|
+
maxLength: 40,
|
|
31
|
+
// maxCurviness: 5,
|
|
32
|
+
// maxLength: 4000,
|
|
33
|
+
angleIncrement: 15,
|
|
34
|
+
simplifyTolerance: 2**-1
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
return mats1;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
export { getMats1 }
|