@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,319 +1,319 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
PossibleVector2,
|
|
3
|
-
SerializedVector2,
|
|
4
|
-
SignalValue,
|
|
5
|
-
SimpleSignal,
|
|
6
|
-
} from '@twick/core';
|
|
7
|
-
import {
|
|
8
|
-
BBox,
|
|
9
|
-
Color,
|
|
10
|
-
DependencyContext,
|
|
11
|
-
DetailedError,
|
|
12
|
-
Vector2,
|
|
13
|
-
useLogger,
|
|
14
|
-
} from '@twick/core';
|
|
15
|
-
import {computed, initial, nodeName, signal} from '../decorators';
|
|
16
|
-
import type {DesiredLength} from '../partials';
|
|
17
|
-
import {drawImage} from '../utils';
|
|
18
|
-
import type {RectProps} from './Rect';
|
|
19
|
-
import {Rect} from './Rect';
|
|
20
|
-
|
|
21
|
-
const imageWithoutSource = `
|
|
22
|
-
The image won't be visible unless you specify a source:
|
|
23
|
-
|
|
24
|
-
\`\`\`tsx
|
|
25
|
-
import myImage from './example.png';
|
|
26
|
-
// ...
|
|
27
|
-
<Img src={myImage} />;
|
|
28
|
-
\`\`\`
|
|
29
|
-
|
|
30
|
-
If you did this intentionally, and don't want to see this warning, set the \`src\`
|
|
31
|
-
property to \`null\`:
|
|
32
|
-
|
|
33
|
-
\`\`\`tsx
|
|
34
|
-
<Img src={null} />
|
|
35
|
-
\`\`\`
|
|
36
|
-
|
|
37
|
-
[Learn more](https://motioncanvas.io/docs/media#images) about working with
|
|
38
|
-
images.
|
|
39
|
-
`;
|
|
40
|
-
|
|
41
|
-
export interface ImgProps extends RectProps {
|
|
42
|
-
/**
|
|
43
|
-
* {@inheritDoc Img.src}
|
|
44
|
-
*/
|
|
45
|
-
src?: SignalValue<string | null>;
|
|
46
|
-
/**
|
|
47
|
-
* {@inheritDoc Img.alpha}
|
|
48
|
-
*/
|
|
49
|
-
alpha?: SignalValue<number>;
|
|
50
|
-
/**
|
|
51
|
-
* {@inheritDoc Img.smoothing}
|
|
52
|
-
*/
|
|
53
|
-
smoothing?: SignalValue<boolean>;
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
/**
|
|
57
|
-
* A node for displaying images.
|
|
58
|
-
*
|
|
59
|
-
* @preview
|
|
60
|
-
* ```tsx editor
|
|
61
|
-
* import {Img} from '@twick/2d';
|
|
62
|
-
* import {all, waitFor} from '@twick/core';
|
|
63
|
-
* import {createRef} from '@twick/core';
|
|
64
|
-
* import {makeScene2D} from '@twick/2d';
|
|
65
|
-
*
|
|
66
|
-
* export default makeScene2D(function* (view) {
|
|
67
|
-
* const ref = createRef<Img>();
|
|
68
|
-
* yield view.add(
|
|
69
|
-
* <Img
|
|
70
|
-
* ref={ref}
|
|
71
|
-
* src="https://images.unsplash.com/photo-1679218407381-a6f1660d60e9"
|
|
72
|
-
* width={300}
|
|
73
|
-
* radius={20}
|
|
74
|
-
* />,
|
|
75
|
-
* );
|
|
76
|
-
*
|
|
77
|
-
* // set the background using the color sampled from the image:
|
|
78
|
-
* ref().fill(ref().getColorAtPoint(0));
|
|
79
|
-
*
|
|
80
|
-
* yield* all(
|
|
81
|
-
* ref().size([100, 100], 1).to([300, null], 1),
|
|
82
|
-
* ref().radius(50, 1).to(20, 1),
|
|
83
|
-
* ref().alpha(0, 1).to(1, 1),
|
|
84
|
-
* );
|
|
85
|
-
* yield* waitFor(0.5);
|
|
86
|
-
* });
|
|
87
|
-
* ```
|
|
88
|
-
*/
|
|
89
|
-
@nodeName('Img')
|
|
90
|
-
export class Img extends Rect {
|
|
91
|
-
private static pool: Record<string, HTMLImageElement> = {};
|
|
92
|
-
|
|
93
|
-
static {
|
|
94
|
-
if (import.meta.hot) {
|
|
95
|
-
import.meta.hot.on('twick:assets', ({urls}) => {
|
|
96
|
-
for (const url of urls) {
|
|
97
|
-
if (Img.pool[url]) {
|
|
98
|
-
delete Img.pool[url];
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
});
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
/**
|
|
106
|
-
* The source of this image.
|
|
107
|
-
*
|
|
108
|
-
* @example
|
|
109
|
-
* Using a local image:
|
|
110
|
-
* ```tsx
|
|
111
|
-
* import image from './example.png';
|
|
112
|
-
* // ...
|
|
113
|
-
* view.add(<Img src={image} />)
|
|
114
|
-
* ```
|
|
115
|
-
* Loading an image from the internet:
|
|
116
|
-
* ```tsx
|
|
117
|
-
* view.add(<Img src="https://example.com/image.png" />)
|
|
118
|
-
* ```
|
|
119
|
-
*/
|
|
120
|
-
@signal()
|
|
121
|
-
public declare readonly src: SimpleSignal<string, this>;
|
|
122
|
-
|
|
123
|
-
/**
|
|
124
|
-
* The alpha value of this image.
|
|
125
|
-
*
|
|
126
|
-
* @remarks
|
|
127
|
-
* Unlike opacity, the alpha value affects only the image itself, leaving the
|
|
128
|
-
* fill, stroke, and children intact.
|
|
129
|
-
*/
|
|
130
|
-
@initial(1)
|
|
131
|
-
@signal()
|
|
132
|
-
public declare readonly alpha: SimpleSignal<number, this>;
|
|
133
|
-
|
|
134
|
-
/**
|
|
135
|
-
* Whether the image should be smoothed.
|
|
136
|
-
*
|
|
137
|
-
* @remarks
|
|
138
|
-
* When disabled, the image will be scaled using the nearest neighbor
|
|
139
|
-
* interpolation with no smoothing. The resulting image will appear pixelated.
|
|
140
|
-
*
|
|
141
|
-
* @defaultValue true
|
|
142
|
-
*/
|
|
143
|
-
@initial(true)
|
|
144
|
-
@signal()
|
|
145
|
-
public declare readonly smoothing: SimpleSignal<boolean, this>;
|
|
146
|
-
|
|
147
|
-
public constructor(props: ImgProps) {
|
|
148
|
-
super(props);
|
|
149
|
-
if (!('src' in props)) {
|
|
150
|
-
useLogger().warn({
|
|
151
|
-
message: 'No source specified for the image',
|
|
152
|
-
remarks: imageWithoutSource,
|
|
153
|
-
inspect: this.key,
|
|
154
|
-
});
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
protected override desiredSize(): SerializedVector2<DesiredLength> {
|
|
159
|
-
const custom = super.desiredSize();
|
|
160
|
-
if (custom.x === null && custom.y === null) {
|
|
161
|
-
const image = this.image();
|
|
162
|
-
return {
|
|
163
|
-
x: image.naturalWidth,
|
|
164
|
-
y: image.naturalHeight,
|
|
165
|
-
};
|
|
166
|
-
}
|
|
167
|
-
|
|
168
|
-
return custom;
|
|
169
|
-
}
|
|
170
|
-
|
|
171
|
-
@computed()
|
|
172
|
-
protected image(): HTMLImageElement {
|
|
173
|
-
const src = this.src();
|
|
174
|
-
const url = new URL(src, window.location.origin);
|
|
175
|
-
if (url.origin === window.location.origin) {
|
|
176
|
-
const hash = this.view().assetHash();
|
|
177
|
-
url.searchParams.set('asset-hash', hash);
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
let image = Img.pool[src];
|
|
181
|
-
if (!image) {
|
|
182
|
-
image = document.createElement('img');
|
|
183
|
-
image.crossOrigin = 'anonymous';
|
|
184
|
-
image.src = src;
|
|
185
|
-
Img.pool[src] = image;
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
if (!image.complete) {
|
|
189
|
-
DependencyContext.collectPromise(
|
|
190
|
-
new Promise((resolve, reject) => {
|
|
191
|
-
image.addEventListener('load', resolve);
|
|
192
|
-
image.addEventListener('error', () =>
|
|
193
|
-
// TODO: example for error handling inside DependencyContext (this shouldn't be UI specific)
|
|
194
|
-
reject(
|
|
195
|
-
new DetailedError({
|
|
196
|
-
message: `Failed to load an image`,
|
|
197
|
-
remarks: `\
|
|
198
|
-
The <code>src</code> property was set to:
|
|
199
|
-
<pre><code>${src}</code></pre>
|
|
200
|
-
Make sure that source is correct and that the image exists.<br/>
|
|
201
|
-
<a target='_blank' href='https://motioncanvas.io/docs/media#images'>Learn more</a>
|
|
202
|
-
about working with images.`,
|
|
203
|
-
inspect: this.key,
|
|
204
|
-
}),
|
|
205
|
-
),
|
|
206
|
-
);
|
|
207
|
-
}),
|
|
208
|
-
);
|
|
209
|
-
}
|
|
210
|
-
|
|
211
|
-
return image;
|
|
212
|
-
}
|
|
213
|
-
|
|
214
|
-
@computed()
|
|
215
|
-
protected imageCanvas(): CanvasRenderingContext2D {
|
|
216
|
-
const canvas = document
|
|
217
|
-
.createElement('canvas')
|
|
218
|
-
.getContext('2d', {willReadFrequently: true});
|
|
219
|
-
if (!canvas) {
|
|
220
|
-
throw new Error('Could not create an image canvas');
|
|
221
|
-
}
|
|
222
|
-
|
|
223
|
-
return canvas;
|
|
224
|
-
}
|
|
225
|
-
|
|
226
|
-
@computed()
|
|
227
|
-
protected filledImageCanvas() {
|
|
228
|
-
const context = this.imageCanvas();
|
|
229
|
-
const image = this.image();
|
|
230
|
-
context.canvas.width = image.naturalWidth;
|
|
231
|
-
context.canvas.height = image.naturalHeight;
|
|
232
|
-
context.imageSmoothingEnabled = this.smoothing();
|
|
233
|
-
context.drawImage(image, 0, 0);
|
|
234
|
-
|
|
235
|
-
return context;
|
|
236
|
-
}
|
|
237
|
-
|
|
238
|
-
protected override async draw(context: CanvasRenderingContext2D) {
|
|
239
|
-
this.drawShape(context);
|
|
240
|
-
const alpha = this.alpha();
|
|
241
|
-
if (alpha > 0) {
|
|
242
|
-
const box = BBox.fromSizeCentered(this.computedSize());
|
|
243
|
-
context.save();
|
|
244
|
-
context.clip(this.getPath());
|
|
245
|
-
if (alpha < 1) {
|
|
246
|
-
context.globalAlpha *= alpha;
|
|
247
|
-
}
|
|
248
|
-
context.imageSmoothingEnabled = this.smoothing();
|
|
249
|
-
drawImage(context, this.image(), box);
|
|
250
|
-
context.restore();
|
|
251
|
-
}
|
|
252
|
-
|
|
253
|
-
if (this.clip()) {
|
|
254
|
-
context.clip(this.getPath());
|
|
255
|
-
}
|
|
256
|
-
|
|
257
|
-
await this.drawChildren(context);
|
|
258
|
-
}
|
|
259
|
-
|
|
260
|
-
protected override applyFlex() {
|
|
261
|
-
super.applyFlex();
|
|
262
|
-
const image = this.image();
|
|
263
|
-
this.element.style.aspectRatio = (
|
|
264
|
-
this.ratio() ?? image.naturalWidth / image.naturalHeight
|
|
265
|
-
).toString();
|
|
266
|
-
}
|
|
267
|
-
|
|
268
|
-
/**
|
|
269
|
-
* Get color of the image at the given position.
|
|
270
|
-
*
|
|
271
|
-
* @param position - The position in local space at which to sample the color.
|
|
272
|
-
*/
|
|
273
|
-
public getColorAtPoint(position: PossibleVector2): Color {
|
|
274
|
-
const size = this.computedSize();
|
|
275
|
-
const naturalSize = this.naturalSize();
|
|
276
|
-
|
|
277
|
-
const pixelPosition = new Vector2(position)
|
|
278
|
-
.add(this.computedSize().scale(0.5))
|
|
279
|
-
.mul(naturalSize.div(size).safe);
|
|
280
|
-
|
|
281
|
-
return this.getPixelColor(pixelPosition);
|
|
282
|
-
}
|
|
283
|
-
|
|
284
|
-
/**
|
|
285
|
-
* The natural size of this image.
|
|
286
|
-
*
|
|
287
|
-
* @remarks
|
|
288
|
-
* The natural size is the size of the source image unaffected by the size
|
|
289
|
-
* and scale properties.
|
|
290
|
-
*/
|
|
291
|
-
@computed()
|
|
292
|
-
public naturalSize() {
|
|
293
|
-
const image = this.image();
|
|
294
|
-
return new Vector2(image.naturalWidth, image.naturalHeight);
|
|
295
|
-
}
|
|
296
|
-
|
|
297
|
-
/**
|
|
298
|
-
* Get color of the image at the given pixel.
|
|
299
|
-
*
|
|
300
|
-
* @param position - The pixel's position.
|
|
301
|
-
*/
|
|
302
|
-
public getPixelColor(position: PossibleVector2): Color {
|
|
303
|
-
const context = this.filledImageCanvas();
|
|
304
|
-
const vector = new Vector2(position);
|
|
305
|
-
const data = context.getImageData(vector.x, vector.y, 1, 1).data;
|
|
306
|
-
|
|
307
|
-
return new Color({
|
|
308
|
-
r: data[0],
|
|
309
|
-
g: data[1],
|
|
310
|
-
b: data[2],
|
|
311
|
-
a: data[3] / 255,
|
|
312
|
-
});
|
|
313
|
-
}
|
|
314
|
-
|
|
315
|
-
protected override collectAsyncResources() {
|
|
316
|
-
super.collectAsyncResources();
|
|
317
|
-
this.image();
|
|
318
|
-
}
|
|
319
|
-
}
|
|
1
|
+
import type {
|
|
2
|
+
PossibleVector2,
|
|
3
|
+
SerializedVector2,
|
|
4
|
+
SignalValue,
|
|
5
|
+
SimpleSignal,
|
|
6
|
+
} from '@twick/core';
|
|
7
|
+
import {
|
|
8
|
+
BBox,
|
|
9
|
+
Color,
|
|
10
|
+
DependencyContext,
|
|
11
|
+
DetailedError,
|
|
12
|
+
Vector2,
|
|
13
|
+
useLogger,
|
|
14
|
+
} from '@twick/core';
|
|
15
|
+
import {computed, initial, nodeName, signal} from '../decorators';
|
|
16
|
+
import type {DesiredLength} from '../partials';
|
|
17
|
+
import {drawImage} from '../utils';
|
|
18
|
+
import type {RectProps} from './Rect';
|
|
19
|
+
import {Rect} from './Rect';
|
|
20
|
+
|
|
21
|
+
const imageWithoutSource = `
|
|
22
|
+
The image won't be visible unless you specify a source:
|
|
23
|
+
|
|
24
|
+
\`\`\`tsx
|
|
25
|
+
import myImage from './example.png';
|
|
26
|
+
// ...
|
|
27
|
+
<Img src={myImage} />;
|
|
28
|
+
\`\`\`
|
|
29
|
+
|
|
30
|
+
If you did this intentionally, and don't want to see this warning, set the \`src\`
|
|
31
|
+
property to \`null\`:
|
|
32
|
+
|
|
33
|
+
\`\`\`tsx
|
|
34
|
+
<Img src={null} />
|
|
35
|
+
\`\`\`
|
|
36
|
+
|
|
37
|
+
[Learn more](https://motioncanvas.io/docs/media#images) about working with
|
|
38
|
+
images.
|
|
39
|
+
`;
|
|
40
|
+
|
|
41
|
+
export interface ImgProps extends RectProps {
|
|
42
|
+
/**
|
|
43
|
+
* {@inheritDoc Img.src}
|
|
44
|
+
*/
|
|
45
|
+
src?: SignalValue<string | null>;
|
|
46
|
+
/**
|
|
47
|
+
* {@inheritDoc Img.alpha}
|
|
48
|
+
*/
|
|
49
|
+
alpha?: SignalValue<number>;
|
|
50
|
+
/**
|
|
51
|
+
* {@inheritDoc Img.smoothing}
|
|
52
|
+
*/
|
|
53
|
+
smoothing?: SignalValue<boolean>;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* A node for displaying images.
|
|
58
|
+
*
|
|
59
|
+
* @preview
|
|
60
|
+
* ```tsx editor
|
|
61
|
+
* import {Img} from '@twick/2d';
|
|
62
|
+
* import {all, waitFor} from '@twick/core';
|
|
63
|
+
* import {createRef} from '@twick/core';
|
|
64
|
+
* import {makeScene2D} from '@twick/2d';
|
|
65
|
+
*
|
|
66
|
+
* export default makeScene2D(function* (view) {
|
|
67
|
+
* const ref = createRef<Img>();
|
|
68
|
+
* yield view.add(
|
|
69
|
+
* <Img
|
|
70
|
+
* ref={ref}
|
|
71
|
+
* src="https://images.unsplash.com/photo-1679218407381-a6f1660d60e9"
|
|
72
|
+
* width={300}
|
|
73
|
+
* radius={20}
|
|
74
|
+
* />,
|
|
75
|
+
* );
|
|
76
|
+
*
|
|
77
|
+
* // set the background using the color sampled from the image:
|
|
78
|
+
* ref().fill(ref().getColorAtPoint(0));
|
|
79
|
+
*
|
|
80
|
+
* yield* all(
|
|
81
|
+
* ref().size([100, 100], 1).to([300, null], 1),
|
|
82
|
+
* ref().radius(50, 1).to(20, 1),
|
|
83
|
+
* ref().alpha(0, 1).to(1, 1),
|
|
84
|
+
* );
|
|
85
|
+
* yield* waitFor(0.5);
|
|
86
|
+
* });
|
|
87
|
+
* ```
|
|
88
|
+
*/
|
|
89
|
+
@nodeName('Img')
|
|
90
|
+
export class Img extends Rect {
|
|
91
|
+
private static pool: Record<string, HTMLImageElement> = {};
|
|
92
|
+
|
|
93
|
+
static {
|
|
94
|
+
if (import.meta.hot) {
|
|
95
|
+
import.meta.hot.on('twick:assets', ({urls}) => {
|
|
96
|
+
for (const url of urls) {
|
|
97
|
+
if (Img.pool[url]) {
|
|
98
|
+
delete Img.pool[url];
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
/**
|
|
106
|
+
* The source of this image.
|
|
107
|
+
*
|
|
108
|
+
* @example
|
|
109
|
+
* Using a local image:
|
|
110
|
+
* ```tsx
|
|
111
|
+
* import image from './example.png';
|
|
112
|
+
* // ...
|
|
113
|
+
* view.add(<Img src={image} />)
|
|
114
|
+
* ```
|
|
115
|
+
* Loading an image from the internet:
|
|
116
|
+
* ```tsx
|
|
117
|
+
* view.add(<Img src="https://example.com/image.png" />)
|
|
118
|
+
* ```
|
|
119
|
+
*/
|
|
120
|
+
@signal()
|
|
121
|
+
public declare readonly src: SimpleSignal<string, this>;
|
|
122
|
+
|
|
123
|
+
/**
|
|
124
|
+
* The alpha value of this image.
|
|
125
|
+
*
|
|
126
|
+
* @remarks
|
|
127
|
+
* Unlike opacity, the alpha value affects only the image itself, leaving the
|
|
128
|
+
* fill, stroke, and children intact.
|
|
129
|
+
*/
|
|
130
|
+
@initial(1)
|
|
131
|
+
@signal()
|
|
132
|
+
public declare readonly alpha: SimpleSignal<number, this>;
|
|
133
|
+
|
|
134
|
+
/**
|
|
135
|
+
* Whether the image should be smoothed.
|
|
136
|
+
*
|
|
137
|
+
* @remarks
|
|
138
|
+
* When disabled, the image will be scaled using the nearest neighbor
|
|
139
|
+
* interpolation with no smoothing. The resulting image will appear pixelated.
|
|
140
|
+
*
|
|
141
|
+
* @defaultValue true
|
|
142
|
+
*/
|
|
143
|
+
@initial(true)
|
|
144
|
+
@signal()
|
|
145
|
+
public declare readonly smoothing: SimpleSignal<boolean, this>;
|
|
146
|
+
|
|
147
|
+
public constructor(props: ImgProps) {
|
|
148
|
+
super(props);
|
|
149
|
+
if (!('src' in props)) {
|
|
150
|
+
useLogger().warn({
|
|
151
|
+
message: 'No source specified for the image',
|
|
152
|
+
remarks: imageWithoutSource,
|
|
153
|
+
inspect: this.key,
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
protected override desiredSize(): SerializedVector2<DesiredLength> {
|
|
159
|
+
const custom = super.desiredSize();
|
|
160
|
+
if (custom.x === null && custom.y === null) {
|
|
161
|
+
const image = this.image();
|
|
162
|
+
return {
|
|
163
|
+
x: image.naturalWidth,
|
|
164
|
+
y: image.naturalHeight,
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
return custom;
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
@computed()
|
|
172
|
+
protected image(): HTMLImageElement {
|
|
173
|
+
const src = this.src();
|
|
174
|
+
const url = new URL(src, window.location.origin);
|
|
175
|
+
if (url.origin === window.location.origin) {
|
|
176
|
+
const hash = this.view().assetHash();
|
|
177
|
+
url.searchParams.set('asset-hash', hash);
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
let image = Img.pool[src];
|
|
181
|
+
if (!image) {
|
|
182
|
+
image = document.createElement('img');
|
|
183
|
+
image.crossOrigin = 'anonymous';
|
|
184
|
+
image.src = src;
|
|
185
|
+
Img.pool[src] = image;
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
if (!image.complete) {
|
|
189
|
+
DependencyContext.collectPromise(
|
|
190
|
+
new Promise((resolve, reject) => {
|
|
191
|
+
image.addEventListener('load', resolve);
|
|
192
|
+
image.addEventListener('error', () =>
|
|
193
|
+
// TODO: example for error handling inside DependencyContext (this shouldn't be UI specific)
|
|
194
|
+
reject(
|
|
195
|
+
new DetailedError({
|
|
196
|
+
message: `Failed to load an image`,
|
|
197
|
+
remarks: `\
|
|
198
|
+
The <code>src</code> property was set to:
|
|
199
|
+
<pre><code>${src}</code></pre>
|
|
200
|
+
Make sure that source is correct and that the image exists.<br/>
|
|
201
|
+
<a target='_blank' href='https://motioncanvas.io/docs/media#images'>Learn more</a>
|
|
202
|
+
about working with images.`,
|
|
203
|
+
inspect: this.key,
|
|
204
|
+
}),
|
|
205
|
+
),
|
|
206
|
+
);
|
|
207
|
+
}),
|
|
208
|
+
);
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
return image;
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
@computed()
|
|
215
|
+
protected imageCanvas(): CanvasRenderingContext2D {
|
|
216
|
+
const canvas = document
|
|
217
|
+
.createElement('canvas')
|
|
218
|
+
.getContext('2d', {willReadFrequently: true});
|
|
219
|
+
if (!canvas) {
|
|
220
|
+
throw new Error('Could not create an image canvas');
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
return canvas;
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
@computed()
|
|
227
|
+
protected filledImageCanvas() {
|
|
228
|
+
const context = this.imageCanvas();
|
|
229
|
+
const image = this.image();
|
|
230
|
+
context.canvas.width = image.naturalWidth;
|
|
231
|
+
context.canvas.height = image.naturalHeight;
|
|
232
|
+
context.imageSmoothingEnabled = this.smoothing();
|
|
233
|
+
context.drawImage(image, 0, 0);
|
|
234
|
+
|
|
235
|
+
return context;
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
protected override async draw(context: CanvasRenderingContext2D) {
|
|
239
|
+
this.drawShape(context);
|
|
240
|
+
const alpha = this.alpha();
|
|
241
|
+
if (alpha > 0) {
|
|
242
|
+
const box = BBox.fromSizeCentered(this.computedSize());
|
|
243
|
+
context.save();
|
|
244
|
+
context.clip(this.getPath());
|
|
245
|
+
if (alpha < 1) {
|
|
246
|
+
context.globalAlpha *= alpha;
|
|
247
|
+
}
|
|
248
|
+
context.imageSmoothingEnabled = this.smoothing();
|
|
249
|
+
drawImage(context, this.image(), box);
|
|
250
|
+
context.restore();
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
if (this.clip()) {
|
|
254
|
+
context.clip(this.getPath());
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
await this.drawChildren(context);
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
protected override applyFlex() {
|
|
261
|
+
super.applyFlex();
|
|
262
|
+
const image = this.image();
|
|
263
|
+
this.element.style.aspectRatio = (
|
|
264
|
+
this.ratio() ?? image.naturalWidth / image.naturalHeight
|
|
265
|
+
).toString();
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
/**
|
|
269
|
+
* Get color of the image at the given position.
|
|
270
|
+
*
|
|
271
|
+
* @param position - The position in local space at which to sample the color.
|
|
272
|
+
*/
|
|
273
|
+
public getColorAtPoint(position: PossibleVector2): Color {
|
|
274
|
+
const size = this.computedSize();
|
|
275
|
+
const naturalSize = this.naturalSize();
|
|
276
|
+
|
|
277
|
+
const pixelPosition = new Vector2(position)
|
|
278
|
+
.add(this.computedSize().scale(0.5))
|
|
279
|
+
.mul(naturalSize.div(size).safe);
|
|
280
|
+
|
|
281
|
+
return this.getPixelColor(pixelPosition);
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
/**
|
|
285
|
+
* The natural size of this image.
|
|
286
|
+
*
|
|
287
|
+
* @remarks
|
|
288
|
+
* The natural size is the size of the source image unaffected by the size
|
|
289
|
+
* and scale properties.
|
|
290
|
+
*/
|
|
291
|
+
@computed()
|
|
292
|
+
public naturalSize() {
|
|
293
|
+
const image = this.image();
|
|
294
|
+
return new Vector2(image.naturalWidth, image.naturalHeight);
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
/**
|
|
298
|
+
* Get color of the image at the given pixel.
|
|
299
|
+
*
|
|
300
|
+
* @param position - The pixel's position.
|
|
301
|
+
*/
|
|
302
|
+
public getPixelColor(position: PossibleVector2): Color {
|
|
303
|
+
const context = this.filledImageCanvas();
|
|
304
|
+
const vector = new Vector2(position);
|
|
305
|
+
const data = context.getImageData(vector.x, vector.y, 1, 1).data;
|
|
306
|
+
|
|
307
|
+
return new Color({
|
|
308
|
+
r: data[0],
|
|
309
|
+
g: data[1],
|
|
310
|
+
b: data[2],
|
|
311
|
+
a: data[3] / 255,
|
|
312
|
+
});
|
|
313
|
+
}
|
|
314
|
+
|
|
315
|
+
protected override collectAsyncResources() {
|
|
316
|
+
super.collectAsyncResources();
|
|
317
|
+
this.image();
|
|
318
|
+
}
|
|
319
|
+
}
|