@twick/2d 0.14.0 → 1.14.3
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/LICENSE +21 -21
- package/editor/editor/tsconfig.build.tsbuildinfo +1 -1
- package/lib/components/Audio.d.ts.map +1 -1
- package/lib/components/Audio.js +33 -3
- package/lib/components/CodeBlock.d.ts +1 -1
- package/lib/components/Img.js +23 -23
- package/lib/components/Line.js +31 -31
- package/lib/components/Media.d.ts +6 -0
- package/lib/components/Media.d.ts.map +1 -1
- package/lib/components/Media.js +277 -61
- package/lib/components/Node.d.ts +1 -1
- package/lib/components/Path.d.ts +1 -1
- package/lib/components/SVG.d.ts +1 -1
- package/lib/components/Shape.d.ts +1 -1
- package/lib/components/Spline.js +25 -25
- package/lib/components/Video.d.ts +0 -1
- package/lib/components/Video.d.ts.map +1 -1
- package/lib/components/Video.js +70 -65
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +4 -5
- package/src/editor/NodeInspectorConfig.tsx +76 -76
- package/src/editor/PreviewOverlayConfig.tsx +67 -67
- package/src/editor/Provider.tsx +93 -93
- package/src/editor/SceneGraphTabConfig.tsx +81 -81
- package/src/editor/icons/CircleIcon.tsx +7 -7
- package/src/editor/icons/CodeBlockIcon.tsx +8 -8
- package/src/editor/icons/CurveIcon.tsx +7 -7
- package/src/editor/icons/GridIcon.tsx +7 -7
- package/src/editor/icons/IconMap.ts +35 -35
- package/src/editor/icons/ImgIcon.tsx +8 -8
- package/src/editor/icons/LayoutIcon.tsx +9 -9
- package/src/editor/icons/LineIcon.tsx +7 -7
- package/src/editor/icons/NodeIcon.tsx +7 -7
- package/src/editor/icons/RayIcon.tsx +7 -7
- package/src/editor/icons/RectIcon.tsx +7 -7
- package/src/editor/icons/ShapeIcon.tsx +7 -7
- package/src/editor/icons/TxtIcon.tsx +8 -8
- package/src/editor/icons/VideoIcon.tsx +7 -7
- package/src/editor/icons/View2DIcon.tsx +10 -10
- package/src/editor/index.ts +17 -17
- package/src/editor/tree/DetachedRoot.tsx +23 -23
- package/src/editor/tree/NodeElement.tsx +74 -74
- package/src/editor/tree/TreeElement.tsx +72 -72
- package/src/editor/tree/TreeRoot.tsx +10 -10
- package/src/editor/tree/ViewRoot.tsx +20 -20
- package/src/editor/tree/index.module.scss +38 -38
- package/src/editor/tree/index.ts +3 -3
- package/src/editor/tsconfig.build.json +5 -5
- package/src/editor/tsconfig.json +12 -12
- package/src/editor/tsdoc.json +4 -4
- package/src/editor/vite-env.d.ts +1 -1
- package/src/lib/code/CodeCursor.ts +445 -445
- package/src/lib/code/CodeDiffer.ts +78 -78
- package/src/lib/code/CodeFragment.ts +97 -97
- package/src/lib/code/CodeHighlighter.ts +75 -75
- package/src/lib/code/CodeMetrics.ts +47 -47
- package/src/lib/code/CodeRange.test.ts +74 -74
- package/src/lib/code/CodeRange.ts +216 -216
- package/src/lib/code/CodeScope.ts +101 -101
- package/src/lib/code/CodeSelection.ts +24 -24
- package/src/lib/code/CodeSignal.ts +327 -327
- package/src/lib/code/CodeTokenizer.ts +54 -54
- package/src/lib/code/DefaultHighlightStyle.ts +98 -98
- package/src/lib/code/LezerHighlighter.ts +113 -113
- package/src/lib/code/diff.test.ts +311 -311
- package/src/lib/code/diff.ts +319 -319
- package/src/lib/code/extractRange.ts +126 -126
- package/src/lib/code/index.ts +13 -13
- package/src/lib/components/Audio.ts +168 -131
- package/src/lib/components/Bezier.ts +105 -105
- package/src/lib/components/Circle.ts +266 -266
- package/src/lib/components/Code.ts +526 -526
- package/src/lib/components/CodeBlock.ts +576 -576
- package/src/lib/components/CubicBezier.ts +112 -112
- package/src/lib/components/Curve.ts +455 -455
- package/src/lib/components/Grid.ts +135 -135
- package/src/lib/components/Icon.ts +96 -96
- package/src/lib/components/Img.ts +319 -319
- package/src/lib/components/Knot.ts +157 -157
- package/src/lib/components/Latex.ts +122 -122
- package/src/lib/components/Layout.ts +1092 -1092
- package/src/lib/components/Line.ts +429 -429
- package/src/lib/components/Media.ts +576 -346
- package/src/lib/components/Node.ts +1940 -1940
- package/src/lib/components/Path.ts +137 -137
- package/src/lib/components/Polygon.ts +171 -171
- package/src/lib/components/QuadBezier.ts +100 -100
- package/src/lib/components/Ray.ts +125 -125
- package/src/lib/components/Rect.ts +187 -187
- package/src/lib/components/Rive.ts +156 -156
- package/src/lib/components/SVG.ts +797 -797
- package/src/lib/components/Shape.ts +143 -143
- package/src/lib/components/Spline.ts +344 -344
- package/src/lib/components/Txt.test.tsx +81 -81
- package/src/lib/components/Txt.ts +203 -203
- package/src/lib/components/TxtLeaf.ts +205 -205
- package/src/lib/components/Video.ts +461 -462
- package/src/lib/components/View2D.ts +98 -98
- package/src/lib/components/__tests__/children.test.tsx +142 -142
- package/src/lib/components/__tests__/clone.test.tsx +126 -126
- package/src/lib/components/__tests__/generatorTest.ts +28 -28
- package/src/lib/components/__tests__/mockScene2D.ts +45 -45
- package/src/lib/components/__tests__/query.test.tsx +122 -122
- package/src/lib/components/__tests__/state.test.tsx +60 -60
- package/src/lib/components/index.ts +28 -28
- package/src/lib/components/types.ts +35 -35
- package/src/lib/curves/ArcSegment.ts +159 -159
- package/src/lib/curves/CircleSegment.ts +77 -77
- package/src/lib/curves/CubicBezierSegment.ts +78 -78
- package/src/lib/curves/CurveDrawingInfo.ts +11 -11
- package/src/lib/curves/CurvePoint.ts +15 -15
- package/src/lib/curves/CurveProfile.ts +7 -7
- package/src/lib/curves/KnotInfo.ts +10 -10
- package/src/lib/curves/LineSegment.ts +62 -62
- package/src/lib/curves/Polynomial.ts +355 -355
- package/src/lib/curves/Polynomial2D.ts +62 -62
- package/src/lib/curves/PolynomialSegment.ts +124 -124
- package/src/lib/curves/QuadBezierSegment.ts +64 -64
- package/src/lib/curves/Segment.ts +17 -17
- package/src/lib/curves/UniformPolynomialCurveSampler.ts +94 -94
- package/src/lib/curves/createCurveProfileLerp.ts +471 -471
- package/src/lib/curves/getBezierSplineProfile.ts +223 -223
- package/src/lib/curves/getCircleProfile.ts +86 -86
- package/src/lib/curves/getPathProfile.ts +178 -178
- package/src/lib/curves/getPointAtDistance.ts +21 -21
- package/src/lib/curves/getPolylineProfile.test.ts +21 -21
- package/src/lib/curves/getPolylineProfile.ts +89 -89
- package/src/lib/curves/getRectProfile.ts +139 -139
- package/src/lib/curves/index.ts +16 -16
- package/src/lib/decorators/canvasStyleSignal.ts +16 -16
- package/src/lib/decorators/colorSignal.ts +9 -9
- package/src/lib/decorators/compound.ts +72 -72
- package/src/lib/decorators/computed.ts +18 -18
- package/src/lib/decorators/defaultStyle.ts +18 -18
- package/src/lib/decorators/filtersSignal.ts +136 -136
- package/src/lib/decorators/index.ts +10 -10
- package/src/lib/decorators/initializers.ts +32 -32
- package/src/lib/decorators/nodeName.ts +13 -13
- package/src/lib/decorators/signal.test.ts +90 -90
- package/src/lib/decorators/signal.ts +345 -345
- package/src/lib/decorators/spacingSignal.ts +15 -15
- package/src/lib/decorators/vector2Signal.ts +30 -30
- package/src/lib/globals.d.ts +2 -2
- package/src/lib/index.ts +8 -8
- package/src/lib/jsx-dev-runtime.ts +2 -2
- package/src/lib/jsx-runtime.ts +46 -46
- package/src/lib/parse-svg-path.d.ts +14 -14
- package/src/lib/partials/Filter.ts +180 -180
- package/src/lib/partials/Gradient.ts +102 -102
- package/src/lib/partials/Pattern.ts +34 -34
- package/src/lib/partials/ShaderConfig.ts +117 -117
- package/src/lib/partials/index.ts +4 -4
- package/src/lib/partials/types.ts +58 -58
- package/src/lib/scenes/Scene2D.ts +242 -242
- package/src/lib/scenes/index.ts +3 -3
- package/src/lib/scenes/makeScene2D.ts +16 -16
- package/src/lib/scenes/useScene2D.ts +6 -6
- package/src/lib/tsconfig.build.json +5 -5
- package/src/lib/tsconfig.json +10 -10
- package/src/lib/tsdoc.json +4 -4
- package/src/lib/utils/CanvasUtils.ts +306 -306
- package/src/lib/utils/diff.test.ts +453 -453
- package/src/lib/utils/diff.ts +148 -148
- package/src/lib/utils/index.ts +2 -2
- package/src/lib/utils/is.ts +11 -11
- package/src/lib/utils/makeSignalExtensions.ts +30 -30
- package/src/lib/utils/video/declarations.d.ts +1 -1
- package/src/lib/utils/video/ffmpeg-client.ts +50 -50
- package/src/lib/utils/video/mp4-parser-manager.ts +72 -72
- package/src/lib/utils/video/parser/index.ts +1 -1
- package/src/lib/utils/video/parser/parser.ts +257 -257
- package/src/lib/utils/video/parser/sampler.ts +72 -72
- package/src/lib/utils/video/parser/segment.ts +302 -302
- package/src/lib/utils/video/parser/sink.ts +29 -29
- package/src/lib/utils/video/parser/utils.ts +31 -31
- package/src/tsconfig.base.json +19 -19
- package/src/tsconfig.build.json +8 -8
- package/src/tsconfig.json +5 -5
- package/tsconfig.project.json +7 -7
- package/lib/components/utils/waitUntil.d.ts +0 -7
- package/lib/components/utils/waitUntil.d.ts.map +0 -1
- package/lib/components/utils/waitUntil.js +0 -15
- package/lib/utils/waitUntil.d.ts +0 -7
- package/lib/utils/waitUntil.d.ts.map +0 -1
- package/lib/utils/waitUntil.js +0 -15
- package/src/lib/utils/waitUntil.ts +0 -18
|
@@ -1,344 +1,344 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
PossibleVector2,
|
|
3
|
-
SerializedVector2,
|
|
4
|
-
SignalValue,
|
|
5
|
-
SimpleSignal,
|
|
6
|
-
} from '@twick/core';
|
|
7
|
-
import {
|
|
8
|
-
BBox,
|
|
9
|
-
Vector2,
|
|
10
|
-
transformVectorAsPoint,
|
|
11
|
-
unwrap,
|
|
12
|
-
useLogger,
|
|
13
|
-
} from '@twick/core';
|
|
14
|
-
import type {CurveProfile, KnotInfo} from '../curves';
|
|
15
|
-
import {CubicBezierSegment, getBezierSplineProfile} from '../curves';
|
|
16
|
-
import type {PolynomialSegment} from '../curves/PolynomialSegment';
|
|
17
|
-
import {computed, initial, signal} from '../decorators';
|
|
18
|
-
import type {DesiredLength} from '../partials';
|
|
19
|
-
import {
|
|
20
|
-
arc,
|
|
21
|
-
bezierCurveTo,
|
|
22
|
-
drawLine,
|
|
23
|
-
drawPivot,
|
|
24
|
-
lineTo,
|
|
25
|
-
moveTo,
|
|
26
|
-
quadraticCurveTo,
|
|
27
|
-
} from '../utils';
|
|
28
|
-
import type {CurveProps} from './Curve';
|
|
29
|
-
import {Curve} from './Curve';
|
|
30
|
-
import {Knot} from './Knot';
|
|
31
|
-
import type {Node} from './Node';
|
|
32
|
-
|
|
33
|
-
const splineWithInsufficientKnots = `
|
|
34
|
-
The spline won't be visible unless you specify at least two knots:
|
|
35
|
-
|
|
36
|
-
\`\`\`tsx
|
|
37
|
-
<Spline
|
|
38
|
-
stroke="#fff"
|
|
39
|
-
lineWidth={8}
|
|
40
|
-
points={[
|
|
41
|
-
[100, 0],
|
|
42
|
-
[0, 0],
|
|
43
|
-
[0, 100],
|
|
44
|
-
]}
|
|
45
|
-
/>
|
|
46
|
-
\`\`\`
|
|
47
|
-
|
|
48
|
-
For more control over the knot handles, you can alternatively provide the knots
|
|
49
|
-
as children to the spline using the \`Knot\` component:
|
|
50
|
-
|
|
51
|
-
\`\`\`tsx
|
|
52
|
-
<Spline stroke="#fff" lineWidth={8}>
|
|
53
|
-
<Knot x={100} endHandle={[-50, 0]} />
|
|
54
|
-
<Knot />
|
|
55
|
-
<Knot y={100} startHandle={[-100, 50]} />
|
|
56
|
-
</Spline>
|
|
57
|
-
\`\`\`
|
|
58
|
-
`;
|
|
59
|
-
|
|
60
|
-
export interface SplineProps extends CurveProps {
|
|
61
|
-
/**
|
|
62
|
-
* {@inheritDoc Spline.smoothness}
|
|
63
|
-
*/
|
|
64
|
-
smoothness?: SignalValue<number>;
|
|
65
|
-
|
|
66
|
-
/**
|
|
67
|
-
* {@inheritDoc Spline.points}
|
|
68
|
-
*/
|
|
69
|
-
points?: SignalValue<SignalValue<PossibleVector2[]>>;
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
/**
|
|
73
|
-
* A node for drawing a smooth line through a number of points.
|
|
74
|
-
*
|
|
75
|
-
* @remarks
|
|
76
|
-
* This node uses Bézier curves for drawing each segment of the spline.
|
|
77
|
-
*
|
|
78
|
-
* @example
|
|
79
|
-
* Defining knots using the `points` property. This will automatically
|
|
80
|
-
* calculate the handle positions for each knot do draw a smooth curve. You
|
|
81
|
-
* can control the smoothness of the resulting curve via the
|
|
82
|
-
* {@link Spline.smoothness} property:
|
|
83
|
-
*
|
|
84
|
-
* ```tsx
|
|
85
|
-
* <Spline
|
|
86
|
-
* lineWidth={4}
|
|
87
|
-
* stroke={'white'}
|
|
88
|
-
* smoothness={0.4}
|
|
89
|
-
* points={[
|
|
90
|
-
* [-400, 0],
|
|
91
|
-
* [-200, -300],
|
|
92
|
-
* [0, 0],
|
|
93
|
-
* [200, -300],
|
|
94
|
-
* [400, 0],
|
|
95
|
-
* ]}
|
|
96
|
-
* />
|
|
97
|
-
* ```
|
|
98
|
-
*
|
|
99
|
-
* Defining knots with {@link Knot} nodes:
|
|
100
|
-
*
|
|
101
|
-
* ```tsx
|
|
102
|
-
* <Spline lineWidth={4} stroke={'white'}>
|
|
103
|
-
* <Knot position={[-400, 0]} />
|
|
104
|
-
* <Knot position={[-200, -300]} />
|
|
105
|
-
* <Knot
|
|
106
|
-
* position={[0, 0]}
|
|
107
|
-
* startHandle={[-100, 200]}
|
|
108
|
-
* endHandle={[100, 200]}
|
|
109
|
-
* />
|
|
110
|
-
* <Knot position={[200, -300]} />
|
|
111
|
-
* <Knot position={[400, 0]} />
|
|
112
|
-
* </Spline>
|
|
113
|
-
* ```
|
|
114
|
-
*/
|
|
115
|
-
export class Spline extends Curve {
|
|
116
|
-
/**
|
|
117
|
-
* The smoothness of the spline when using auto-calculated handles.
|
|
118
|
-
*
|
|
119
|
-
* @remarks
|
|
120
|
-
* This property is only applied to knots that don't use explicit handles.
|
|
121
|
-
*
|
|
122
|
-
* @defaultValue 0.4
|
|
123
|
-
*/
|
|
124
|
-
@initial(0.4)
|
|
125
|
-
@signal()
|
|
126
|
-
public declare readonly smoothness: SimpleSignal<number>;
|
|
127
|
-
|
|
128
|
-
/**
|
|
129
|
-
* The knots of the spline as an array of knots with auto-calculated handles.
|
|
130
|
-
*
|
|
131
|
-
* @remarks
|
|
132
|
-
* You can control the smoothness of the resulting curve
|
|
133
|
-
* via the {@link smoothness} property.
|
|
134
|
-
*/
|
|
135
|
-
@initial(null)
|
|
136
|
-
@signal()
|
|
137
|
-
public declare readonly points: SimpleSignal<
|
|
138
|
-
SignalValue<PossibleVector2>[] | null,
|
|
139
|
-
this
|
|
140
|
-
>;
|
|
141
|
-
|
|
142
|
-
public constructor(props: SplineProps) {
|
|
143
|
-
super(props);
|
|
144
|
-
|
|
145
|
-
if (
|
|
146
|
-
(props.children === undefined ||
|
|
147
|
-
!Array.isArray(props.children) ||
|
|
148
|
-
props.children.length < 2) &&
|
|
149
|
-
(props.points === undefined || props.points.length < 2) &&
|
|
150
|
-
props.spawner === undefined
|
|
151
|
-
) {
|
|
152
|
-
useLogger().warn({
|
|
153
|
-
message:
|
|
154
|
-
'Insufficient number of knots specified for spline. A spline needs at least two knots.',
|
|
155
|
-
remarks: splineWithInsufficientKnots,
|
|
156
|
-
inspect: this.key,
|
|
157
|
-
});
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
|
|
161
|
-
@computed()
|
|
162
|
-
public override profile(): CurveProfile {
|
|
163
|
-
return getBezierSplineProfile(
|
|
164
|
-
this.knots(),
|
|
165
|
-
this.closed(),
|
|
166
|
-
this.smoothness(),
|
|
167
|
-
);
|
|
168
|
-
}
|
|
169
|
-
|
|
170
|
-
@computed()
|
|
171
|
-
public knots(): KnotInfo[] {
|
|
172
|
-
const points = this.points();
|
|
173
|
-
|
|
174
|
-
if (points) {
|
|
175
|
-
return points.map(signal => {
|
|
176
|
-
const point = new Vector2(unwrap(signal));
|
|
177
|
-
|
|
178
|
-
return {
|
|
179
|
-
position: point,
|
|
180
|
-
startHandle: point,
|
|
181
|
-
endHandle: point,
|
|
182
|
-
auto: {start: 1, end: 1},
|
|
183
|
-
};
|
|
184
|
-
});
|
|
185
|
-
}
|
|
186
|
-
|
|
187
|
-
return this.children()
|
|
188
|
-
.filter(this.isKnot)
|
|
189
|
-
.map(knot => knot.points());
|
|
190
|
-
}
|
|
191
|
-
|
|
192
|
-
@computed()
|
|
193
|
-
protected childrenBBox() {
|
|
194
|
-
const points = (this.profile().segments as PolynomialSegment[]).flatMap(
|
|
195
|
-
segment => segment.points,
|
|
196
|
-
);
|
|
197
|
-
return BBox.fromPoints(...points);
|
|
198
|
-
}
|
|
199
|
-
|
|
200
|
-
protected override lineWidthCoefficient(): number {
|
|
201
|
-
const join = this.lineJoin();
|
|
202
|
-
|
|
203
|
-
let coefficient = super.lineWidthCoefficient();
|
|
204
|
-
|
|
205
|
-
if (join !== 'miter') {
|
|
206
|
-
return coefficient;
|
|
207
|
-
}
|
|
208
|
-
|
|
209
|
-
const {minSin} = this.profile();
|
|
210
|
-
if (minSin > 0) {
|
|
211
|
-
coefficient = Math.max(coefficient, 0.5 / minSin);
|
|
212
|
-
}
|
|
213
|
-
|
|
214
|
-
return coefficient;
|
|
215
|
-
}
|
|
216
|
-
|
|
217
|
-
protected override desiredSize(): SerializedVector2<DesiredLength> {
|
|
218
|
-
return this.getTightBBox().size;
|
|
219
|
-
}
|
|
220
|
-
|
|
221
|
-
protected override offsetComputedLayout(box: BBox): BBox {
|
|
222
|
-
box.position = box.position.sub(this.getTightBBox().center);
|
|
223
|
-
return box;
|
|
224
|
-
}
|
|
225
|
-
|
|
226
|
-
@computed()
|
|
227
|
-
private getTightBBox(): BBox {
|
|
228
|
-
const bounds = (this.profile().segments as PolynomialSegment[]).map(
|
|
229
|
-
segment => segment.getBBox(),
|
|
230
|
-
);
|
|
231
|
-
return BBox.fromBBoxes(...bounds);
|
|
232
|
-
}
|
|
233
|
-
|
|
234
|
-
public override drawOverlay(
|
|
235
|
-
context: CanvasRenderingContext2D,
|
|
236
|
-
matrix: DOMMatrix,
|
|
237
|
-
) {
|
|
238
|
-
const size = this.computedSize();
|
|
239
|
-
const box = this.childrenBBox().transformCorners(matrix);
|
|
240
|
-
const offsetVector = size.mul(this.offset()).scale(0.5);
|
|
241
|
-
const offset = transformVectorAsPoint(offsetVector, matrix);
|
|
242
|
-
const segments = this.profile().segments as PolynomialSegment[];
|
|
243
|
-
|
|
244
|
-
context.lineWidth = 1;
|
|
245
|
-
context.strokeStyle = 'white';
|
|
246
|
-
context.fillStyle = 'white';
|
|
247
|
-
|
|
248
|
-
const splinePath = new Path2D();
|
|
249
|
-
|
|
250
|
-
// Draw the actual spline first so that all control points get drawn on top of it.
|
|
251
|
-
for (let i = 0; i < segments.length; i++) {
|
|
252
|
-
const segment = segments[i];
|
|
253
|
-
const [from, startHandle, endHandle, to] =
|
|
254
|
-
segment.transformPoints(matrix);
|
|
255
|
-
|
|
256
|
-
moveTo(splinePath, from);
|
|
257
|
-
if (segment instanceof CubicBezierSegment) {
|
|
258
|
-
bezierCurveTo(splinePath, startHandle, endHandle, to as Vector2);
|
|
259
|
-
} else {
|
|
260
|
-
quadraticCurveTo(splinePath, startHandle, endHandle);
|
|
261
|
-
}
|
|
262
|
-
}
|
|
263
|
-
context.stroke(splinePath);
|
|
264
|
-
|
|
265
|
-
for (let i = 0; i < segments.length; i++) {
|
|
266
|
-
const segment = segments[i];
|
|
267
|
-
context.fillStyle = 'white';
|
|
268
|
-
|
|
269
|
-
const [from, startHandle, endHandle, to] =
|
|
270
|
-
segment.transformPoints(matrix);
|
|
271
|
-
|
|
272
|
-
const handlePath = new Path2D();
|
|
273
|
-
|
|
274
|
-
context.globalAlpha = 0.5;
|
|
275
|
-
// Line from p0 to p1
|
|
276
|
-
moveTo(handlePath, from);
|
|
277
|
-
lineTo(handlePath, startHandle);
|
|
278
|
-
|
|
279
|
-
if (segment instanceof CubicBezierSegment) {
|
|
280
|
-
// Line from p2 to p3
|
|
281
|
-
moveTo(handlePath, endHandle);
|
|
282
|
-
lineTo(handlePath, to as Vector2);
|
|
283
|
-
context.beginPath();
|
|
284
|
-
context.stroke(handlePath);
|
|
285
|
-
} else {
|
|
286
|
-
// Line from p1 to p2
|
|
287
|
-
lineTo(handlePath, endHandle);
|
|
288
|
-
context.beginPath();
|
|
289
|
-
context.stroke(handlePath);
|
|
290
|
-
}
|
|
291
|
-
|
|
292
|
-
context.globalAlpha = 1;
|
|
293
|
-
context.lineWidth = 2;
|
|
294
|
-
|
|
295
|
-
// Draw first point of segment
|
|
296
|
-
moveTo(context, from);
|
|
297
|
-
context.beginPath();
|
|
298
|
-
arc(context, from, 4);
|
|
299
|
-
context.closePath();
|
|
300
|
-
context.stroke();
|
|
301
|
-
context.fill();
|
|
302
|
-
|
|
303
|
-
// Draw final point of segment only if we're on the last segment.
|
|
304
|
-
// Otherwise, it will get drawn as the start point of the next segment.
|
|
305
|
-
if (i === segments.length - 1) {
|
|
306
|
-
if (to !== undefined) {
|
|
307
|
-
moveTo(context, to);
|
|
308
|
-
context.beginPath();
|
|
309
|
-
arc(context, to, 4);
|
|
310
|
-
context.closePath();
|
|
311
|
-
context.stroke();
|
|
312
|
-
context.fill();
|
|
313
|
-
}
|
|
314
|
-
}
|
|
315
|
-
|
|
316
|
-
// Draw the control points
|
|
317
|
-
context.fillStyle = 'black';
|
|
318
|
-
for (const point of [startHandle, endHandle]) {
|
|
319
|
-
if (point.magnitude > 0) {
|
|
320
|
-
moveTo(context, point);
|
|
321
|
-
context.beginPath();
|
|
322
|
-
arc(context, point, 4);
|
|
323
|
-
context.closePath();
|
|
324
|
-
context.fill();
|
|
325
|
-
context.stroke();
|
|
326
|
-
}
|
|
327
|
-
}
|
|
328
|
-
}
|
|
329
|
-
|
|
330
|
-
context.lineWidth = 1;
|
|
331
|
-
context.beginPath();
|
|
332
|
-
drawPivot(context, offset);
|
|
333
|
-
context.stroke();
|
|
334
|
-
|
|
335
|
-
context.beginPath();
|
|
336
|
-
drawLine(context, box);
|
|
337
|
-
context.closePath();
|
|
338
|
-
context.stroke();
|
|
339
|
-
}
|
|
340
|
-
|
|
341
|
-
private isKnot(node: Node): node is Knot {
|
|
342
|
-
return node instanceof Knot;
|
|
343
|
-
}
|
|
344
|
-
}
|
|
1
|
+
import type {
|
|
2
|
+
PossibleVector2,
|
|
3
|
+
SerializedVector2,
|
|
4
|
+
SignalValue,
|
|
5
|
+
SimpleSignal,
|
|
6
|
+
} from '@twick/core';
|
|
7
|
+
import {
|
|
8
|
+
BBox,
|
|
9
|
+
Vector2,
|
|
10
|
+
transformVectorAsPoint,
|
|
11
|
+
unwrap,
|
|
12
|
+
useLogger,
|
|
13
|
+
} from '@twick/core';
|
|
14
|
+
import type {CurveProfile, KnotInfo} from '../curves';
|
|
15
|
+
import {CubicBezierSegment, getBezierSplineProfile} from '../curves';
|
|
16
|
+
import type {PolynomialSegment} from '../curves/PolynomialSegment';
|
|
17
|
+
import {computed, initial, signal} from '../decorators';
|
|
18
|
+
import type {DesiredLength} from '../partials';
|
|
19
|
+
import {
|
|
20
|
+
arc,
|
|
21
|
+
bezierCurveTo,
|
|
22
|
+
drawLine,
|
|
23
|
+
drawPivot,
|
|
24
|
+
lineTo,
|
|
25
|
+
moveTo,
|
|
26
|
+
quadraticCurveTo,
|
|
27
|
+
} from '../utils';
|
|
28
|
+
import type {CurveProps} from './Curve';
|
|
29
|
+
import {Curve} from './Curve';
|
|
30
|
+
import {Knot} from './Knot';
|
|
31
|
+
import type {Node} from './Node';
|
|
32
|
+
|
|
33
|
+
const splineWithInsufficientKnots = `
|
|
34
|
+
The spline won't be visible unless you specify at least two knots:
|
|
35
|
+
|
|
36
|
+
\`\`\`tsx
|
|
37
|
+
<Spline
|
|
38
|
+
stroke="#fff"
|
|
39
|
+
lineWidth={8}
|
|
40
|
+
points={[
|
|
41
|
+
[100, 0],
|
|
42
|
+
[0, 0],
|
|
43
|
+
[0, 100],
|
|
44
|
+
]}
|
|
45
|
+
/>
|
|
46
|
+
\`\`\`
|
|
47
|
+
|
|
48
|
+
For more control over the knot handles, you can alternatively provide the knots
|
|
49
|
+
as children to the spline using the \`Knot\` component:
|
|
50
|
+
|
|
51
|
+
\`\`\`tsx
|
|
52
|
+
<Spline stroke="#fff" lineWidth={8}>
|
|
53
|
+
<Knot x={100} endHandle={[-50, 0]} />
|
|
54
|
+
<Knot />
|
|
55
|
+
<Knot y={100} startHandle={[-100, 50]} />
|
|
56
|
+
</Spline>
|
|
57
|
+
\`\`\`
|
|
58
|
+
`;
|
|
59
|
+
|
|
60
|
+
export interface SplineProps extends CurveProps {
|
|
61
|
+
/**
|
|
62
|
+
* {@inheritDoc Spline.smoothness}
|
|
63
|
+
*/
|
|
64
|
+
smoothness?: SignalValue<number>;
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* {@inheritDoc Spline.points}
|
|
68
|
+
*/
|
|
69
|
+
points?: SignalValue<SignalValue<PossibleVector2[]>>;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/**
|
|
73
|
+
* A node for drawing a smooth line through a number of points.
|
|
74
|
+
*
|
|
75
|
+
* @remarks
|
|
76
|
+
* This node uses Bézier curves for drawing each segment of the spline.
|
|
77
|
+
*
|
|
78
|
+
* @example
|
|
79
|
+
* Defining knots using the `points` property. This will automatically
|
|
80
|
+
* calculate the handle positions for each knot do draw a smooth curve. You
|
|
81
|
+
* can control the smoothness of the resulting curve via the
|
|
82
|
+
* {@link Spline.smoothness} property:
|
|
83
|
+
*
|
|
84
|
+
* ```tsx
|
|
85
|
+
* <Spline
|
|
86
|
+
* lineWidth={4}
|
|
87
|
+
* stroke={'white'}
|
|
88
|
+
* smoothness={0.4}
|
|
89
|
+
* points={[
|
|
90
|
+
* [-400, 0],
|
|
91
|
+
* [-200, -300],
|
|
92
|
+
* [0, 0],
|
|
93
|
+
* [200, -300],
|
|
94
|
+
* [400, 0],
|
|
95
|
+
* ]}
|
|
96
|
+
* />
|
|
97
|
+
* ```
|
|
98
|
+
*
|
|
99
|
+
* Defining knots with {@link Knot} nodes:
|
|
100
|
+
*
|
|
101
|
+
* ```tsx
|
|
102
|
+
* <Spline lineWidth={4} stroke={'white'}>
|
|
103
|
+
* <Knot position={[-400, 0]} />
|
|
104
|
+
* <Knot position={[-200, -300]} />
|
|
105
|
+
* <Knot
|
|
106
|
+
* position={[0, 0]}
|
|
107
|
+
* startHandle={[-100, 200]}
|
|
108
|
+
* endHandle={[100, 200]}
|
|
109
|
+
* />
|
|
110
|
+
* <Knot position={[200, -300]} />
|
|
111
|
+
* <Knot position={[400, 0]} />
|
|
112
|
+
* </Spline>
|
|
113
|
+
* ```
|
|
114
|
+
*/
|
|
115
|
+
export class Spline extends Curve {
|
|
116
|
+
/**
|
|
117
|
+
* The smoothness of the spline when using auto-calculated handles.
|
|
118
|
+
*
|
|
119
|
+
* @remarks
|
|
120
|
+
* This property is only applied to knots that don't use explicit handles.
|
|
121
|
+
*
|
|
122
|
+
* @defaultValue 0.4
|
|
123
|
+
*/
|
|
124
|
+
@initial(0.4)
|
|
125
|
+
@signal()
|
|
126
|
+
public declare readonly smoothness: SimpleSignal<number>;
|
|
127
|
+
|
|
128
|
+
/**
|
|
129
|
+
* The knots of the spline as an array of knots with auto-calculated handles.
|
|
130
|
+
*
|
|
131
|
+
* @remarks
|
|
132
|
+
* You can control the smoothness of the resulting curve
|
|
133
|
+
* via the {@link smoothness} property.
|
|
134
|
+
*/
|
|
135
|
+
@initial(null)
|
|
136
|
+
@signal()
|
|
137
|
+
public declare readonly points: SimpleSignal<
|
|
138
|
+
SignalValue<PossibleVector2>[] | null,
|
|
139
|
+
this
|
|
140
|
+
>;
|
|
141
|
+
|
|
142
|
+
public constructor(props: SplineProps) {
|
|
143
|
+
super(props);
|
|
144
|
+
|
|
145
|
+
if (
|
|
146
|
+
(props.children === undefined ||
|
|
147
|
+
!Array.isArray(props.children) ||
|
|
148
|
+
props.children.length < 2) &&
|
|
149
|
+
(props.points === undefined || props.points.length < 2) &&
|
|
150
|
+
props.spawner === undefined
|
|
151
|
+
) {
|
|
152
|
+
useLogger().warn({
|
|
153
|
+
message:
|
|
154
|
+
'Insufficient number of knots specified for spline. A spline needs at least two knots.',
|
|
155
|
+
remarks: splineWithInsufficientKnots,
|
|
156
|
+
inspect: this.key,
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
@computed()
|
|
162
|
+
public override profile(): CurveProfile {
|
|
163
|
+
return getBezierSplineProfile(
|
|
164
|
+
this.knots(),
|
|
165
|
+
this.closed(),
|
|
166
|
+
this.smoothness(),
|
|
167
|
+
);
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
@computed()
|
|
171
|
+
public knots(): KnotInfo[] {
|
|
172
|
+
const points = this.points();
|
|
173
|
+
|
|
174
|
+
if (points) {
|
|
175
|
+
return points.map(signal => {
|
|
176
|
+
const point = new Vector2(unwrap(signal));
|
|
177
|
+
|
|
178
|
+
return {
|
|
179
|
+
position: point,
|
|
180
|
+
startHandle: point,
|
|
181
|
+
endHandle: point,
|
|
182
|
+
auto: {start: 1, end: 1},
|
|
183
|
+
};
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
return this.children()
|
|
188
|
+
.filter(this.isKnot)
|
|
189
|
+
.map(knot => knot.points());
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
@computed()
|
|
193
|
+
protected childrenBBox() {
|
|
194
|
+
const points = (this.profile().segments as PolynomialSegment[]).flatMap(
|
|
195
|
+
segment => segment.points,
|
|
196
|
+
);
|
|
197
|
+
return BBox.fromPoints(...points);
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
protected override lineWidthCoefficient(): number {
|
|
201
|
+
const join = this.lineJoin();
|
|
202
|
+
|
|
203
|
+
let coefficient = super.lineWidthCoefficient();
|
|
204
|
+
|
|
205
|
+
if (join !== 'miter') {
|
|
206
|
+
return coefficient;
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
const {minSin} = this.profile();
|
|
210
|
+
if (minSin > 0) {
|
|
211
|
+
coefficient = Math.max(coefficient, 0.5 / minSin);
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
return coefficient;
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
protected override desiredSize(): SerializedVector2<DesiredLength> {
|
|
218
|
+
return this.getTightBBox().size;
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
protected override offsetComputedLayout(box: BBox): BBox {
|
|
222
|
+
box.position = box.position.sub(this.getTightBBox().center);
|
|
223
|
+
return box;
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
@computed()
|
|
227
|
+
private getTightBBox(): BBox {
|
|
228
|
+
const bounds = (this.profile().segments as PolynomialSegment[]).map(
|
|
229
|
+
segment => segment.getBBox(),
|
|
230
|
+
);
|
|
231
|
+
return BBox.fromBBoxes(...bounds);
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
public override drawOverlay(
|
|
235
|
+
context: CanvasRenderingContext2D,
|
|
236
|
+
matrix: DOMMatrix,
|
|
237
|
+
) {
|
|
238
|
+
const size = this.computedSize();
|
|
239
|
+
const box = this.childrenBBox().transformCorners(matrix);
|
|
240
|
+
const offsetVector = size.mul(this.offset()).scale(0.5);
|
|
241
|
+
const offset = transformVectorAsPoint(offsetVector, matrix);
|
|
242
|
+
const segments = this.profile().segments as PolynomialSegment[];
|
|
243
|
+
|
|
244
|
+
context.lineWidth = 1;
|
|
245
|
+
context.strokeStyle = 'white';
|
|
246
|
+
context.fillStyle = 'white';
|
|
247
|
+
|
|
248
|
+
const splinePath = new Path2D();
|
|
249
|
+
|
|
250
|
+
// Draw the actual spline first so that all control points get drawn on top of it.
|
|
251
|
+
for (let i = 0; i < segments.length; i++) {
|
|
252
|
+
const segment = segments[i];
|
|
253
|
+
const [from, startHandle, endHandle, to] =
|
|
254
|
+
segment.transformPoints(matrix);
|
|
255
|
+
|
|
256
|
+
moveTo(splinePath, from);
|
|
257
|
+
if (segment instanceof CubicBezierSegment) {
|
|
258
|
+
bezierCurveTo(splinePath, startHandle, endHandle, to as Vector2);
|
|
259
|
+
} else {
|
|
260
|
+
quadraticCurveTo(splinePath, startHandle, endHandle);
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
context.stroke(splinePath);
|
|
264
|
+
|
|
265
|
+
for (let i = 0; i < segments.length; i++) {
|
|
266
|
+
const segment = segments[i];
|
|
267
|
+
context.fillStyle = 'white';
|
|
268
|
+
|
|
269
|
+
const [from, startHandle, endHandle, to] =
|
|
270
|
+
segment.transformPoints(matrix);
|
|
271
|
+
|
|
272
|
+
const handlePath = new Path2D();
|
|
273
|
+
|
|
274
|
+
context.globalAlpha = 0.5;
|
|
275
|
+
// Line from p0 to p1
|
|
276
|
+
moveTo(handlePath, from);
|
|
277
|
+
lineTo(handlePath, startHandle);
|
|
278
|
+
|
|
279
|
+
if (segment instanceof CubicBezierSegment) {
|
|
280
|
+
// Line from p2 to p3
|
|
281
|
+
moveTo(handlePath, endHandle);
|
|
282
|
+
lineTo(handlePath, to as Vector2);
|
|
283
|
+
context.beginPath();
|
|
284
|
+
context.stroke(handlePath);
|
|
285
|
+
} else {
|
|
286
|
+
// Line from p1 to p2
|
|
287
|
+
lineTo(handlePath, endHandle);
|
|
288
|
+
context.beginPath();
|
|
289
|
+
context.stroke(handlePath);
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
context.globalAlpha = 1;
|
|
293
|
+
context.lineWidth = 2;
|
|
294
|
+
|
|
295
|
+
// Draw first point of segment
|
|
296
|
+
moveTo(context, from);
|
|
297
|
+
context.beginPath();
|
|
298
|
+
arc(context, from, 4);
|
|
299
|
+
context.closePath();
|
|
300
|
+
context.stroke();
|
|
301
|
+
context.fill();
|
|
302
|
+
|
|
303
|
+
// Draw final point of segment only if we're on the last segment.
|
|
304
|
+
// Otherwise, it will get drawn as the start point of the next segment.
|
|
305
|
+
if (i === segments.length - 1) {
|
|
306
|
+
if (to !== undefined) {
|
|
307
|
+
moveTo(context, to);
|
|
308
|
+
context.beginPath();
|
|
309
|
+
arc(context, to, 4);
|
|
310
|
+
context.closePath();
|
|
311
|
+
context.stroke();
|
|
312
|
+
context.fill();
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
// Draw the control points
|
|
317
|
+
context.fillStyle = 'black';
|
|
318
|
+
for (const point of [startHandle, endHandle]) {
|
|
319
|
+
if (point.magnitude > 0) {
|
|
320
|
+
moveTo(context, point);
|
|
321
|
+
context.beginPath();
|
|
322
|
+
arc(context, point, 4);
|
|
323
|
+
context.closePath();
|
|
324
|
+
context.fill();
|
|
325
|
+
context.stroke();
|
|
326
|
+
}
|
|
327
|
+
}
|
|
328
|
+
}
|
|
329
|
+
|
|
330
|
+
context.lineWidth = 1;
|
|
331
|
+
context.beginPath();
|
|
332
|
+
drawPivot(context, offset);
|
|
333
|
+
context.stroke();
|
|
334
|
+
|
|
335
|
+
context.beginPath();
|
|
336
|
+
drawLine(context, box);
|
|
337
|
+
context.closePath();
|
|
338
|
+
context.stroke();
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
private isKnot(node: Node): node is Knot {
|
|
342
|
+
return node instanceof Knot;
|
|
343
|
+
}
|
|
344
|
+
}
|