@flighthq/scene2d-canvas 0.2.1-next.840.857425c
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/dist/canvasBackground.d.ts +3 -0
- package/dist/canvasBackground.d.ts.map +1 -0
- package/dist/canvasBackground.js +19 -0
- package/dist/canvasBackground.js.map +1 -0
- package/dist/canvasBitmap.d.ts +4 -0
- package/dist/canvasBitmap.d.ts.map +1 -0
- package/dist/canvasBitmap.js +36 -0
- package/dist/canvasBitmap.js.map +1 -0
- package/dist/canvasCSSFilterBinding.d.ts +24 -0
- package/dist/canvasCSSFilterBinding.d.ts.map +1 -0
- package/dist/canvasCSSFilterBinding.js +43 -0
- package/dist/canvasCSSFilterBinding.js.map +1 -0
- package/dist/canvasCache.d.ts +33 -0
- package/dist/canvasCache.d.ts.map +1 -0
- package/dist/canvasCache.js +141 -0
- package/dist/canvasCache.js.map +1 -0
- package/dist/canvasClip.d.ts +3 -0
- package/dist/canvasClip.d.ts.map +1 -0
- package/dist/canvasClip.js +38 -0
- package/dist/canvasClip.js.map +1 -0
- package/dist/canvasClipRectangle.d.ts +5 -0
- package/dist/canvasClipRectangle.d.ts.map +1 -0
- package/dist/canvasClipRectangle.js +31 -0
- package/dist/canvasClipRectangle.js.map +1 -0
- package/dist/canvasElement.d.ts +2 -0
- package/dist/canvasElement.d.ts.map +1 -0
- package/dist/canvasElement.js +9 -0
- package/dist/canvasElement.js.map +1 -0
- package/dist/canvasFillPattern.d.ts +4 -0
- package/dist/canvasFillPattern.d.ts.map +1 -0
- package/dist/canvasFillPattern.js +108 -0
- package/dist/canvasFillPattern.js.map +1 -0
- package/dist/canvasImageSource.d.ts +4 -0
- package/dist/canvasImageSource.d.ts.map +1 -0
- package/dist/canvasImageSource.js +45 -0
- package/dist/canvasImageSource.js.map +1 -0
- package/dist/canvasMaterialRegistry.d.ts +6 -0
- package/dist/canvasMaterialRegistry.d.ts.map +1 -0
- package/dist/canvasMaterialRegistry.js +42 -0
- package/dist/canvasMaterialRegistry.js.map +1 -0
- package/dist/canvasMaterials.d.ts +5 -0
- package/dist/canvasMaterials.d.ts.map +1 -0
- package/dist/canvasMaterials.js +39 -0
- package/dist/canvasMaterials.js.map +1 -0
- package/dist/canvasNode2D.d.ts +5 -0
- package/dist/canvasNode2D.d.ts.map +1 -0
- package/dist/canvasNode2D.js +46 -0
- package/dist/canvasNode2D.js.map +1 -0
- package/dist/canvasParticleEmitter2D.d.ts +4 -0
- package/dist/canvasParticleEmitter2D.d.ts.map +1 -0
- package/dist/canvasParticleEmitter2D.js +64 -0
- package/dist/canvasParticleEmitter2D.js.map +1 -0
- package/dist/canvasQuadBatch.d.ts +4 -0
- package/dist/canvasQuadBatch.d.ts.map +1 -0
- package/dist/canvasQuadBatch.js +64 -0
- package/dist/canvasQuadBatch.js.map +1 -0
- package/dist/canvasRegistration.d.ts +4 -0
- package/dist/canvasRegistration.d.ts.map +1 -0
- package/dist/canvasRegistration.js +39 -0
- package/dist/canvasRegistration.js.map +1 -0
- package/dist/canvasRenderState.d.ts +5 -0
- package/dist/canvasRenderState.d.ts.map +1 -0
- package/dist/canvasRenderState.js +44 -0
- package/dist/canvasRenderState.js.map +1 -0
- package/dist/canvasRenderTarget.d.ts +26 -0
- package/dist/canvasRenderTarget.d.ts.map +1 -0
- package/dist/canvasRenderTarget.js +80 -0
- package/dist/canvasRenderTarget.js.map +1 -0
- package/dist/canvasRichText.d.ts +6 -0
- package/dist/canvasRichText.d.ts.map +1 -0
- package/dist/canvasRichText.js +128 -0
- package/dist/canvasRichText.js.map +1 -0
- package/dist/canvasScale9Mapper.d.ts +10 -0
- package/dist/canvasScale9Mapper.d.ts.map +1 -0
- package/dist/canvasScale9Mapper.js +148 -0
- package/dist/canvasScale9Mapper.js.map +1 -0
- package/dist/canvasScale9Shape.d.ts +5 -0
- package/dist/canvasScale9Shape.d.ts.map +1 -0
- package/dist/canvasScale9Shape.js +156 -0
- package/dist/canvasScale9Shape.js.map +1 -0
- package/dist/canvasShape.d.ts +5 -0
- package/dist/canvasShape.d.ts.map +1 -0
- package/dist/canvasShape.js +79 -0
- package/dist/canvasShape.js.map +1 -0
- package/dist/canvasShapeCommands.d.ts +19 -0
- package/dist/canvasShapeCommands.d.ts.map +1 -0
- package/dist/canvasShapeCommands.js +352 -0
- package/dist/canvasShapeCommands.js.map +1 -0
- package/dist/canvasShapeRegistry.d.ts +5 -0
- package/dist/canvasShapeRegistry.d.ts.map +1 -0
- package/dist/canvasShapeRegistry.js +17 -0
- package/dist/canvasShapeRegistry.js.map +1 -0
- package/dist/canvasSprite.d.ts +5 -0
- package/dist/canvasSprite.d.ts.map +1 -0
- package/dist/canvasSprite.js +61 -0
- package/dist/canvasSprite.js.map +1 -0
- package/dist/canvasTextInput.d.ts +4 -0
- package/dist/canvasTextInput.d.ts.map +1 -0
- package/dist/canvasTextInput.js +67 -0
- package/dist/canvasTextInput.js.map +1 -0
- package/dist/canvasTextLabel.d.ts +4 -0
- package/dist/canvasTextLabel.d.ts.map +1 -0
- package/dist/canvasTextLabel.js +56 -0
- package/dist/canvasTextLabel.js.map +1 -0
- package/dist/canvasTextMeasure.d.ts +3 -0
- package/dist/canvasTextMeasure.d.ts.map +1 -0
- package/dist/canvasTextMeasure.js +15 -0
- package/dist/canvasTextMeasure.js.map +1 -0
- package/dist/canvasTilemap.d.ts +4 -0
- package/dist/canvasTilemap.d.ts.map +1 -0
- package/dist/canvasTilemap.js +50 -0
- package/dist/canvasTilemap.js.map +1 -0
- package/dist/canvasTransform.d.ts +3 -0
- package/dist/canvasTransform.d.ts.map +1 -0
- package/dist/canvasTransform.js +9 -0
- package/dist/canvasTransform.js.map +1 -0
- package/dist/canvasVideo.d.ts +4 -0
- package/dist/canvasVideo.d.ts.map +1 -0
- package/dist/canvasVideo.js +26 -0
- package/dist/canvasVideo.js.map +1 -0
- package/dist/index.d.ts +31 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +31 -0
- package/dist/index.js.map +1 -0
- package/package.json +55 -0
- package/src/canvasBackground.test.ts +65 -0
- package/src/canvasBitmap.test.ts +92 -0
- package/src/canvasCSSFilterBinding.test.ts +86 -0
- package/src/canvasCache.test.ts +189 -0
- package/src/canvasClip.test.ts +12 -0
- package/src/canvasClipRectangle.test.ts +101 -0
- package/src/canvasElement.test.ts +21 -0
- package/src/canvasFillPattern.test.ts +96 -0
- package/src/canvasImageSource.test.ts +79 -0
- package/src/canvasMaterialRegistry.test.ts +69 -0
- package/src/canvasMaterials.test.ts +85 -0
- package/src/canvasNode2D.test.ts +113 -0
- package/src/canvasParticleEmitter2D.test.ts +105 -0
- package/src/canvasQuadBatch.test.ts +119 -0
- package/src/canvasRegistration.test.ts +57 -0
- package/src/canvasRenderState.test.ts +186 -0
- package/src/canvasRenderTarget.test.ts +162 -0
- package/src/canvasRichText.test.ts +93 -0
- package/src/canvasScale9Mapper.test.ts +53 -0
- package/src/canvasScale9Shape.test.ts +89 -0
- package/src/canvasShape.test.ts +183 -0
- package/src/canvasShapeCommands.test.ts +448 -0
- package/src/canvasShapeRegistry.test.ts +42 -0
- package/src/canvasSprite.test.ts +106 -0
- package/src/canvasTextInput.test.ts +67 -0
- package/src/canvasTextLabel.test.ts +32 -0
- package/src/canvasTextMeasure.test.ts +9 -0
- package/src/canvasTilemap.test.ts +69 -0
- package/src/canvasTransform.test.ts +42 -0
- package/src/canvasVideo.test.ts +43 -0
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { computeRgbHexString } from '@flighthq/color';
|
|
2
|
+
import { getRichTextRuntime } from '@flighthq/text';
|
|
3
|
+
import { getTextInputCaretRectangle, getTextInputSelectionBeginIndex, getTextInputSelectionEndIndex, getTextInputSelectionRectangles, getTextInputState, } from '@flighthq/textinput';
|
|
4
|
+
import { computeTextBoundsHeight, computeTextBoundsWidth, getRichTextScrollYOffset } from '@flighthq/textlayout';
|
|
5
|
+
import { registerCanvasTextInputOverlay } from './canvasRichText';
|
|
6
|
+
import { setCanvasTransform } from './canvasTransform';
|
|
7
|
+
// Draws the editable-field overlay (selection highlight + blinking caret) over a RichText whose input
|
|
8
|
+
// slot is present. Invoked by the Canvas RichText renderer after the field, keyed off the input slot.
|
|
9
|
+
export function drawCanvasTextInputOverlay(state, renderProxy) {
|
|
10
|
+
const source = renderProxy.source;
|
|
11
|
+
const input = getTextInputState(source);
|
|
12
|
+
if (input === null)
|
|
13
|
+
return;
|
|
14
|
+
const layout = getRichTextRuntime(source).textLayout;
|
|
15
|
+
if ((!input.focused && !input.alwaysShowSelection) || layout === null)
|
|
16
|
+
return;
|
|
17
|
+
const fieldW = computeTextBoundsWidth(source.data, layout);
|
|
18
|
+
const fieldH = computeTextBoundsHeight(source.data, layout);
|
|
19
|
+
const firstVisibleLine = source.data.scrollV - 1;
|
|
20
|
+
const scrollYOffset = firstVisibleLine > 0 ? getRichTextScrollYOffset(layout.lineHeights, firstVisibleLine) : 0;
|
|
21
|
+
const scrollXOffset = source.data.scrollH;
|
|
22
|
+
const context = state.context;
|
|
23
|
+
context.save();
|
|
24
|
+
setCanvasTransform(state, context, renderProxy.transform2D);
|
|
25
|
+
context.beginPath();
|
|
26
|
+
context.rect(0, 0, fieldW, fieldH);
|
|
27
|
+
context.clip();
|
|
28
|
+
getTextInputSelectionRectangles(selectionRectangles, source, layout);
|
|
29
|
+
if (selectionRectangles.length > 0) {
|
|
30
|
+
context.fillStyle = computeRgbHexString(input.selectionColor);
|
|
31
|
+
context.globalAlpha = Math.min(1, renderProxy.alpha * input.selectionAlpha);
|
|
32
|
+
for (const rect of selectionRectangles) {
|
|
33
|
+
context.fillRect(rect.x - scrollXOffset, rect.y - scrollYOffset, rect.width, rect.height);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
if (input.focused && getTextInputSelectionBeginIndex(source) === getTextInputSelectionEndIndex(source)) {
|
|
37
|
+
if (getCaretVisible(source, input.focused)) {
|
|
38
|
+
getTextInputCaretRectangle(caretRectangle, source, layout);
|
|
39
|
+
context.fillStyle = CARET_COLOR;
|
|
40
|
+
context.globalAlpha = renderProxy.alpha;
|
|
41
|
+
context.fillRect(caretRectangle.x - scrollXOffset, caretRectangle.y - scrollYOffset, CARET_WIDTH, caretRectangle.height);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
context.restore();
|
|
45
|
+
}
|
|
46
|
+
// Installs the caret/selection overlay onto the Canvas RichText renderer. Importing this is what opts an
|
|
47
|
+
// app into text-input rendering; a RichText that never enables input draws nothing extra and the
|
|
48
|
+
// renderer stays free of this module's text-input dependency.
|
|
49
|
+
export function enableCanvasTextInput() {
|
|
50
|
+
registerCanvasTextInputOverlay(drawCanvasTextInputOverlay);
|
|
51
|
+
}
|
|
52
|
+
const CARET_BLINK_MS = 530;
|
|
53
|
+
const CARET_COLOR = '#000000';
|
|
54
|
+
const _blinkStart = new WeakMap();
|
|
55
|
+
const _prevFocused = new WeakMap();
|
|
56
|
+
function getCaretVisible(source, focused) {
|
|
57
|
+
const wasFocused = _prevFocused.get(source) ?? false;
|
|
58
|
+
if (!wasFocused && focused)
|
|
59
|
+
_blinkStart.set(source, performance.now());
|
|
60
|
+
_prevFocused.set(source, focused);
|
|
61
|
+
const elapsed = performance.now() - (_blinkStart.get(source) ?? performance.now());
|
|
62
|
+
return elapsed % (CARET_BLINK_MS * 2) < CARET_BLINK_MS;
|
|
63
|
+
}
|
|
64
|
+
const CARET_WIDTH = 1;
|
|
65
|
+
const caretRectangle = { height: 0, lineIndex: 0, width: 0, x: 0, y: 0 };
|
|
66
|
+
const selectionRectangles = [];
|
|
67
|
+
//# sourceMappingURL=canvasTextInput.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canvasTextInput.js","sourceRoot":"","sources":["../src/canvasTextInput.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { CanvasRenderState, Scene2DRenderer, RenderProxy2D } from '@flighthq/types';
|
|
2
|
+
export declare function drawCanvasTextLabel(state: CanvasRenderState, renderProxy: RenderProxy2D): void;
|
|
3
|
+
export declare const defaultCanvasTextLabelRenderer: Scene2DRenderer;
|
|
4
|
+
//# sourceMappingURL=canvasTextLabel.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canvasTextLabel.d.ts","sourceRoot":"","sources":["../src/canvasTextLabel.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,iBAAiB,EACjB,eAAe,EACf,aAAa,EAId,MAAM,iBAAiB,CAAC;AAKzB,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CAkD9F;AAED,eAAO,MAAM,8BAA8B,EAAE,eAG5C,CAAC"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { computeRgbHexString } from '@flighthq/color';
|
|
2
|
+
import { noopRendererData } from '@flighthq/render';
|
|
3
|
+
import { computeTextFormatFontString, getTextLabelRuntime } from '@flighthq/text';
|
|
4
|
+
import { computeTextLayout, createTextFormatRange, getTextLayoutResult } from '@flighthq/textlayout';
|
|
5
|
+
import { drawCanvasScene2D } from './canvasNode2D';
|
|
6
|
+
import { setCanvasTransform } from './canvasTransform';
|
|
7
|
+
export function drawCanvasTextLabel(state, renderProxy) {
|
|
8
|
+
drawCanvasScene2D(state, renderProxy);
|
|
9
|
+
const source = renderProxy.source;
|
|
10
|
+
const { text, textFormat } = source.data;
|
|
11
|
+
if (text.length === 0)
|
|
12
|
+
return;
|
|
13
|
+
const context = state.context;
|
|
14
|
+
state.applyBlendMode?.(state, renderProxy.blendMode);
|
|
15
|
+
context.globalAlpha = renderProxy.alpha;
|
|
16
|
+
setCanvasTransform(state, context, renderProxy.transform2D);
|
|
17
|
+
const measure = (t, format) => {
|
|
18
|
+
context.font = computeTextFormatFontString(format);
|
|
19
|
+
return context.measureText(t).width;
|
|
20
|
+
};
|
|
21
|
+
const result = getTextLayoutResult(getTextLabelRuntime(source));
|
|
22
|
+
computeTextLayout(result, {
|
|
23
|
+
text,
|
|
24
|
+
formatRanges: [createTextFormatRange(textFormat, 0, text.length)],
|
|
25
|
+
width: source.data.width,
|
|
26
|
+
height: source.data.height,
|
|
27
|
+
measure,
|
|
28
|
+
verticalAlign: source.data.autoSize === 'none' ? source.data.verticalAlign : 'top',
|
|
29
|
+
});
|
|
30
|
+
context.textBaseline = 'alphabetic';
|
|
31
|
+
context.textAlign = 'start';
|
|
32
|
+
for (const group of result.groups) {
|
|
33
|
+
context.font = computeTextFormatFontString(group.format);
|
|
34
|
+
context.fillStyle = computeRgbHexString(group.format.color ?? 0);
|
|
35
|
+
const slice = text.substring(group.startIndex, group.endIndex);
|
|
36
|
+
const x = group.offsetX;
|
|
37
|
+
// group.ascent = font-size; CSS places the alphabetic baseline at ~80% of the em-size.
|
|
38
|
+
// Subtract 20% so the canvas baseline aligns with the DOM renderer's natural baseline.
|
|
39
|
+
const y = group.offsetY + group.ascent * 0.815;
|
|
40
|
+
context.fillText(slice, x, y);
|
|
41
|
+
if (group.format.underline) {
|
|
42
|
+
const lineY = y + group.descent;
|
|
43
|
+
context.strokeStyle = computeRgbHexString(group.format.color ?? 0);
|
|
44
|
+
context.lineWidth = Math.max(1, (group.format.size ?? 12) / 16);
|
|
45
|
+
context.beginPath();
|
|
46
|
+
context.moveTo(x, lineY);
|
|
47
|
+
context.lineTo(x + group.width, lineY);
|
|
48
|
+
context.stroke();
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
export const defaultCanvasTextLabelRenderer = {
|
|
53
|
+
createData: noopRendererData,
|
|
54
|
+
submit: drawCanvasTextLabel,
|
|
55
|
+
};
|
|
56
|
+
//# sourceMappingURL=canvasTextLabel.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canvasTextLabel.js","sourceRoot":"","sources":["../src/canvasTextLabel.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canvasTextMeasure.d.ts","sourceRoot":"","sources":["../src/canvasTextMeasure.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAc,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAOvE,wBAAgB,uBAAuB,IAAI,mBAAmB,CAO7D"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { computeTextFormatFontString } from '@flighthq/text';
|
|
2
|
+
// Builds a TextMeasureFunction backed by a private offscreen 2D canvas — the measurement battery for
|
|
3
|
+
// setTextLayoutMeasureProvider. Register it once during setup
|
|
4
|
+
// (setTextLayoutMeasureProvider(createCanvasTextMeasure())) so ensureRichTextLayout can measure text
|
|
5
|
+
// for metrics and autoSize bounds outside the render pass. Same canvas measureText the renderers use,
|
|
6
|
+
// so the ensured layout matches what gets rasterized.
|
|
7
|
+
export function createCanvasTextMeasure() {
|
|
8
|
+
const canvas = document.createElement('canvas');
|
|
9
|
+
const context = canvas.getContext('2d');
|
|
10
|
+
return (text, format) => {
|
|
11
|
+
context.font = computeTextFormatFontString(format);
|
|
12
|
+
return context.measureText(text).width;
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=canvasTextMeasure.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canvasTextMeasure.js","sourceRoot":"","sources":["../src/canvasTextMeasure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAG7D,qGAAqG;AACrG,8DAA8D;AAC9D,qGAAqG;AACrG,sGAAsG;AACtG,sDAAsD;AACtD,MAAM,UAAU,uBAAuB;IACrC,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAE,CAAC;IACzC,OAAO,CAAC,IAAY,EAAE,MAAkB,EAAU,EAAE;QAClD,OAAO,CAAC,IAAI,GAAG,2BAA2B,CAAC,MAAM,CAAC,CAAC;QACnD,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IACzC,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { CanvasRenderState, RenderProxy2D, SpriteRenderer } from '@flighthq/types';
|
|
2
|
+
export declare function drawCanvasTilemap(state: CanvasRenderState, tilemapNode: RenderProxy2D): void;
|
|
3
|
+
export declare const defaultCanvasTilemapRenderer: SpriteRenderer;
|
|
4
|
+
//# sourceMappingURL=canvasTilemap.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canvasTilemap.d.ts","sourceRoot":"","sources":["../src/canvasTilemap.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,cAAc,EAAW,MAAM,iBAAiB,CAAC;AAIjG,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CAwD5F;AAED,eAAO,MAAM,4BAA4B,EAAE,cAG1C,CAAC"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { noopRendererData } from '@flighthq/render';
|
|
2
|
+
import { applyCanvasMaterial } from './canvasMaterialRegistry';
|
|
3
|
+
export function drawCanvasTilemap(state, tilemapNode) {
|
|
4
|
+
const source = tilemapNode.source;
|
|
5
|
+
const { tileset, columns, rows, tiles } = source.data;
|
|
6
|
+
if (tileset === null)
|
|
7
|
+
return;
|
|
8
|
+
const atlas = tileset.atlas;
|
|
9
|
+
if (atlas === null || atlas.image === null || atlas.image.source === null)
|
|
10
|
+
return;
|
|
11
|
+
if (columns === 0 || rows === 0)
|
|
12
|
+
return;
|
|
13
|
+
state.applyBlendMode?.(state, tilemapNode.blendMode);
|
|
14
|
+
const context = state.context;
|
|
15
|
+
const image = atlas.image.source;
|
|
16
|
+
const regions = atlas.regions;
|
|
17
|
+
const numRegions = regions.length;
|
|
18
|
+
const transform = tilemapNode.transform2D;
|
|
19
|
+
const roundPixels = state.roundPixels;
|
|
20
|
+
const { tileWidth, tileHeight } = tileset;
|
|
21
|
+
context.globalAlpha = tilemapNode.alpha;
|
|
22
|
+
if (!state.allowSmoothing)
|
|
23
|
+
context.imageSmoothingEnabled = false;
|
|
24
|
+
const restoreMaterial = applyCanvasMaterial(state, tilemapNode.material);
|
|
25
|
+
// Apply the node's world transform once — tile positions are local offsets within it.
|
|
26
|
+
context.setTransform(transform.a, transform.b, transform.c, transform.d, transform.tx, transform.ty);
|
|
27
|
+
for (let row = 0; row < rows; row++) {
|
|
28
|
+
for (let col = 0; col < columns; col++) {
|
|
29
|
+
const id = tiles[row * columns + col];
|
|
30
|
+
if (id < 0 || id >= numRegions)
|
|
31
|
+
continue;
|
|
32
|
+
const region = regions[id];
|
|
33
|
+
if (region.width <= 0 || region.height <= 0)
|
|
34
|
+
continue;
|
|
35
|
+
const dx = col * tileWidth;
|
|
36
|
+
const dy = row * tileHeight;
|
|
37
|
+
context.drawImage(image, region.x, region.y, region.width, region.height, roundPixels ? dx | 0 : dx, roundPixels ? dy | 0 : dy, region.width, region.height);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
if (restoreMaterial)
|
|
41
|
+
context.restore();
|
|
42
|
+
context.setTransform(1, 0, 0, 1, 0, 0);
|
|
43
|
+
if (!state.allowSmoothing)
|
|
44
|
+
context.imageSmoothingEnabled = true;
|
|
45
|
+
}
|
|
46
|
+
export const defaultCanvasTilemapRenderer = {
|
|
47
|
+
createData: noopRendererData,
|
|
48
|
+
submit: drawCanvasTilemap,
|
|
49
|
+
};
|
|
50
|
+
//# sourceMappingURL=canvasTilemap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canvasTilemap.js","sourceRoot":"","sources":["../src/canvasTilemap.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canvasTransform.d.ts","sourceRoot":"","sources":["../src/canvasTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEjE,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,wBAAwB,EACjC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,IAAI,CAaN"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export function setCanvasTransform(state, context, transform) {
|
|
2
|
+
if (state.roundPixels) {
|
|
3
|
+
context.setTransform(transform.a, transform.b, transform.c, transform.d, Math.fround(transform.tx), Math.fround(transform.ty));
|
|
4
|
+
}
|
|
5
|
+
else {
|
|
6
|
+
context.setTransform(transform.a, transform.b, transform.c, transform.d, transform.tx, transform.ty);
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=canvasTransform.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canvasTransform.js","sourceRoot":"","sources":["../src/canvasTransform.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,kBAAkB,CAChC,KAAwB,EACxB,OAAiC,EACjC,SAA2B;IAE3B,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;QACtB,OAAO,CAAC,YAAY,CAClB,SAAS,CAAC,CAAC,EACX,SAAS,CAAC,CAAC,EACX,SAAS,CAAC,CAAC,EACX,SAAS,CAAC,CAAC,EACX,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,EACzB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAC1B,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IACvG,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { CanvasRenderState, Scene2DRenderer, RenderProxy2D } from '@flighthq/types';
|
|
2
|
+
export declare function drawCanvasVideo(state: CanvasRenderState, renderProxy: RenderProxy2D): void;
|
|
3
|
+
export declare const defaultCanvasVideoRenderer: Scene2DRenderer;
|
|
4
|
+
//# sourceMappingURL=canvasVideo.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canvasVideo.d.ts","sourceRoot":"","sources":["../src/canvasVideo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,aAAa,EAAS,MAAM,iBAAiB,CAAC;AAKhG,wBAAgB,eAAe,CAAC,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CAiB1F;AAED,eAAO,MAAM,0BAA0B,EAAE,eAGxC,CAAC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { noopRendererData } from '@flighthq/render';
|
|
2
|
+
import { drawCanvasScene2D } from './canvasNode2D';
|
|
3
|
+
import { setCanvasTransform } from './canvasTransform';
|
|
4
|
+
export function drawCanvasVideo(state, renderProxy) {
|
|
5
|
+
drawCanvasScene2D(state, renderProxy);
|
|
6
|
+
const source = renderProxy.source;
|
|
7
|
+
const element = source.data.source?.element;
|
|
8
|
+
if (element !== undefined && element !== null && element.readyState >= 2) {
|
|
9
|
+
const context = state.context;
|
|
10
|
+
state.applyBlendMode?.(state, renderProxy.blendMode);
|
|
11
|
+
context.globalAlpha = renderProxy.alpha;
|
|
12
|
+
setCanvasTransform(state, context, renderProxy.transform2D);
|
|
13
|
+
if (!state.allowSmoothing || !source.data.smoothing) {
|
|
14
|
+
context.imageSmoothingEnabled = false;
|
|
15
|
+
}
|
|
16
|
+
context.drawImage(element, 0, 0, element.videoWidth, element.videoHeight);
|
|
17
|
+
if (!state.allowSmoothing || !source.data.smoothing) {
|
|
18
|
+
context.imageSmoothingEnabled = true;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
export const defaultCanvasVideoRenderer = {
|
|
23
|
+
createData: noopRendererData,
|
|
24
|
+
submit: drawCanvasVideo,
|
|
25
|
+
};
|
|
26
|
+
//# sourceMappingURL=canvasVideo.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canvasVideo.js","sourceRoot":"","sources":["../src/canvasVideo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,UAAU,eAAe,CAAC,KAAwB,EAAE,WAA0B;IAClF,iBAAiB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,WAAW,CAAC,MAAe,CAAC;IAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;IAC5C,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC;QACzE,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC9B,KAAK,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QACrD,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC;QACxC,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;QAC5D,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpD,OAAO,CAAC,qBAAqB,GAAG,KAAK,CAAC;QACxC,CAAC;QACD,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAC1E,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpD,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC;QACvC,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAoB;IACzD,UAAU,EAAE,gBAAgB;IAC5B,MAAM,EAAE,eAAe;CACxB,CAAC"}
|
package/dist/index.d.ts
ADDED
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
export * from './canvasBackground';
|
|
2
|
+
export * from './canvasBitmap';
|
|
3
|
+
export * from './canvasCache';
|
|
4
|
+
export * from './canvasClip';
|
|
5
|
+
export * from './canvasClipRectangle';
|
|
6
|
+
export * from './canvasCSSFilterBinding';
|
|
7
|
+
export * from './canvasNode2D';
|
|
8
|
+
export * from './canvasElement';
|
|
9
|
+
export * from './canvasFillPattern';
|
|
10
|
+
export * from './canvasImageSource';
|
|
11
|
+
export * from './canvasMaterialRegistry';
|
|
12
|
+
export * from './canvasMaterials';
|
|
13
|
+
export * from './canvasParticleEmitter2D';
|
|
14
|
+
export * from './canvasQuadBatch';
|
|
15
|
+
export * from './canvasRegistration';
|
|
16
|
+
export * from './canvasRenderState';
|
|
17
|
+
export * from './canvasRenderTarget';
|
|
18
|
+
export * from './canvasRichText';
|
|
19
|
+
export * from './canvasScale9Mapper';
|
|
20
|
+
export * from './canvasScale9Shape';
|
|
21
|
+
export * from './canvasShape';
|
|
22
|
+
export * from './canvasShapeCommands';
|
|
23
|
+
export * from './canvasShapeRegistry';
|
|
24
|
+
export * from './canvasSprite';
|
|
25
|
+
export * from './canvasTextInput';
|
|
26
|
+
export * from './canvasTextLabel';
|
|
27
|
+
export * from './canvasTextMeasure';
|
|
28
|
+
export * from './canvasTilemap';
|
|
29
|
+
export * from './canvasTransform';
|
|
30
|
+
export * from './canvasVideo';
|
|
31
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC"}
|
package/dist/index.js
ADDED
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
export * from './canvasBackground';
|
|
2
|
+
export * from './canvasBitmap';
|
|
3
|
+
export * from './canvasCache';
|
|
4
|
+
export * from './canvasClip';
|
|
5
|
+
export * from './canvasClipRectangle';
|
|
6
|
+
export * from './canvasCSSFilterBinding';
|
|
7
|
+
export * from './canvasNode2D';
|
|
8
|
+
export * from './canvasElement';
|
|
9
|
+
export * from './canvasFillPattern';
|
|
10
|
+
export * from './canvasImageSource';
|
|
11
|
+
export * from './canvasMaterialRegistry';
|
|
12
|
+
export * from './canvasMaterials';
|
|
13
|
+
export * from './canvasParticleEmitter2D';
|
|
14
|
+
export * from './canvasQuadBatch';
|
|
15
|
+
export * from './canvasRegistration';
|
|
16
|
+
export * from './canvasRenderState';
|
|
17
|
+
export * from './canvasRenderTarget';
|
|
18
|
+
export * from './canvasRichText';
|
|
19
|
+
export * from './canvasScale9Mapper';
|
|
20
|
+
export * from './canvasScale9Shape';
|
|
21
|
+
export * from './canvasShape';
|
|
22
|
+
export * from './canvasShapeCommands';
|
|
23
|
+
export * from './canvasShapeRegistry';
|
|
24
|
+
export * from './canvasSprite';
|
|
25
|
+
export * from './canvasTextInput';
|
|
26
|
+
export * from './canvasTextLabel';
|
|
27
|
+
export * from './canvasTextMeasure';
|
|
28
|
+
export * from './canvasTilemap';
|
|
29
|
+
export * from './canvasTransform';
|
|
30
|
+
export * from './canvasVideo';
|
|
31
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC"}
|
package/package.json
ADDED
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@flighthq/scene2d-canvas",
|
|
3
|
+
"version": "0.2.1-next.840.857425c",
|
|
4
|
+
"repository": {
|
|
5
|
+
"type": "git",
|
|
6
|
+
"url": "https://github.com/flighthq/flight.git",
|
|
7
|
+
"directory": "packages/scene2d-canvas"
|
|
8
|
+
},
|
|
9
|
+
"type": "module",
|
|
10
|
+
"main": "dist/index.js",
|
|
11
|
+
"types": "dist/index.d.ts",
|
|
12
|
+
"exports": {
|
|
13
|
+
".": {
|
|
14
|
+
"types": "./dist/index.d.ts",
|
|
15
|
+
"default": "./dist/index.js"
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
"files": [
|
|
19
|
+
"dist",
|
|
20
|
+
"src/**/*.test.ts",
|
|
21
|
+
"!dist/**/*.test.js",
|
|
22
|
+
"!dist/**/*.test.d.ts",
|
|
23
|
+
"!dist/**/*.test.js.map",
|
|
24
|
+
"!dist/**/*.test.d.ts.map"
|
|
25
|
+
],
|
|
26
|
+
"scripts": {
|
|
27
|
+
"build": "tsc -b",
|
|
28
|
+
"clean": "tsc -b --clean",
|
|
29
|
+
"test": "vitest run --config vitest.config.ts",
|
|
30
|
+
"test:watch": "vitest --watch --config vitest.config.ts",
|
|
31
|
+
"prepack": "npm run clean && npm run clean:dist && npm run build",
|
|
32
|
+
"clean:dist": "tsx ../../scripts/clean-package-dist.ts"
|
|
33
|
+
},
|
|
34
|
+
"dependencies": {
|
|
35
|
+
"@flighthq/color": "0.2.1-next.840.857425c",
|
|
36
|
+
"@flighthq/scene2d": "0.2.1-next.840.857425c",
|
|
37
|
+
"@flighthq/geometry": "0.2.1-next.840.857425c",
|
|
38
|
+
"@flighthq/image": "0.2.1-next.840.857425c",
|
|
39
|
+
"@flighthq/node": "0.2.1-next.840.857425c",
|
|
40
|
+
"@flighthq/render": "0.2.1-next.840.857425c",
|
|
41
|
+
"@flighthq/shape": "0.2.1-next.840.857425c",
|
|
42
|
+
"@flighthq/text": "0.2.1-next.840.857425c",
|
|
43
|
+
"@flighthq/textinput": "0.2.1-next.840.857425c",
|
|
44
|
+
"@flighthq/textlayout": "0.2.1-next.840.857425c",
|
|
45
|
+
"@flighthq/textureatlas": "0.2.1-next.840.857425c",
|
|
46
|
+
"@flighthq/tileset": "0.2.1-next.840.857425c",
|
|
47
|
+
"@flighthq/types": "0.2.1-next.840.857425c"
|
|
48
|
+
},
|
|
49
|
+
"devDependencies": {
|
|
50
|
+
"@flighthq/sprite": "*",
|
|
51
|
+
"typescript": "^5.3.0"
|
|
52
|
+
},
|
|
53
|
+
"description": "Canvas 2D renderer implementation",
|
|
54
|
+
"sideEffects": false
|
|
55
|
+
}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { setRenderStateBackgroundColor } from '@flighthq/render';
|
|
2
|
+
import type { CanvasRenderState } from '@flighthq/types';
|
|
3
|
+
import { BlendMode } from '@flighthq/types';
|
|
4
|
+
|
|
5
|
+
import { renderCanvasBackground } from './canvasBackground';
|
|
6
|
+
import { createCanvasRenderState, getCanvasRenderStateRuntime } from './canvasRenderState';
|
|
7
|
+
|
|
8
|
+
function makeState(): { canvas: HTMLCanvasElement; state: CanvasRenderState } {
|
|
9
|
+
const canvas = document.createElement('canvas');
|
|
10
|
+
canvas.width = 200;
|
|
11
|
+
canvas.height = 100;
|
|
12
|
+
const state = createCanvasRenderState(canvas);
|
|
13
|
+
return { canvas, state };
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
describe('renderCanvasBackground', () => {
|
|
17
|
+
it('calls clearRect when background alpha is 0', () => {
|
|
18
|
+
const { state } = makeState();
|
|
19
|
+
setRenderStateBackgroundColor(state, 0x00000000); // alpha = 0
|
|
20
|
+
const clearSpy = vi.spyOn(state.context, 'clearRect');
|
|
21
|
+
|
|
22
|
+
renderCanvasBackground(state);
|
|
23
|
+
|
|
24
|
+
expect(clearSpy).toHaveBeenCalledWith(0, 0, state.canvas.width, state.canvas.height);
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
it('calls fillRect when background has non-zero alpha', () => {
|
|
28
|
+
const { state } = makeState();
|
|
29
|
+
setRenderStateBackgroundColor(state, 0xff0000ff); // alpha = 0xff
|
|
30
|
+
const fillSpy = vi.spyOn(state.context, 'fillRect');
|
|
31
|
+
|
|
32
|
+
renderCanvasBackground(state);
|
|
33
|
+
|
|
34
|
+
expect(fillSpy).toHaveBeenCalledWith(0, 0, state.canvas.width, state.canvas.height);
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
it('resets transform to identity before drawing', () => {
|
|
38
|
+
const { state } = makeState();
|
|
39
|
+
const setTransformSpy = vi.spyOn(state.context, 'setTransform');
|
|
40
|
+
|
|
41
|
+
renderCanvasBackground(state);
|
|
42
|
+
|
|
43
|
+
expect(setTransformSpy).toHaveBeenCalledWith(1, 0, 0, 1, 0, 0);
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
it('sets globalAlpha to 1 before drawing', () => {
|
|
47
|
+
const { state } = makeState();
|
|
48
|
+
state.context.globalAlpha = 0.5;
|
|
49
|
+
|
|
50
|
+
renderCanvasBackground(state);
|
|
51
|
+
|
|
52
|
+
expect(state.context.globalAlpha).toBe(1);
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
it('resets to normal compositing directly, without using the blend-mode map', () => {
|
|
56
|
+
const { state } = makeState();
|
|
57
|
+
getCanvasRenderStateRuntime(state).currentBlendMode = BlendMode.Multiply;
|
|
58
|
+
state.context.globalCompositeOperation = 'multiply';
|
|
59
|
+
|
|
60
|
+
renderCanvasBackground(state);
|
|
61
|
+
|
|
62
|
+
expect(getCanvasRenderStateRuntime(state).currentBlendMode).toBe(BlendMode.Normal);
|
|
63
|
+
expect(state.context.globalCompositeOperation).toBe('source-over');
|
|
64
|
+
});
|
|
65
|
+
});
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { createRectangle } from '@flighthq/geometry';
|
|
2
|
+
import { createImageResource } from '@flighthq/image';
|
|
3
|
+
import { registerRenderer } from '@flighthq/render';
|
|
4
|
+
import { getOrCreateRenderProxy2D } from '@flighthq/render';
|
|
5
|
+
import { createBitmap } from '@flighthq/scene2d';
|
|
6
|
+
import { BitmapKind } from '@flighthq/types';
|
|
7
|
+
|
|
8
|
+
import { defaultCanvasBitmapRenderer, drawCanvasBitmap } from './canvasBitmap';
|
|
9
|
+
import { createCanvasRenderState } from './canvasRenderState';
|
|
10
|
+
|
|
11
|
+
function makeState() {
|
|
12
|
+
const canvas = document.createElement('canvas');
|
|
13
|
+
canvas.width = 200;
|
|
14
|
+
canvas.height = 200;
|
|
15
|
+
const state = createCanvasRenderState(canvas);
|
|
16
|
+
registerRenderer(state, BitmapKind, defaultCanvasBitmapRenderer);
|
|
17
|
+
return state;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
function makeImageSource() {
|
|
21
|
+
const img = document.createElement('img') as HTMLImageElement;
|
|
22
|
+
const source = createImageResource(img);
|
|
23
|
+
source.width = 64;
|
|
24
|
+
source.height = 64;
|
|
25
|
+
return source;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
describe('defaultCanvasBitmapRenderer', () => {
|
|
29
|
+
it('has submit and createData', () => {
|
|
30
|
+
expect(typeof defaultCanvasBitmapRenderer.submit).toBe('function');
|
|
31
|
+
expect(typeof defaultCanvasBitmapRenderer.createData).toBe('function');
|
|
32
|
+
});
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
describe('drawCanvasBitmap', () => {
|
|
36
|
+
it('calls drawImage when bitmap has a valid image source', () => {
|
|
37
|
+
const state = makeState();
|
|
38
|
+
const bitmap = createBitmap();
|
|
39
|
+
bitmap.data.image = makeImageSource();
|
|
40
|
+
const data = getOrCreateRenderProxy2D(state, bitmap);
|
|
41
|
+
const spy = vi.spyOn(state.context, 'drawImage');
|
|
42
|
+
|
|
43
|
+
drawCanvasBitmap(state, data);
|
|
44
|
+
|
|
45
|
+
expect(spy).toHaveBeenCalledOnce();
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
it('skips drawImage when image source is null', () => {
|
|
49
|
+
const state = makeState();
|
|
50
|
+
const bitmap = createBitmap();
|
|
51
|
+
bitmap.data.image = null;
|
|
52
|
+
const data = getOrCreateRenderProxy2D(state, bitmap);
|
|
53
|
+
const spy = vi.spyOn(state.context, 'drawImage');
|
|
54
|
+
|
|
55
|
+
drawCanvasBitmap(state, data);
|
|
56
|
+
|
|
57
|
+
expect(spy).not.toHaveBeenCalled();
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
it('crops to sourceRectangle when set', () => {
|
|
61
|
+
const state = makeState();
|
|
62
|
+
const bitmap = createBitmap();
|
|
63
|
+
bitmap.data.image = makeImageSource();
|
|
64
|
+
bitmap.data.sourceRectangle = createRectangle(10, 20, 32, 32);
|
|
65
|
+
const data = getOrCreateRenderProxy2D(state, bitmap);
|
|
66
|
+
const spy = vi.spyOn(state.context, 'drawImage');
|
|
67
|
+
|
|
68
|
+
drawCanvasBitmap(state, data);
|
|
69
|
+
|
|
70
|
+
expect(spy).toHaveBeenCalledOnce();
|
|
71
|
+
const args = spy.mock.calls[0] as number[];
|
|
72
|
+
expect(args[1]).toBe(10); // sx
|
|
73
|
+
expect(args[2]).toBe(20); // sy
|
|
74
|
+
expect(args[3]).toBe(32); // sw
|
|
75
|
+
expect(args[4]).toBe(32); // sh
|
|
76
|
+
expect(args[5]).toBe(0); // dx
|
|
77
|
+
expect(args[6]).toBe(0); // dy
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
it('disables imageSmoothingEnabled when smoothing is false', () => {
|
|
81
|
+
const state = makeState();
|
|
82
|
+
state.allowSmoothing = true;
|
|
83
|
+
const bitmap = createBitmap();
|
|
84
|
+
bitmap.data.image = makeImageSource();
|
|
85
|
+
bitmap.data.smoothing = false;
|
|
86
|
+
const data = getOrCreateRenderProxy2D(state, bitmap);
|
|
87
|
+
|
|
88
|
+
drawCanvasBitmap(state, data);
|
|
89
|
+
|
|
90
|
+
expect(state.context.imageSmoothingEnabled).toBe(true); // restored after draw
|
|
91
|
+
});
|
|
92
|
+
});
|