@flighthq/scene2d-wgpu 0.5.1-next.973.788d3d7 → 0.6.0
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/README.md +2 -2
- package/dist/.tsbuildinfo.contract +1 -0
- package/dist/.tsbuildinfo.runtime +1 -0
- package/dist/contract.d.ts +32 -34
- package/dist/contract.d.ts.map +1 -1
- package/dist/contract.js +32 -34
- package/dist/contract.js.map +1 -1
- package/dist/contract.scene2d-wgpu-types.d.ts +6 -0
- package/dist/contract.scene2d-wgpu-types.d.ts.map +1 -0
- package/dist/contract.scene2d-wgpu-types.js +2 -0
- package/dist/contract.scene2d-wgpu-types.js.map +1 -0
- package/dist/enableWgpuColorAdjustmentGuards.d.ts +3 -2
- package/dist/enableWgpuColorAdjustmentGuards.d.ts.map +1 -1
- package/dist/enableWgpuColorAdjustmentGuards.js +23 -14
- package/dist/enableWgpuColorAdjustmentGuards.js.map +1 -1
- package/dist/enableWgpuStrokePathTessellation.d.ts +1 -1
- package/dist/enableWgpuStrokePathTessellation.d.ts.map +1 -1
- package/dist/enableWgpuStrokePathTessellation.js +1 -6
- package/dist/enableWgpuStrokePathTessellation.js.map +1 -1
- package/dist/index.d.ts +23 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +23 -2
- package/dist/index.js.map +1 -1
- package/dist/scene2DWgpuPipeline.d.ts +13 -0
- package/dist/scene2DWgpuPipeline.d.ts.map +1 -0
- package/dist/scene2DWgpuPipeline.js +59 -0
- package/dist/scene2DWgpuPipeline.js.map +1 -0
- package/dist/types/WgpuColorAdjustmentMaterialFeature.d.ts +2 -0
- package/dist/types/WgpuColorAdjustmentMaterialFeature.d.ts.map +1 -0
- package/dist/types/WgpuColorAdjustmentMaterialFeature.js +2 -0
- package/dist/types/WgpuColorAdjustmentMaterialFeature.js.map +1 -0
- package/dist/types/WgpuRenderStats.d.ts +12 -0
- package/dist/types/WgpuRenderStats.d.ts.map +1 -0
- package/dist/types/WgpuRenderStats.js +2 -0
- package/dist/types/WgpuRenderStats.js.map +1 -0
- package/dist/types/WgpuRichTextOverlay.d.ts +4 -0
- package/dist/types/WgpuRichTextOverlay.d.ts.map +1 -0
- package/dist/types/WgpuRichTextOverlay.js +2 -0
- package/dist/types/WgpuRichTextOverlay.js.map +1 -0
- package/dist/types/WgpuShapeMesh.d.ts +2 -0
- package/dist/types/WgpuShapeMesh.d.ts.map +1 -0
- package/dist/types/WgpuShapeMesh.js +2 -0
- package/dist/types/WgpuShapeMesh.js.map +1 -0
- package/dist/types/WgpuShapeRendererData.d.ts +17 -0
- package/dist/types/WgpuShapeRendererData.d.ts.map +1 -0
- package/dist/types/WgpuShapeRendererData.js +2 -0
- package/dist/types/WgpuShapeRendererData.js.map +1 -0
- package/dist/wgpuBitmapText.d.ts +2 -2
- package/dist/wgpuBitmapText.d.ts.map +1 -1
- package/dist/wgpuBitmapText.js +6 -6
- package/dist/wgpuBitmapText.js.map +1 -1
- package/dist/wgpuCache.d.ts +9 -6
- package/dist/wgpuCache.d.ts.map +1 -1
- package/dist/wgpuCache.js +17 -18
- package/dist/wgpuCache.js.map +1 -1
- package/dist/wgpuClip.d.ts +1 -1
- package/dist/wgpuClip.d.ts.map +1 -1
- package/dist/wgpuClip.js +2 -2
- package/dist/wgpuClip.js.map +1 -1
- package/dist/wgpuClipContours.d.ts +3 -1
- package/dist/wgpuClipContours.d.ts.map +1 -1
- package/dist/wgpuClipContours.js +7 -8
- package/dist/wgpuClipContours.js.map +1 -1
- package/dist/wgpuClipRectangle.d.ts +2 -1
- package/dist/wgpuClipRectangle.d.ts.map +1 -1
- package/dist/wgpuClipRectangle.js +4 -5
- package/dist/wgpuClipRectangle.js.map +1 -1
- package/dist/wgpuColorAdjustmentMaterialFeature.d.ts +1 -1
- package/dist/wgpuColorAdjustmentMaterialFeature.d.ts.map +1 -1
- package/dist/wgpuColorAdjustmentMaterialFeature.js +9 -13
- package/dist/wgpuColorAdjustmentMaterialFeature.js.map +1 -1
- package/dist/wgpuMeshShapeRenderer.d.ts +3 -2
- package/dist/wgpuMeshShapeRenderer.d.ts.map +1 -1
- package/dist/wgpuMeshShapeRenderer.js +9 -8
- package/dist/wgpuMeshShapeRenderer.js.map +1 -1
- package/dist/wgpuNode2D.d.ts +6 -3
- package/dist/wgpuNode2D.d.ts.map +1 -1
- package/dist/wgpuNode2D.js +20 -4
- package/dist/wgpuNode2D.js.map +1 -1
- package/dist/wgpuParticleEmitter2D.d.ts +4 -2
- package/dist/wgpuParticleEmitter2D.d.ts.map +1 -1
- package/dist/wgpuParticleEmitter2D.js +8 -8
- package/dist/wgpuParticleEmitter2D.js.map +1 -1
- package/dist/wgpuQuadBatch.d.ts +3 -3
- package/dist/wgpuQuadBatch.d.ts.map +1 -1
- package/dist/wgpuQuadBatch.js +6 -6
- package/dist/wgpuQuadBatch.js.map +1 -1
- package/dist/wgpuQuadBatchWriter.d.ts +9 -5
- package/dist/wgpuQuadBatchWriter.d.ts.map +1 -1
- package/dist/wgpuQuadBatchWriter.js +12 -8
- package/dist/wgpuQuadBatchWriter.js.map +1 -1
- package/dist/wgpuRasterShapeRenderer.d.ts +3 -2
- package/dist/wgpuRasterShapeRenderer.d.ts.map +1 -1
- package/dist/wgpuRasterShapeRenderer.js +41 -22
- package/dist/wgpuRasterShapeRenderer.js.map +1 -1
- package/dist/wgpuRenderStats.d.ts +2 -1
- package/dist/wgpuRenderStats.d.ts.map +1 -1
- package/dist/wgpuRenderStats.js.map +1 -1
- package/dist/wgpuRendererData.d.ts +2 -1
- package/dist/wgpuRendererData.d.ts.map +1 -1
- package/dist/wgpuRendererData.js +1 -1
- package/dist/wgpuRendererData.js.map +1 -1
- package/dist/wgpuRichText.d.ts +6 -3
- package/dist/wgpuRichText.d.ts.map +1 -1
- package/dist/wgpuRichText.js +67 -34
- package/dist/wgpuRichText.js.map +1 -1
- package/dist/wgpuScale9Mapper.d.ts +2 -1
- package/dist/wgpuScale9Mapper.d.ts.map +1 -1
- package/dist/wgpuScale9Mapper.js.map +1 -1
- package/dist/wgpuScale9Shape.d.ts +10 -5
- package/dist/wgpuScale9Shape.d.ts.map +1 -1
- package/dist/wgpuScale9Shape.js +54 -28
- package/dist/wgpuScale9Shape.js.map +1 -1
- package/dist/wgpuScale9Sprite.d.ts +3 -2
- package/dist/wgpuScale9Sprite.d.ts.map +1 -1
- package/dist/wgpuScale9Sprite.js +9 -10
- package/dist/wgpuScale9Sprite.js.map +1 -1
- package/dist/wgpuShape.d.ts +4 -3
- package/dist/wgpuShape.d.ts.map +1 -1
- package/dist/wgpuShape.js +7 -7
- package/dist/wgpuShape.js.map +1 -1
- package/dist/wgpuShapeData.d.ts +8 -3
- package/dist/wgpuShapeData.d.ts.map +1 -1
- package/dist/wgpuShapeData.js +12 -9
- package/dist/wgpuShapeData.js.map +1 -1
- package/dist/wgpuShapeMesh.d.ts +4 -2
- package/dist/wgpuShapeMesh.d.ts.map +1 -1
- package/dist/wgpuShapeMesh.js +9 -8
- package/dist/wgpuShapeMesh.js.map +1 -1
- package/dist/wgpuShapeRasterizer.d.ts +2 -1
- package/dist/wgpuShapeRasterizer.d.ts.map +1 -1
- package/dist/wgpuShapeRasterizer.js +3 -8
- package/dist/wgpuShapeRasterizer.js.map +1 -1
- package/dist/wgpuSprite.d.ts +3 -2
- package/dist/wgpuSprite.d.ts.map +1 -1
- package/dist/wgpuSprite.js +7 -8
- package/dist/wgpuSprite.js.map +1 -1
- package/dist/wgpuStandardMaterial.d.ts +2 -2
- package/dist/wgpuStandardMaterial.d.ts.map +1 -1
- package/dist/wgpuStandardMaterial.js +5 -5
- package/dist/wgpuStandardMaterial.js.map +1 -1
- package/dist/wgpuTextInput.d.ts +2 -1
- package/dist/wgpuTextInput.d.ts.map +1 -1
- package/dist/wgpuTextInput.js +6 -7
- package/dist/wgpuTextInput.js.map +1 -1
- package/dist/wgpuTextLabel.d.ts +3 -2
- package/dist/wgpuTextLabel.d.ts.map +1 -1
- package/dist/wgpuTextLabel.js +67 -35
- package/dist/wgpuTextLabel.js.map +1 -1
- package/dist/wgpuTilemap.d.ts +2 -2
- package/dist/wgpuTilemap.d.ts.map +1 -1
- package/dist/wgpuTilemap.js +6 -6
- package/dist/wgpuTilemap.js.map +1 -1
- package/dist/wgpuVelocity.d.ts +10 -7
- package/dist/wgpuVelocity.d.ts.map +1 -1
- package/dist/wgpuVelocity.js +89 -87
- package/dist/wgpuVelocity.js.map +1 -1
- package/package.json +31 -25
- package/src/contract.test.ts +13 -0
- package/src/enableWgpuColorAdjustmentGuards.test.ts +50 -28
- package/src/enableWgpuStrokePathTessellation.test.ts +4 -9
- package/src/scene2DWgpuPipeline.test.ts +53 -0
- package/src/wgpuBitmapText.test.ts +10 -10
- package/src/wgpuCache.test.ts +130 -168
- package/src/wgpuClip.test.ts +1 -1
- package/src/wgpuClipContours.test.ts +13 -6
- package/src/wgpuClipRectangle.test.ts +8 -8
- package/src/wgpuColorAdjustmentMaterialFeature.test.ts +20 -19
- package/src/wgpuMeshShapeRenderer.test.ts +51 -52
- package/src/wgpuNode2D.test.ts +14 -14
- package/src/wgpuParticleEmitter2D.test.ts +52 -45
- package/src/wgpuQuadBatch.test.ts +62 -60
- package/src/wgpuQuadBatchWriter.test.ts +76 -34
- package/src/wgpuRasterShapeRenderer.test.ts +95 -57
- package/src/wgpuRenderStats.test.ts +1 -1
- package/src/wgpuRendererData.test.ts +2 -2
- package/src/wgpuRichText.test.ts +109 -58
- package/src/wgpuScale9Mapper.test.ts +1 -1
- package/src/wgpuScale9Shape.test.ts +103 -62
- package/src/wgpuScale9Sprite.test.ts +31 -36
- package/src/wgpuShape.test.ts +111 -76
- package/src/wgpuShapeData.test.ts +96 -53
- package/src/wgpuShapeMesh.test.ts +39 -25
- package/src/wgpuShapeRasterizer.test.ts +11 -7
- package/src/wgpuSprite.test.ts +36 -27
- package/src/wgpuStandardMaterial.test.ts +9 -13
- package/src/wgpuTextInput.test.ts +9 -6
- package/src/wgpuTextLabel.test.ts +145 -88
- package/src/wgpuTilemap.test.ts +11 -11
- package/src/wgpuVelocity.test.ts +86 -86
- package/dist/scene2dWgpuPipeline.d.ts +0 -3
- package/dist/scene2dWgpuPipeline.d.ts.map +0 -1
- package/dist/scene2dWgpuPipeline.js +0 -40
- package/dist/scene2dWgpuPipeline.js.map +0 -1
package/src/wgpuRichText.test.ts
CHANGED
|
@@ -1,114 +1,154 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import {
|
|
2
|
+
createImageResource,
|
|
3
|
+
registerTestImageDimensionResolver,
|
|
4
|
+
unregisterTestImageDimensionResolver,
|
|
5
|
+
} from '@flighthq/image/contract';
|
|
6
|
+
import type { HostImageCapability, ImageResource } from '@flighthq/image/contract';
|
|
7
|
+
import {
|
|
8
|
+
beginWgpuScreenRenderPassForTest,
|
|
9
|
+
getWgpuRenderStateRuntime,
|
|
10
|
+
submitWgpuFrame,
|
|
11
|
+
} from '@flighthq/render-wgpu/contract';
|
|
3
12
|
import { createWgpuRenderStateForTest, installWgpuMock } from '@flighthq/render-wgpu/contract';
|
|
4
13
|
import { getOrCreateRenderProxy2D, prepareScene2DRender } from '@flighthq/render/contract';
|
|
14
|
+
import type { CanvasSurface, HostCanvasCapability } from '@flighthq/surface/contract';
|
|
5
15
|
import { createRichText } from '@flighthq/text/contract';
|
|
6
16
|
import { enableTextInput } from '@flighthq/textinput/contract';
|
|
7
|
-
import type { Raster2DSurface } from '@flighthq/types/contract';
|
|
8
|
-
import { EntityRuntimeKey } from '@flighthq/types/contract';
|
|
9
17
|
|
|
10
|
-
import { getWgpuRendererData } from './wgpuRendererData';
|
|
18
|
+
import { getWgpuRendererData } from './wgpuRendererData.ts';
|
|
11
19
|
import {
|
|
12
20
|
createWgpuRichTextData,
|
|
13
|
-
|
|
21
|
+
wgpuRichTextRenderer,
|
|
14
22
|
destroyWgpuRichTextData,
|
|
15
23
|
drawWgpuRichText,
|
|
16
24
|
drawWgpuRichTextWithOverlay,
|
|
17
25
|
registerWgpuTextInputOverlay,
|
|
18
|
-
} from './wgpuRichText';
|
|
26
|
+
} from './wgpuRichText.ts';
|
|
27
|
+
|
|
28
|
+
// A test that wraps a host handle supplies the host: the resource measures through the registered
|
|
29
|
+
// resolver, and clearing after each test keeps this file from covering for another's missing one.
|
|
30
|
+
beforeEach(() => {
|
|
31
|
+
registerTestImageDimensionResolver();
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
afterEach(() => {
|
|
35
|
+
unregisterTestImageDimensionResolver();
|
|
36
|
+
});
|
|
19
37
|
|
|
20
38
|
beforeAll(() => {
|
|
21
39
|
installWgpuMock();
|
|
22
40
|
});
|
|
23
41
|
|
|
24
|
-
function
|
|
42
|
+
function createTestSurface(width: number, height: number): CanvasSurface {
|
|
25
43
|
const canvas = document.createElement('canvas');
|
|
26
44
|
canvas.width = width;
|
|
27
45
|
canvas.height = height;
|
|
28
46
|
const context = canvas.getContext('2d')!;
|
|
29
47
|
return {
|
|
30
|
-
[EntityRuntimeKey]: undefined,
|
|
31
48
|
get width() {
|
|
32
49
|
return canvas.width;
|
|
33
50
|
},
|
|
34
|
-
set width(value) {
|
|
51
|
+
set width(value: number) {
|
|
35
52
|
canvas.width = value;
|
|
36
53
|
},
|
|
37
54
|
get height() {
|
|
38
55
|
return canvas.height;
|
|
39
56
|
},
|
|
40
|
-
set height(value) {
|
|
57
|
+
set height(value: number) {
|
|
41
58
|
canvas.height = value;
|
|
42
59
|
},
|
|
43
60
|
context,
|
|
44
|
-
|
|
61
|
+
} as unknown as CanvasSurface;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
function createTestCanvasHost(onDestroy: (surface: CanvasSurface) => void = () => {}): HostCanvasCapability {
|
|
65
|
+
return {
|
|
66
|
+
acquire: () => null,
|
|
67
|
+
create: () => null,
|
|
68
|
+
createSurface: createTestSurface,
|
|
69
|
+
destroySurface: onDestroy,
|
|
70
|
+
release() {},
|
|
45
71
|
};
|
|
46
72
|
}
|
|
47
73
|
|
|
48
|
-
function
|
|
74
|
+
function createTestImageHost(): HostImageCapability {
|
|
49
75
|
return {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
return createTestRaster2DSurface(width, height);
|
|
76
|
+
createImageFromSurface(surface) {
|
|
77
|
+
return createImageResource((surface as unknown as { context: CanvasRenderingContext2D }).context.canvas);
|
|
53
78
|
},
|
|
54
|
-
|
|
79
|
+
loadImageFromUrl: () => Promise.reject(new Error('not implemented')),
|
|
55
80
|
};
|
|
56
81
|
}
|
|
57
82
|
|
|
83
|
+
function setTestHosts(
|
|
84
|
+
state: { canvasHost: unknown; imageHost: unknown },
|
|
85
|
+
onDestroy?: (surface: CanvasSurface) => void,
|
|
86
|
+
): void {
|
|
87
|
+
state.canvasHost = createTestCanvasHost(onDestroy);
|
|
88
|
+
state.imageHost = createTestImageHost();
|
|
89
|
+
}
|
|
90
|
+
|
|
58
91
|
describe('createWgpuRichTextData', () => {
|
|
59
92
|
it('starts without a raster surface until the node first draws', () => {
|
|
60
93
|
const data = createWgpuRichTextData({} as never, {} as never);
|
|
61
|
-
expect(getWgpuRendererData<{ surface:
|
|
62
|
-
});
|
|
63
|
-
});
|
|
64
|
-
|
|
65
|
-
describe('defaultWgpuRichTextRenderer', () => {
|
|
66
|
-
it('has createData and draw functions', () => {
|
|
67
|
-
expect(typeof defaultWgpuRichTextRenderer.createData).toBe('function');
|
|
68
|
-
expect(typeof defaultWgpuRichTextRenderer.submit).toBe('function');
|
|
94
|
+
expect(getWgpuRendererData<{ surface: CanvasSurface | null }>(data)?.surface).toBeNull();
|
|
69
95
|
});
|
|
70
96
|
});
|
|
71
97
|
|
|
72
98
|
describe('destroyWgpuRichTextData', () => {
|
|
73
99
|
it('removes the GPU cache entry before returning the node surface to its creator', async () => {
|
|
74
100
|
const order: string[] = [];
|
|
101
|
+
let trackOrder = false;
|
|
102
|
+
let trackedImage: ImageResource | null = null;
|
|
75
103
|
const state = await createWgpuRenderStateForTest();
|
|
76
|
-
|
|
104
|
+
beginWgpuScreenRenderPassForTest(state);
|
|
77
105
|
const cache = getWgpuRenderStateRuntime(state).context.textureSourcePremultipliedTextureCache;
|
|
78
|
-
state
|
|
106
|
+
setTestHosts(state, () => {
|
|
107
|
+
if (!trackOrder) return;
|
|
79
108
|
order.push('surface');
|
|
80
|
-
expect(cache.has(
|
|
109
|
+
if (trackedImage !== null) expect(cache.has(trackedImage)).toBe(false);
|
|
81
110
|
});
|
|
82
|
-
const source =
|
|
111
|
+
const source = ((created) => {
|
|
112
|
+
Object.assign(created.data, { height: 40, text: 'owned', width: 100 });
|
|
113
|
+
return created;
|
|
114
|
+
})(createRichText());
|
|
83
115
|
prepareScene2DRender(state, source);
|
|
84
116
|
const proxy = getOrCreateRenderProxy2D(state, source);
|
|
85
117
|
proxy.rendererData = createWgpuRichTextData(state, source);
|
|
86
118
|
drawWgpuRichText(state, proxy);
|
|
87
|
-
const
|
|
88
|
-
|
|
89
|
-
|
|
119
|
+
const richData = getWgpuRendererData<{ surface: CanvasSurface; image: ImageResource }>(proxy.rendererData)!;
|
|
120
|
+
trackedImage = richData.image;
|
|
121
|
+
const entry = cache.get(richData.image)!;
|
|
122
|
+
submitWgpuFrame(state);
|
|
90
123
|
vi.spyOn(entry.texture, 'destroy').mockImplementation(() => {
|
|
91
124
|
order.push('texture');
|
|
92
125
|
});
|
|
126
|
+
trackOrder = true;
|
|
93
127
|
|
|
94
128
|
destroyWgpuRichTextData(state, proxy.rendererData!);
|
|
95
129
|
|
|
96
|
-
expect(cache.has(
|
|
130
|
+
expect(cache.has(richData.image)).toBe(false);
|
|
97
131
|
expect(order).toEqual(['texture', 'surface']);
|
|
98
132
|
});
|
|
99
133
|
|
|
100
134
|
it('is a no-op when no surface was allocated', () => {
|
|
101
|
-
expect(() => destroyWgpuRichTextData({} as never, { surface: null } as never)).not.toThrow();
|
|
135
|
+
expect(() => destroyWgpuRichTextData({} as never, { image: null, surface: null } as never)).not.toThrow();
|
|
102
136
|
});
|
|
103
137
|
});
|
|
104
138
|
|
|
105
139
|
describe('drawWgpuRichText', () => {
|
|
106
140
|
it('keeps different text nodes on distinct surfaces and GPU textures in one frame', async () => {
|
|
107
141
|
const state = await createWgpuRenderStateForTest();
|
|
108
|
-
state
|
|
109
|
-
|
|
110
|
-
const first =
|
|
111
|
-
|
|
142
|
+
setTestHosts(state);
|
|
143
|
+
beginWgpuScreenRenderPassForTest(state);
|
|
144
|
+
const first = ((created) => {
|
|
145
|
+
Object.assign(created.data, { height: 40, text: 'first', width: 100 });
|
|
146
|
+
return created;
|
|
147
|
+
})(createRichText());
|
|
148
|
+
const second = ((created) => {
|
|
149
|
+
Object.assign(created.data, { height: 40, text: 'second', width: 100 });
|
|
150
|
+
return created;
|
|
151
|
+
})(createRichText());
|
|
112
152
|
prepareScene2DRender(state, first);
|
|
113
153
|
prepareScene2DRender(state, second);
|
|
114
154
|
const firstProxy = getOrCreateRenderProxy2D(state, first);
|
|
@@ -119,33 +159,31 @@ describe('drawWgpuRichText', () => {
|
|
|
119
159
|
drawWgpuRichText(state, firstProxy);
|
|
120
160
|
drawWgpuRichText(state, secondProxy);
|
|
121
161
|
|
|
122
|
-
const firstOwned = getWgpuRendererData<{ surface:
|
|
123
|
-
|
|
162
|
+
const firstOwned = getWgpuRendererData<{ surface: CanvasSurface | null; image: ImageResource | null }>(
|
|
163
|
+
firstProxy.rendererData,
|
|
164
|
+
)!;
|
|
165
|
+
const secondOwned = getWgpuRendererData<{ surface: CanvasSurface | null; image: ImageResource | null }>(
|
|
166
|
+
secondProxy.rendererData,
|
|
167
|
+
)!;
|
|
124
168
|
const cache = getWgpuRenderStateRuntime(state).context.textureSourcePremultipliedTextureCache;
|
|
125
169
|
expect(firstOwned.surface).not.toBeNull();
|
|
126
170
|
expect(secondOwned.surface).not.toBeNull();
|
|
127
|
-
const firstSurface = firstOwned.surface!;
|
|
128
|
-
const firstImage = firstSurface.image;
|
|
129
171
|
expect(firstOwned.surface).not.toBe(secondOwned.surface);
|
|
130
|
-
expect(firstOwned.
|
|
131
|
-
expect(cache.get(firstOwned.
|
|
132
|
-
|
|
133
|
-
drawWgpuRichText(state, firstProxy);
|
|
134
|
-
expect(firstOwned.surface).toBe(firstSurface);
|
|
135
|
-
expect(firstOwned.surface!.image).toBe(firstImage);
|
|
136
|
-
submitWgpuRenderPass(state);
|
|
172
|
+
expect(firstOwned.image).not.toBe(secondOwned.image);
|
|
173
|
+
expect(cache.get(firstOwned.image!)?.texture).not.toBe(cache.get(secondOwned.image!)?.texture);
|
|
174
|
+
submitWgpuFrame(state);
|
|
137
175
|
});
|
|
138
176
|
|
|
139
177
|
it('does not throw for empty rich text', async () => {
|
|
140
178
|
const state = await createWgpuRenderStateForTest();
|
|
141
|
-
|
|
179
|
+
beginWgpuScreenRenderPassForTest(state);
|
|
142
180
|
|
|
143
181
|
const richText = createRichText();
|
|
144
182
|
prepareScene2DRender(state, richText);
|
|
145
183
|
const renderProxy = getOrCreateRenderProxy2D(state, richText);
|
|
146
184
|
|
|
147
185
|
expect(() => drawWgpuRichText(state, renderProxy)).not.toThrow();
|
|
148
|
-
|
|
186
|
+
submitWgpuFrame(state);
|
|
149
187
|
});
|
|
150
188
|
|
|
151
189
|
it('does not throw when renderPass is null', async () => {
|
|
@@ -161,12 +199,12 @@ describe('drawWgpuRichText', () => {
|
|
|
161
199
|
describe('drawWgpuRichTextWithOverlay', () => {
|
|
162
200
|
it('does not throw for empty rich text', async () => {
|
|
163
201
|
const state = await createWgpuRenderStateForTest();
|
|
164
|
-
|
|
202
|
+
beginWgpuScreenRenderPassForTest(state);
|
|
165
203
|
const richText = createRichText();
|
|
166
204
|
prepareScene2DRender(state, richText);
|
|
167
205
|
const renderProxy = getOrCreateRenderProxy2D(state, richText);
|
|
168
206
|
expect(() => drawWgpuRichTextWithOverlay(state, renderProxy)).not.toThrow();
|
|
169
|
-
|
|
207
|
+
submitWgpuFrame(state);
|
|
170
208
|
});
|
|
171
209
|
});
|
|
172
210
|
|
|
@@ -175,23 +213,36 @@ describe('registerWgpuTextInputOverlay', () => {
|
|
|
175
213
|
const overlay = vi.fn();
|
|
176
214
|
registerWgpuTextInputOverlay(overlay);
|
|
177
215
|
const state = await createWgpuRenderStateForTest();
|
|
178
|
-
state
|
|
179
|
-
|
|
216
|
+
setTestHosts(state);
|
|
217
|
+
beginWgpuScreenRenderPassForTest(state);
|
|
180
218
|
|
|
181
|
-
const plain =
|
|
219
|
+
const plain = ((created) => {
|
|
220
|
+
Object.assign(created.data, { height: 40, text: 'x', width: 100 });
|
|
221
|
+
return created;
|
|
222
|
+
})(createRichText());
|
|
182
223
|
prepareScene2DRender(state, plain);
|
|
183
224
|
const plainProxy = getOrCreateRenderProxy2D(state, plain);
|
|
184
225
|
plainProxy.rendererData = createWgpuRichTextData(state, plain);
|
|
185
226
|
drawWgpuRichText(state, plainProxy);
|
|
186
227
|
expect(overlay).not.toHaveBeenCalled();
|
|
187
228
|
|
|
188
|
-
const editable =
|
|
229
|
+
const editable = ((created) => {
|
|
230
|
+
Object.assign(created.data, { height: 40, text: 'x', width: 100 });
|
|
231
|
+
return created;
|
|
232
|
+
})(createRichText());
|
|
189
233
|
enableTextInput(editable);
|
|
190
234
|
prepareScene2DRender(state, editable);
|
|
191
235
|
const editableProxy = getOrCreateRenderProxy2D(state, editable);
|
|
192
236
|
editableProxy.rendererData = createWgpuRichTextData(state, editable);
|
|
193
237
|
drawWgpuRichText(state, editableProxy);
|
|
194
238
|
expect(overlay).toHaveBeenCalled();
|
|
195
|
-
|
|
239
|
+
submitWgpuFrame(state);
|
|
240
|
+
});
|
|
241
|
+
});
|
|
242
|
+
|
|
243
|
+
describe('wgpuRichTextRenderer', () => {
|
|
244
|
+
it('has createData and draw functions', () => {
|
|
245
|
+
expect(typeof wgpuRichTextRenderer.createData).toBe('function');
|
|
246
|
+
expect(typeof wgpuRichTextRenderer.submit).toBe('function');
|
|
196
247
|
});
|
|
197
248
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createRectangle } from '@flighthq/geometry/contract';
|
|
2
2
|
|
|
3
|
-
import { buildWgpuScale9Mapper } from './wgpuScale9Mapper';
|
|
3
|
+
import { buildWgpuScale9Mapper } from './wgpuScale9Mapper.ts';
|
|
4
4
|
|
|
5
5
|
describe('buildWgpuScale9Mapper', () => {
|
|
6
6
|
it('returns null for invalid scale or bounds', () => {
|
|
@@ -1,51 +1,64 @@
|
|
|
1
|
-
import { createImageResource, invalidateImageResource } from '@flighthq/image/contract';
|
|
2
1
|
import {
|
|
2
|
+
createImageResource,
|
|
3
|
+
invalidateImageResource,
|
|
4
|
+
registerTestImageDimensionResolver,
|
|
5
|
+
unregisterTestImageDimensionResolver,
|
|
6
|
+
} from '@flighthq/image/contract';
|
|
7
|
+
import type { HostImageCapability } from '@flighthq/image/contract';
|
|
8
|
+
import {
|
|
9
|
+
beginWgpuScreenRenderPassForTest,
|
|
3
10
|
bindWgpuImageResourceTexture,
|
|
4
11
|
getWgpuRenderStateRuntime,
|
|
5
|
-
|
|
6
|
-
submitWgpuRenderPass,
|
|
12
|
+
submitWgpuFrame,
|
|
7
13
|
} from '@flighthq/render-wgpu/contract';
|
|
8
14
|
import { createWgpuRenderStateForTest, installWgpuMock } from '@flighthq/render-wgpu/contract';
|
|
9
15
|
import { getOrCreateRenderProxy2D, prepareScene2DRender } from '@flighthq/render/contract';
|
|
10
16
|
import { appendShapeBeginFill, appendShapeRectangle, createScale9Shape } from '@flighthq/shape/contract';
|
|
11
|
-
import type {
|
|
12
|
-
import { EntityRuntimeKey } from '@flighthq/types/contract';
|
|
17
|
+
import type { CanvasSurface, HostCanvasCapability } from '@flighthq/surface/contract';
|
|
13
18
|
|
|
14
19
|
import {
|
|
15
20
|
acquireWgpuScale9ShapeRasterSurface,
|
|
16
21
|
createWgpuScale9ShapeData,
|
|
17
|
-
|
|
22
|
+
wgpuScale9ShapeRenderer,
|
|
18
23
|
destroyWgpuScale9ShapeData,
|
|
19
24
|
drawWgpuScale9Shape,
|
|
20
25
|
drawWgpuScale9ShapeMask,
|
|
21
26
|
getWgpuScale9ShapeData,
|
|
22
|
-
} from './wgpuScale9Shape';
|
|
27
|
+
} from './wgpuScale9Shape.ts';
|
|
28
|
+
|
|
29
|
+
// A test that wraps a host handle supplies the host: the resource measures through the registered
|
|
30
|
+
// resolver, and clearing after each test keeps this file from covering for another's missing one.
|
|
31
|
+
beforeEach(() => {
|
|
32
|
+
registerTestImageDimensionResolver();
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
afterEach(() => {
|
|
36
|
+
unregisterTestImageDimensionResolver();
|
|
37
|
+
});
|
|
23
38
|
|
|
24
39
|
const grid = { height: 80, width: 80, x: 10, y: 10 };
|
|
25
40
|
const destroySurface = vi.fn();
|
|
26
41
|
|
|
27
|
-
function createTestSurface(width
|
|
42
|
+
function createTestSurface(width: number, height: number): CanvasSurface {
|
|
28
43
|
const canvas = document.createElement('canvas');
|
|
29
44
|
canvas.width = width;
|
|
30
45
|
canvas.height = height;
|
|
31
46
|
const context = canvas.getContext('2d')!;
|
|
32
47
|
return {
|
|
33
|
-
[EntityRuntimeKey]: undefined,
|
|
34
48
|
get width() {
|
|
35
49
|
return canvas.width;
|
|
36
50
|
},
|
|
37
|
-
set width(value) {
|
|
51
|
+
set width(value: number) {
|
|
38
52
|
canvas.width = value;
|
|
39
53
|
},
|
|
40
54
|
get height() {
|
|
41
55
|
return canvas.height;
|
|
42
56
|
},
|
|
43
|
-
set height(value) {
|
|
57
|
+
set height(value: number) {
|
|
44
58
|
canvas.height = value;
|
|
45
59
|
},
|
|
46
60
|
context,
|
|
47
|
-
|
|
48
|
-
};
|
|
61
|
+
} as unknown as CanvasSurface;
|
|
49
62
|
}
|
|
50
63
|
|
|
51
64
|
beforeAll(() => {
|
|
@@ -56,52 +69,75 @@ beforeEach(() => {
|
|
|
56
69
|
destroySurface.mockReset();
|
|
57
70
|
});
|
|
58
71
|
|
|
59
|
-
function
|
|
72
|
+
function createTestCanvasHost(): HostCanvasCapability {
|
|
73
|
+
return {
|
|
74
|
+
acquire: () => null,
|
|
75
|
+
create: () => null,
|
|
76
|
+
createSurface: createTestSurface,
|
|
77
|
+
destroySurface,
|
|
78
|
+
release() {},
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
function createTestImageHost(): HostImageCapability {
|
|
60
83
|
return {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
84
|
+
createImageFromSurface(surface) {
|
|
85
|
+
return createImageResource((surface as unknown as { context: CanvasRenderingContext2D }).context.canvas);
|
|
86
|
+
},
|
|
87
|
+
loadImageFromUrl: () => Promise.reject(new Error('not implemented')),
|
|
64
88
|
};
|
|
65
89
|
}
|
|
66
90
|
|
|
91
|
+
function setTestHosts(state: { canvasHost: unknown; imageHost: unknown }): void {
|
|
92
|
+
state.canvasHost = createTestCanvasHost();
|
|
93
|
+
state.imageHost = createTestImageHost();
|
|
94
|
+
}
|
|
95
|
+
|
|
67
96
|
describe('acquireWgpuScale9ShapeRasterSurface', () => {
|
|
68
97
|
it('does not cache provider absence and retries on the next draw', () => {
|
|
69
|
-
const surface = createTestSurface();
|
|
70
|
-
const
|
|
71
|
-
const
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
98
|
+
const surface = createTestSurface(1, 1);
|
|
99
|
+
const createSurfaceMock = vi.fn().mockReturnValueOnce(null).mockReturnValue(surface);
|
|
100
|
+
const canvasHost: HostCanvasCapability = {
|
|
101
|
+
acquire: () => null,
|
|
102
|
+
create: () => null,
|
|
103
|
+
createSurface: createSurfaceMock,
|
|
104
|
+
destroySurface,
|
|
105
|
+
release() {},
|
|
75
106
|
};
|
|
76
|
-
const
|
|
107
|
+
const imageHost = createTestImageHost();
|
|
108
|
+
const state = { canvasHost, imageHost } as never;
|
|
77
109
|
const data = getWgpuScale9ShapeData(createWgpuScale9ShapeData(state, createScale9Shape(grid)))!;
|
|
78
110
|
|
|
79
|
-
expect(acquireWgpuScale9ShapeRasterSurface(
|
|
111
|
+
expect(acquireWgpuScale9ShapeRasterSurface(canvasHost, imageHost, data)).toBeNull();
|
|
80
112
|
expect(data.surface).toBeNull();
|
|
81
|
-
expect(acquireWgpuScale9ShapeRasterSurface(
|
|
82
|
-
expect(acquireWgpuScale9ShapeRasterSurface(
|
|
83
|
-
expect(
|
|
113
|
+
expect(acquireWgpuScale9ShapeRasterSurface(canvasHost, imageHost, data)).toBe(surface);
|
|
114
|
+
expect(acquireWgpuScale9ShapeRasterSurface(canvasHost, imageHost, data)).toBe(surface);
|
|
115
|
+
expect(createSurfaceMock).toHaveBeenCalledTimes(2);
|
|
84
116
|
});
|
|
85
117
|
|
|
86
118
|
it('presents different textures for two nodes with different content in the same frame', async () => {
|
|
87
119
|
const state = await createWgpuRenderStateForTest();
|
|
88
|
-
state
|
|
120
|
+
setTestHosts(state);
|
|
121
|
+
const canvasHost = createTestCanvasHost();
|
|
122
|
+
const imageHost = createTestImageHost();
|
|
89
123
|
const firstData = getWgpuScale9ShapeData(createWgpuScale9ShapeData(state, createScale9Shape(grid)))!;
|
|
90
124
|
const secondData = getWgpuScale9ShapeData(createWgpuScale9ShapeData(state, createScale9Shape(grid)))!;
|
|
91
|
-
|
|
92
|
-
|
|
125
|
+
acquireWgpuScale9ShapeRasterSurface(canvasHost, imageHost, firstData);
|
|
126
|
+
acquireWgpuScale9ShapeRasterSurface(canvasHost, imageHost, secondData);
|
|
127
|
+
const first = firstData.surface!;
|
|
128
|
+
const second = secondData.surface!;
|
|
93
129
|
first.context.fillStyle = '#f00';
|
|
94
130
|
first.context.fillRect(0, 0, 1, 1);
|
|
95
131
|
second.context.fillStyle = '#00f';
|
|
96
132
|
second.context.fillRect(0, 0, 1, 1);
|
|
97
|
-
invalidateImageResource(
|
|
98
|
-
invalidateImageResource(
|
|
133
|
+
invalidateImageResource(firstData.image!);
|
|
134
|
+
invalidateImageResource(secondData.image!);
|
|
99
135
|
|
|
100
|
-
const firstEntry = bindWgpuImageResourceTexture(state,
|
|
101
|
-
const secondEntry = bindWgpuImageResourceTexture(state,
|
|
136
|
+
const firstEntry = bindWgpuImageResourceTexture(state, firstData.image!, false, true)!;
|
|
137
|
+
const secondEntry = bindWgpuImageResourceTexture(state, secondData.image!, false, true)!;
|
|
102
138
|
|
|
103
139
|
expect(first).not.toBe(second);
|
|
104
|
-
expect(
|
|
140
|
+
expect(firstData.image).not.toBe(secondData.image);
|
|
105
141
|
expect(firstEntry.texture).not.toBe(secondEntry.texture);
|
|
106
142
|
});
|
|
107
143
|
});
|
|
@@ -113,26 +149,21 @@ describe('createWgpuScale9ShapeData', () => {
|
|
|
113
149
|
});
|
|
114
150
|
});
|
|
115
151
|
|
|
116
|
-
describe('defaultWgpuScale9ShapeRenderer', () => {
|
|
117
|
-
it('wires createData, destroyData, and submit', () => {
|
|
118
|
-
expect(defaultWgpuScale9ShapeRenderer.createData).toBe(createWgpuScale9ShapeData);
|
|
119
|
-
expect(defaultWgpuScale9ShapeRenderer.destroyData).toBe(destroyWgpuScale9ShapeData);
|
|
120
|
-
expect(defaultWgpuScale9ShapeRenderer.submit).toBe(drawWgpuScale9Shape);
|
|
121
|
-
});
|
|
122
|
-
});
|
|
123
|
-
|
|
124
152
|
describe('destroyWgpuScale9ShapeData', () => {
|
|
125
153
|
it('removes its cached texture before destroying its per-node surface, idempotently', async () => {
|
|
126
154
|
const state = await createWgpuRenderStateForTest();
|
|
127
|
-
state
|
|
155
|
+
setTestHosts(state);
|
|
128
156
|
const data = createWgpuScale9ShapeData(state, createScale9Shape(grid));
|
|
129
|
-
const
|
|
157
|
+
const shapeData = getWgpuScale9ShapeData(data)!;
|
|
158
|
+
acquireWgpuScale9ShapeRasterSurface(state.canvasHost!, state.imageHost!, shapeData);
|
|
159
|
+
const surface = shapeData.surface!;
|
|
160
|
+
const image = shapeData.image!;
|
|
130
161
|
const cache = getWgpuRenderStateRuntime(state).context.textureSourcePremultipliedTextureCache;
|
|
131
162
|
const order: string[] = [];
|
|
132
163
|
const destroy = vi.fn(() => order.push('texture'));
|
|
133
|
-
cache.set(
|
|
134
|
-
destroySurface.mockImplementation((
|
|
135
|
-
expect(cache.has(
|
|
164
|
+
cache.set(image, { texture: { destroy } } as never);
|
|
165
|
+
destroySurface.mockImplementation(() => {
|
|
166
|
+
expect(cache.has(image)).toBe(false);
|
|
136
167
|
order.push('surface');
|
|
137
168
|
});
|
|
138
169
|
|
|
@@ -140,7 +171,7 @@ describe('destroyWgpuScale9ShapeData', () => {
|
|
|
140
171
|
destroyWgpuScale9ShapeData(state, data);
|
|
141
172
|
|
|
142
173
|
expect(destroy).toHaveBeenCalledOnce();
|
|
143
|
-
expect(cache.has(
|
|
174
|
+
expect(cache.has(image)).toBe(false);
|
|
144
175
|
expect(destroySurface).toHaveBeenCalledOnce();
|
|
145
176
|
expect(destroySurface).toHaveBeenCalledWith(surface);
|
|
146
177
|
expect(order).toEqual(['texture', 'surface']);
|
|
@@ -148,9 +179,11 @@ describe('destroyWgpuScale9ShapeData', () => {
|
|
|
148
179
|
|
|
149
180
|
it('destroys its raster surface even when it never acquired a GPU cache entry', async () => {
|
|
150
181
|
const state = await createWgpuRenderStateForTest();
|
|
151
|
-
state
|
|
182
|
+
setTestHosts(state);
|
|
152
183
|
const data = createWgpuScale9ShapeData(state, createScale9Shape(grid));
|
|
153
|
-
const
|
|
184
|
+
const shapeData = getWgpuScale9ShapeData(data)!;
|
|
185
|
+
acquireWgpuScale9ShapeRasterSurface(state.canvasHost!, state.imageHost!, shapeData);
|
|
186
|
+
const surface = shapeData.surface!;
|
|
154
187
|
|
|
155
188
|
destroyWgpuScale9ShapeData(state, data);
|
|
156
189
|
|
|
@@ -159,7 +192,7 @@ describe('destroyWgpuScale9ShapeData', () => {
|
|
|
159
192
|
|
|
160
193
|
it('is a no-op when its lazy surface was never allocated', async () => {
|
|
161
194
|
const state = await createWgpuRenderStateForTest();
|
|
162
|
-
state
|
|
195
|
+
setTestHosts(state);
|
|
163
196
|
const data = createWgpuScale9ShapeData(state, createScale9Shape(grid));
|
|
164
197
|
|
|
165
198
|
expect(() => destroyWgpuScale9ShapeData(state, data)).not.toThrow();
|
|
@@ -170,20 +203,20 @@ describe('destroyWgpuScale9ShapeData', () => {
|
|
|
170
203
|
describe('drawWgpuScale9Shape', () => {
|
|
171
204
|
it('returns early when commands are empty', async () => {
|
|
172
205
|
const state = await createWgpuRenderStateForTest();
|
|
173
|
-
state
|
|
174
|
-
|
|
206
|
+
setTestHosts(state);
|
|
207
|
+
beginWgpuScreenRenderPassForTest(state);
|
|
175
208
|
const shape = createScale9Shape(grid);
|
|
176
209
|
prepareScene2DRender(state, shape);
|
|
177
210
|
const renderProxy = getOrCreateRenderProxy2D(state, shape);
|
|
178
211
|
|
|
179
212
|
expect(() => drawWgpuScale9Shape(state, renderProxy)).not.toThrow();
|
|
180
|
-
|
|
213
|
+
submitWgpuFrame(state);
|
|
181
214
|
});
|
|
182
215
|
|
|
183
216
|
it('rasterizes and draws a filled shape without throwing', async () => {
|
|
184
217
|
const state = await createWgpuRenderStateForTest();
|
|
185
|
-
state
|
|
186
|
-
|
|
218
|
+
setTestHosts(state);
|
|
219
|
+
beginWgpuScreenRenderPassForTest(state);
|
|
187
220
|
const shape = createScale9Shape(grid);
|
|
188
221
|
appendShapeBeginFill(shape, 0xff0000ff);
|
|
189
222
|
appendShapeRectangle(shape, 0, 0, 100, 100);
|
|
@@ -191,21 +224,21 @@ describe('drawWgpuScale9Shape', () => {
|
|
|
191
224
|
const renderProxy = getOrCreateRenderProxy2D(state, shape);
|
|
192
225
|
|
|
193
226
|
expect(() => drawWgpuScale9Shape(state, renderProxy)).not.toThrow();
|
|
194
|
-
|
|
227
|
+
submitWgpuFrame(state);
|
|
195
228
|
});
|
|
196
229
|
});
|
|
197
230
|
|
|
198
231
|
describe('drawWgpuScale9ShapeMask', () => {
|
|
199
232
|
it('delegates to the Scale9 draw path', async () => {
|
|
200
233
|
const state = await createWgpuRenderStateForTest();
|
|
201
|
-
state
|
|
202
|
-
|
|
234
|
+
setTestHosts(state);
|
|
235
|
+
beginWgpuScreenRenderPassForTest(state);
|
|
203
236
|
const shape = createScale9Shape(grid);
|
|
204
237
|
prepareScene2DRender(state, shape);
|
|
205
238
|
const renderProxy = getOrCreateRenderProxy2D(state, shape);
|
|
206
239
|
|
|
207
240
|
expect(() => drawWgpuScale9ShapeMask(state, renderProxy)).not.toThrow();
|
|
208
|
-
|
|
241
|
+
submitWgpuFrame(state);
|
|
209
242
|
});
|
|
210
243
|
});
|
|
211
244
|
|
|
@@ -216,3 +249,11 @@ describe('getWgpuScale9ShapeData', () => {
|
|
|
216
249
|
expect(getWgpuScale9ShapeData(rendererData)?.surface).toBeNull();
|
|
217
250
|
});
|
|
218
251
|
});
|
|
252
|
+
|
|
253
|
+
describe('wgpuScale9ShapeRenderer', () => {
|
|
254
|
+
it('wires createData, destroyData, and submit', () => {
|
|
255
|
+
expect(wgpuScale9ShapeRenderer.createData).toBe(createWgpuScale9ShapeData);
|
|
256
|
+
expect(wgpuScale9ShapeRenderer.destroyData).toBe(destroyWgpuScale9ShapeData);
|
|
257
|
+
expect(wgpuScale9ShapeRenderer.submit).toBe(drawWgpuScale9Shape);
|
|
258
|
+
});
|
|
259
|
+
});
|