@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/dist/wgpuScale9Shape.js
CHANGED
|
@@ -2,26 +2,29 @@ import { invalidateImageResource } from '@flighthq/image/contract';
|
|
|
2
2
|
import { getNodeLocalBoundsRectangle, getNodeLocalContentRevision } from '@flighthq/node/contract';
|
|
3
3
|
import { bindWgpuImageResourceTexture, drawWgpuQuadWithTransform } from '@flighthq/render-wgpu/contract';
|
|
4
4
|
import { getWgpuRenderStateRuntime } from '@flighthq/render-wgpu/contract';
|
|
5
|
-
import {
|
|
5
|
+
import { createCanvasHostSurface, destroyCanvasHostSurface } from '@flighthq/render/contract';
|
|
6
|
+
import { RenderRegistryTable } from '@flighthq/render/contract';
|
|
6
7
|
import { mapScale9ShapeCommands } from '@flighthq/shape/contract';
|
|
7
|
-
import {
|
|
8
|
-
import { flushWgpuQuadBatchWriter } from './wgpuQuadBatchWriter';
|
|
9
|
-
import { createWgpuRendererData, getWgpuRendererData } from './wgpuRendererData';
|
|
10
|
-
import { buildWgpuScale9Mapper } from './wgpuScale9Mapper';
|
|
11
|
-
import { drawWgpuShape } from './wgpuShape';
|
|
12
|
-
import { getWgpuShapeRasterizer } from './wgpuShapeRasterizer';
|
|
13
|
-
export function acquireWgpuScale9ShapeRasterSurface(
|
|
8
|
+
import { Scale9ShapeKind } from '@flighthq/shape/contract';
|
|
9
|
+
import { flushWgpuQuadBatchWriter } from './wgpuQuadBatchWriter.js';
|
|
10
|
+
import { createWgpuRendererData, getWgpuRendererData } from './wgpuRendererData.js';
|
|
11
|
+
import { buildWgpuScale9Mapper } from './wgpuScale9Mapper.js';
|
|
12
|
+
import { drawWgpuShape } from './wgpuShape.js';
|
|
13
|
+
import { getWgpuShapeRasterizer } from './wgpuShapeRasterizer.js';
|
|
14
|
+
export function acquireWgpuScale9ShapeRasterSurface(canvasHost, imageHost, data) {
|
|
14
15
|
const existing = data.surface;
|
|
15
16
|
if (existing !== null)
|
|
16
17
|
return existing;
|
|
17
|
-
const surface =
|
|
18
|
+
const surface = createCanvasHostSurface(canvasHost, 1, 1);
|
|
18
19
|
if (surface === null)
|
|
19
20
|
return null;
|
|
20
21
|
data.surface = surface;
|
|
22
|
+
data.image = imageHost.createImageFromSurface?.(surface) ?? null;
|
|
21
23
|
return surface;
|
|
22
24
|
}
|
|
23
25
|
export function createWgpuScale9ShapeData(_state, _source) {
|
|
24
26
|
return createWgpuRendererData({
|
|
27
|
+
image: null,
|
|
25
28
|
lastH: 0,
|
|
26
29
|
lastScaleX: -1,
|
|
27
30
|
lastScaleY: -1,
|
|
@@ -31,19 +34,21 @@ export function createWgpuScale9ShapeData(_state, _source) {
|
|
|
31
34
|
surface: null,
|
|
32
35
|
});
|
|
33
36
|
}
|
|
34
|
-
// Remove the Image-keyed GPU entry before returning this per-node surface to the provider that created it.
|
|
35
37
|
export function destroyWgpuScale9ShapeData(state, data) {
|
|
36
38
|
const shapeData = getWgpuScale9ShapeData(data);
|
|
37
|
-
if (shapeData === null
|
|
39
|
+
if (shapeData === null)
|
|
38
40
|
return;
|
|
39
|
-
const { surface } = shapeData;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
entry
|
|
44
|
-
|
|
41
|
+
const { image, surface } = shapeData;
|
|
42
|
+
if (image !== null) {
|
|
43
|
+
const cache = getWgpuRenderStateRuntime(state).context.textureSourcePremultipliedTextureCache;
|
|
44
|
+
const entry = cache.get(image);
|
|
45
|
+
if (entry !== undefined) {
|
|
46
|
+
entry.texture.destroy();
|
|
47
|
+
cache.delete(image);
|
|
48
|
+
}
|
|
45
49
|
}
|
|
46
|
-
|
|
50
|
+
if (surface !== null)
|
|
51
|
+
destroyCanvasHostSurface(surface);
|
|
47
52
|
}
|
|
48
53
|
export function drawWgpuScale9Shape(state, renderProxy) {
|
|
49
54
|
const runtime = getWgpuRenderStateRuntime(state);
|
|
@@ -61,7 +66,7 @@ export function drawWgpuScale9Shape(state, renderProxy) {
|
|
|
61
66
|
// rather than quietly dropping the fill.
|
|
62
67
|
const rasterizer = getWgpuShapeRasterizer(state);
|
|
63
68
|
if (rasterizer === null) {
|
|
64
|
-
getWgpuRenderStateRuntime(state).registryMiss?.(
|
|
69
|
+
getWgpuRenderStateRuntime(state).registryMiss?.(RenderRegistryTable.ShapeRasterizer, Scale9ShapeKind);
|
|
65
70
|
return;
|
|
66
71
|
}
|
|
67
72
|
const bounds = getNodeLocalBoundsRectangle(source);
|
|
@@ -78,9 +83,9 @@ export function drawWgpuScale9Shape(state, renderProxy) {
|
|
|
78
83
|
const h = Math.ceil(bounds.height * source.scaleY);
|
|
79
84
|
if (w <= 0 || h <= 0)
|
|
80
85
|
return;
|
|
81
|
-
if (state.
|
|
86
|
+
if (state.canvasHost === null || state.imageHost === null)
|
|
82
87
|
return;
|
|
83
|
-
|
|
88
|
+
let surface = acquireWgpuScale9ShapeRasterSurface(state.canvasHost, state.imageHost, shapeData);
|
|
84
89
|
if (surface === null)
|
|
85
90
|
return;
|
|
86
91
|
if (version !== shapeData.lastContentId ||
|
|
@@ -91,17 +96,36 @@ export function drawWgpuScale9Shape(state, renderProxy) {
|
|
|
91
96
|
pixelRatio !== shapeData.lastPixelRatio) {
|
|
92
97
|
const pw = Math.ceil(w * pixelRatio);
|
|
93
98
|
const ph = Math.ceil(h * pixelRatio);
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
if (
|
|
97
|
-
|
|
99
|
+
const oldPw = shapeData.lastW > 0 ? Math.ceil(shapeData.lastW * shapeData.lastPixelRatio) : 0;
|
|
100
|
+
const oldPh = shapeData.lastH > 0 ? Math.ceil(shapeData.lastH * shapeData.lastPixelRatio) : 0;
|
|
101
|
+
if (pw !== oldPw || ph !== oldPh) {
|
|
102
|
+
if (shapeData.image !== null) {
|
|
103
|
+
const cache = runtime.context.textureSourcePremultipliedTextureCache;
|
|
104
|
+
const entry = cache.get(shapeData.image);
|
|
105
|
+
if (entry !== undefined) {
|
|
106
|
+
entry.texture.destroy();
|
|
107
|
+
cache.delete(shapeData.image);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
destroyCanvasHostSurface(surface);
|
|
111
|
+
const newSurface = createCanvasHostSurface(state.canvasHost, pw, ph);
|
|
112
|
+
if (newSurface === null) {
|
|
113
|
+
shapeData.surface = null;
|
|
114
|
+
shapeData.image = null;
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
shapeData.surface = newSurface;
|
|
118
|
+
shapeData.image = state.imageHost.createImageFromSurface?.(newSurface) ?? null;
|
|
119
|
+
surface = newSurface;
|
|
120
|
+
}
|
|
98
121
|
const { context } = surface;
|
|
99
122
|
context.setTransform(pixelRatio, 0, 0, pixelRatio, -bounds.x * pixelRatio, -bounds.y * pixelRatio);
|
|
100
123
|
context.clearRect(bounds.x, bounds.y, w, h);
|
|
101
124
|
mapScale9ShapeCommands(_remappedCommands, commands, mapper);
|
|
102
125
|
rasterizer(context, _remappedCommands, state);
|
|
103
126
|
context.setTransform(1, 0, 0, 1, 0, 0);
|
|
104
|
-
|
|
127
|
+
if (shapeData.image !== null)
|
|
128
|
+
invalidateImageResource(shapeData.image);
|
|
105
129
|
shapeData.lastH = h;
|
|
106
130
|
shapeData.lastScaleX = source.scaleX;
|
|
107
131
|
shapeData.lastScaleY = source.scaleY;
|
|
@@ -109,7 +133,9 @@ export function drawWgpuScale9Shape(state, renderProxy) {
|
|
|
109
133
|
shapeData.lastPixelRatio = pixelRatio;
|
|
110
134
|
shapeData.lastW = w;
|
|
111
135
|
}
|
|
112
|
-
|
|
136
|
+
if (shapeData.image === null)
|
|
137
|
+
return;
|
|
138
|
+
const entry = bindWgpuImageResourceTexture(state, shapeData.image, false, true);
|
|
113
139
|
if (entry === null)
|
|
114
140
|
return;
|
|
115
141
|
// Strip the node scale from the transform: the texture is already rasterized at the scaled size, so
|
|
@@ -124,7 +150,7 @@ export function drawWgpuScale9Shape(state, renderProxy) {
|
|
|
124
150
|
export function drawWgpuScale9ShapeMask(state, data) {
|
|
125
151
|
drawWgpuScale9Shape(state, data);
|
|
126
152
|
}
|
|
127
|
-
export const
|
|
153
|
+
export const wgpuScale9ShapeRenderer = {
|
|
128
154
|
createData: createWgpuScale9ShapeData,
|
|
129
155
|
destroyData: destroyWgpuScale9ShapeData,
|
|
130
156
|
submit: drawWgpuScale9Shape,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuScale9Shape.js","sourceRoot":"","sources":["../src/wgpuScale9Shape.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"wgpuScale9Shape.js","sourceRoot":"","sources":["../src/wgpuScale9Shape.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { WgpuRenderState } from '@flighthq/render-wgpu/contract';
|
|
2
|
+
import type { RenderProxy2D, Scene2DRenderer } from '@flighthq/render/contract';
|
|
2
3
|
export declare function drawWgpuScale9Sprite(state: WgpuRenderState, renderProxy: RenderProxy2D): void;
|
|
3
|
-
export declare const
|
|
4
|
+
export declare const wgpuScale9SpriteRenderer: Scene2DRenderer;
|
|
4
5
|
//# sourceMappingURL=wgpuScale9Sprite.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuScale9Sprite.d.ts","sourceRoot":"","sources":["../src/wgpuScale9Sprite.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuScale9Sprite.d.ts","sourceRoot":"","sources":["../src/wgpuScale9Sprite.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAgBhF,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CAyF7F;AAED,eAAO,MAAM,wBAAwB,EAAE,eAKtC,CAAC"}
|
package/dist/wgpuScale9Sprite.js
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { createMatrix3 } from '@flighthq/geometry/contract';
|
|
2
|
-
import { getWgpuRenderStateRuntime,
|
|
3
|
-
import { SCENE2D_WORKING_COLOR_SPACE } from '@flighthq/render/contract';
|
|
2
|
+
import { getWgpuRenderStateRuntime, resolveWgpuQuadMaterialRenderer, resolveWgpuTexture, } from '@flighthq/render-wgpu/contract';
|
|
3
|
+
import { SCENE2D_WORKING_COLOR_SPACE, BatchFormat } from '@flighthq/render/contract';
|
|
4
4
|
import { createSpriteRendererData, isSpriteRendererDirty } from '@flighthq/scene2d/contract';
|
|
5
5
|
import { getTextureUvMatrix, getTextureViewSize, hasTextureSource } from '@flighthq/texture/contract';
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import { buildWgpuScale9Mapper } from './wgpuScale9Mapper';
|
|
6
|
+
import { packWgpuQuadBatchMaterialInstance, prepareWgpuQuadBatchWrite, QUAD_BATCH_INSTANCE_FLOATS, recordWgpuQuadBatchColorScaleBias, writeWgpuQuadBatchAffineInstance, } from './wgpuQuadBatchWriter.js';
|
|
7
|
+
import { buildWgpuScale9Mapper } from './wgpuScale9Mapper.js';
|
|
9
8
|
const SLICE_COUNT = 9;
|
|
10
9
|
export function drawWgpuScale9Sprite(state, renderProxy) {
|
|
11
10
|
const runtime = getWgpuRenderStateRuntime(state);
|
|
@@ -24,7 +23,7 @@ export function drawWgpuScale9Sprite(state, renderProxy) {
|
|
|
24
23
|
if (mapper === null)
|
|
25
24
|
return;
|
|
26
25
|
const material = renderProxy.material;
|
|
27
|
-
const materialRenderer =
|
|
26
|
+
const materialRenderer = resolveWgpuQuadMaterialRenderer(state, material);
|
|
28
27
|
if (materialRenderer === null)
|
|
29
28
|
return;
|
|
30
29
|
const textureEntry = resolveWgpuTexture(state, texture, true, SCENE2D_WORKING_COLOR_SPACE);
|
|
@@ -47,7 +46,7 @@ export function drawWgpuScale9Sprite(state, renderProxy) {
|
|
|
47
46
|
const c = transform.c / scaleY;
|
|
48
47
|
const d = transform.d / scaleY;
|
|
49
48
|
const colorScaleBias = renderProxy.colorMatrix ?? renderProxy.colorScaleBias;
|
|
50
|
-
let writeBase = base;
|
|
49
|
+
let writeBase = base * QUAD_BATCH_INSTANCE_FLOATS;
|
|
51
50
|
let instance = 0;
|
|
52
51
|
for (let row = 0; row < 3; row++) {
|
|
53
52
|
const y = targetYs[row];
|
|
@@ -74,10 +73,10 @@ export function drawWgpuScale9Sprite(state, renderProxy) {
|
|
|
74
73
|
}
|
|
75
74
|
runtime.quadBatchWriterCount += SLICE_COUNT;
|
|
76
75
|
}
|
|
77
|
-
export const
|
|
78
|
-
createData: createSpriteRendererData,
|
|
76
|
+
export const wgpuScale9SpriteRenderer = {
|
|
77
|
+
createData: (_state, source) => createSpriteRendererData(source),
|
|
79
78
|
format: BatchFormat.Quad,
|
|
80
|
-
isDirty: isSpriteRendererDirty,
|
|
79
|
+
isDirty: (_state, source, rendererData) => isSpriteRendererDirty(source, rendererData),
|
|
81
80
|
submit: drawWgpuScale9Sprite,
|
|
82
81
|
};
|
|
83
82
|
const scale9UvMatrix = createMatrix3();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuScale9Sprite.js","sourceRoot":"","sources":["../src/wgpuScale9Sprite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,yBAAyB,EACzB,
|
|
1
|
+
{"version":3,"file":"wgpuScale9Sprite.js","sourceRoot":"","sources":["../src/wgpuScale9Sprite.ts"],"names":[],"mappings":"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"}
|
package/dist/wgpuShape.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { WgpuRenderState } from '@flighthq/render-wgpu/contract';
|
|
2
|
+
import type { RenderProxy2D, Scene2DRenderer } from '@flighthq/render/contract';
|
|
2
3
|
export declare function drawWgpuShape(state: WgpuRenderState, renderProxy: RenderProxy2D): void;
|
|
3
|
-
export declare const
|
|
4
|
-
export declare const
|
|
4
|
+
export declare const wgpuShapeRenderer: Scene2DRenderer;
|
|
5
|
+
export declare const wgpuMorphShapeRenderer: Scene2DRenderer;
|
|
5
6
|
//# sourceMappingURL=wgpuShape.d.ts.map
|
package/dist/wgpuShape.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuShape.d.ts","sourceRoot":"","sources":["../src/wgpuShape.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"wgpuShape.d.ts","sourceRoot":"","sources":["../src/wgpuShape.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAUhF,wBAAgB,aAAa,CAAC,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CAGtF;AAUD,eAAO,MAAM,iBAAiB,EAAE,eAK/B,CAAC;AAGF,eAAO,MAAM,sBAAsB,EAAE,eAAmC,CAAC"}
|
package/dist/wgpuShape.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { BatchFormat } from '@flighthq/
|
|
2
|
-
import { drawWgpuMeshShape } from './wgpuMeshShapeRenderer';
|
|
3
|
-
import { drawWgpuRasterShape } from './wgpuRasterShapeRenderer';
|
|
4
|
-
import { createWgpuShapeData, destroyWgpuShapeData } from './wgpuShapeData';
|
|
1
|
+
import { BatchFormat } from '@flighthq/render/contract';
|
|
2
|
+
import { drawWgpuMeshShape } from './wgpuMeshShapeRenderer.js';
|
|
3
|
+
import { drawWgpuRasterShape } from './wgpuRasterShapeRenderer.js';
|
|
4
|
+
import { createWgpuShapeData, destroyWgpuShapeData } from './wgpuShapeData.js';
|
|
5
5
|
// Tessellates what it can and rasterizes the rest: the GPU mesh path is tried first, and a shape with a
|
|
6
6
|
// fill that has no tessellated form — a gradient, a texture fill, a closed stroke — falls through to the
|
|
7
7
|
// canvas replay. Both halves cache into the same per-node renderer data, so a shape that changes between
|
|
@@ -17,14 +17,14 @@ export function drawWgpuShape(state, renderProxy) {
|
|
|
17
17
|
// content: a scene of solid fills never rasterizes, while one gradient fill makes the full canvas
|
|
18
18
|
// command vocabulary a requirement.
|
|
19
19
|
//
|
|
20
|
-
// Register
|
|
20
|
+
// Register wgpuMeshShapeRenderer or wgpuRasterShapeRenderer instead to pin the strategy —
|
|
21
21
|
// each pays for only its own path and has a wiring requirement that does not depend on the scene.
|
|
22
|
-
export const
|
|
22
|
+
export const wgpuShapeRenderer = {
|
|
23
23
|
format: BatchFormat.Quad,
|
|
24
24
|
createData: createWgpuShapeData,
|
|
25
25
|
destroyData: destroyWgpuShapeData,
|
|
26
26
|
submit: drawWgpuShape,
|
|
27
27
|
};
|
|
28
28
|
// MorphShape owns a distinct kind while sharing Shape's mesh/raster renderer and cache lifecycle.
|
|
29
|
-
export const
|
|
29
|
+
export const wgpuMorphShapeRenderer = wgpuShapeRenderer;
|
|
30
30
|
//# sourceMappingURL=wgpuShape.js.map
|
package/dist/wgpuShape.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuShape.js","sourceRoot":"","sources":["../src/wgpuShape.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"wgpuShape.js","sourceRoot":"","sources":["../src/wgpuShape.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE/E,wGAAwG;AACxG,yGAAyG;AACzG,yGAAyG;AACzG,2BAA2B;AAC3B,MAAM,UAAU,aAAa,CAAC,KAAsB,EAAE,WAA0B;IAC9E,IAAI,iBAAiB,CAAC,KAAK,EAAE,WAAW,CAAC;QAAE,OAAO;IAClD,mBAAmB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;AAC1C,CAAC;AAED,oGAAoG;AACpG,uGAAuG;AACvG,iGAAiG;AACjG,kGAAkG;AAClG,oCAAoC;AACpC,EAAE;AACF,0FAA0F;AAC1F,kGAAkG;AAClG,MAAM,CAAC,MAAM,iBAAiB,GAAoB;IAChD,MAAM,EAAE,WAAW,CAAC,IAAI;IACxB,UAAU,EAAE,mBAAmB;IAC/B,WAAW,EAAE,oBAAoB;IACjC,MAAM,EAAE,aAAa;CACtB,CAAC;AAEF,kGAAkG;AAClG,MAAM,CAAC,MAAM,sBAAsB,GAAoB,iBAAiB,CAAC"}
|
package/dist/wgpuShapeData.d.ts
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
import type { HostImageCapability } from '@flighthq/image/contract';
|
|
2
|
+
import type { NodeAny, RendererData } from '@flighthq/node/contract';
|
|
3
|
+
import type { WgpuRenderState } from '@flighthq/render-wgpu/contract';
|
|
4
|
+
import type { RenderState } from '@flighthq/render/contract';
|
|
5
|
+
import type { CanvasSurface, HostCanvasCapability } from '@flighthq/surface/contract';
|
|
6
|
+
import type { WgpuShapeRendererData } from './contract.scene2d-wgpu-types.ts';
|
|
7
|
+
export declare function acquireWgpuShapeRasterSurface(canvasHost: Readonly<HostCanvasCapability>, imageHost: Readonly<HostImageCapability>, data: WgpuShapeRendererData): CanvasSurface | null;
|
|
8
|
+
export declare function createWgpuShapeData(_state: RenderState, _source: NodeAny): RendererData;
|
|
4
9
|
export declare function destroyWgpuShapeData(state: WgpuRenderState, data: RendererData): void;
|
|
5
10
|
export declare function getWgpuShapeData(data: RendererData): WgpuShapeRendererData | null;
|
|
6
11
|
//# sourceMappingURL=wgpuShapeData.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuShapeData.d.ts","sourceRoot":"","sources":["../src/wgpuShapeData.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuShapeData.d.ts","sourceRoot":"","sources":["../src/wgpuShapeData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAErE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEtF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAM9E,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,QAAQ,CAAC,oBAAoB,CAAC,EAC1C,SAAS,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EACxC,IAAI,EAAE,qBAAqB,GAC1B,aAAa,GAAG,IAAI,CAQtB;AAID,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,GAAG,YAAY,CAqBvF;AAKD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CA0BrF;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,qBAAqB,GAAG,IAAI,CAEjF"}
|
package/dist/wgpuShapeData.js
CHANGED
|
@@ -1,23 +1,25 @@
|
|
|
1
1
|
import { getWgpuRenderStateRuntime } from '@flighthq/render-wgpu/contract';
|
|
2
|
-
import {
|
|
3
|
-
import { createWgpuRendererData, getWgpuRendererData } from './wgpuRendererData';
|
|
2
|
+
import { createCanvasHostSurface, destroyCanvasHostSurface } from '@flighthq/render/contract';
|
|
3
|
+
import { createWgpuRendererData, getWgpuRendererData } from './wgpuRendererData.js';
|
|
4
4
|
// Allocates the rasterization surface on first use, matching scene2d-gl. A shape whose fills all
|
|
5
5
|
// tessellate never touches this, so a scene drawn entirely through the mesh path carries no raster
|
|
6
6
|
// surface.
|
|
7
|
-
export function acquireWgpuShapeRasterSurface(
|
|
7
|
+
export function acquireWgpuShapeRasterSurface(canvasHost, imageHost, data) {
|
|
8
8
|
const existing = data.surface;
|
|
9
9
|
if (existing !== null)
|
|
10
10
|
return existing;
|
|
11
|
-
const surface =
|
|
11
|
+
const surface = createCanvasHostSurface(canvasHost, 1, 1);
|
|
12
12
|
if (surface === null)
|
|
13
13
|
return null;
|
|
14
14
|
data.surface = surface;
|
|
15
|
+
data.image = imageHost.createImageFromSurface?.(surface) ?? null;
|
|
15
16
|
return surface;
|
|
16
17
|
}
|
|
17
18
|
// Shared by all three shape strategies so a node keeps one cache whichever one draws it. Both halves
|
|
18
19
|
// start empty: nothing is allocated until a strategy needs it.
|
|
19
20
|
export function createWgpuShapeData(_state, _source) {
|
|
20
21
|
return createWgpuRendererData({
|
|
22
|
+
image: null,
|
|
21
23
|
surface: null,
|
|
22
24
|
lastContentId: -1,
|
|
23
25
|
lastPixelRatio: 0,
|
|
@@ -45,15 +47,16 @@ export function destroyWgpuShapeData(state, data) {
|
|
|
45
47
|
const shapeData = getWgpuShapeData(data);
|
|
46
48
|
if (shapeData === null)
|
|
47
49
|
return;
|
|
48
|
-
const surface = shapeData
|
|
49
|
-
if (
|
|
50
|
-
const entry = runtime.context.textureSourcePremultipliedTextureCache.get(
|
|
50
|
+
const { image, surface } = shapeData;
|
|
51
|
+
if (image !== null) {
|
|
52
|
+
const entry = runtime.context.textureSourcePremultipliedTextureCache.get(image);
|
|
51
53
|
if (entry !== undefined) {
|
|
52
54
|
entry.texture.destroy();
|
|
53
|
-
runtime.context.textureSourcePremultipliedTextureCache.delete(
|
|
55
|
+
runtime.context.textureSourcePremultipliedTextureCache.delete(image);
|
|
54
56
|
}
|
|
55
|
-
destroyRaster2DSurface(surface);
|
|
56
57
|
}
|
|
58
|
+
if (surface !== null)
|
|
59
|
+
destroyCanvasHostSurface(surface);
|
|
57
60
|
const b = shapeData.meshBuffers;
|
|
58
61
|
for (const buffer of b.vertexBuffers)
|
|
59
62
|
buffer.destroy();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuShapeData.js","sourceRoot":"","sources":["../src/wgpuShapeData.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuShapeData.js","sourceRoot":"","sources":["../src/wgpuShapeData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAK9F,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEpF,iGAAiG;AACjG,mGAAmG;AACnG,WAAW;AACX,MAAM,UAAU,6BAA6B,CAC3C,UAA0C,EAC1C,SAAwC,EACxC,IAA2B;IAE3B,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;IAC9B,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO,QAAQ,CAAC;IACvC,MAAM,OAAO,GAAG,uBAAuB,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1D,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACvB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,sBAAsB,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;IACjE,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,qGAAqG;AACrG,+DAA+D;AAC/D,MAAM,UAAU,mBAAmB,CAAC,MAAmB,EAAE,OAAgB;IACvE,OAAO,sBAAsB,CAAC;QAC5B,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,IAAI;QACb,aAAa,EAAE,CAAC,CAAC;QACjB,cAAc,EAAE,CAAC;QACjB,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,CAAC;QACR,WAAW,EAAE,CAAC,CAAC;QACf,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE;YACX,aAAa,EAAE,EAAE;YACjB,gBAAgB,EAAE,EAAE;YACpB,YAAY,EAAE,EAAE;YAChB,eAAe,EAAE,EAAE;YACnB,cAAc,EAAE,EAAE;YAClB,UAAU,EAAE,EAAE;YACd,4BAA4B,EAAE,EAAE;YAChC,wBAAwB,EAAE,EAAE;SAC7B;KACF,CAAC,CAAC;AACL,CAAC;AAED,6GAA6G;AAC7G,6GAA6G;AAC7G,uDAAuD;AACvD,MAAM,UAAU,oBAAoB,CAAC,KAAsB,EAAE,IAAkB;IAC7E,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACzC,IAAI,SAAS,KAAK,IAAI;QAAE,OAAO;IAC/B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;IACrC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,sCAAsC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAChF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACxB,OAAO,CAAC,OAAO,CAAC,sCAAsC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IACD,IAAI,OAAO,KAAK,IAAI;QAAE,wBAAwB,CAAC,OAAO,CAAC,CAAC;IACxD,MAAM,CAAC,GAAG,SAAS,CAAC,WAAW,CAAC;IAChC,KAAK,MAAM,MAAM,IAAI,CAAC,CAAC,aAAa;QAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IACvD,KAAK,MAAM,MAAM,IAAI,CAAC,CAAC,YAAY;QAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IACtD,KAAK,MAAM,MAAM,IAAI,CAAC,CAAC,cAAc;QAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IACxD,KAAK,MAAM,MAAM,IAAI,CAAC,CAAC,4BAA4B;QAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IACtE,CAAC,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3B,CAAC,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;IAC9B,CAAC,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;IAC1B,CAAC,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7B,CAAC,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IACxB,CAAC,CAAC,4BAA4B,CAAC,MAAM,GAAG,CAAC,CAAC;IAC1C,CAAC,CAAC,wBAAwB,CAAC,MAAM,GAAG,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAkB;IACjD,OAAO,mBAAmB,CAAwB,IAAI,CAAC,CAAC;AAC1D,CAAC"}
|
package/dist/wgpuShapeMesh.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
|
|
1
|
+
import type { WgpuBindGroup, WgpuBuffer, WgpuRenderState, WgpuShapeMeshBuffers, WgpuShapeMeshPipeline } from '@flighthq/render-wgpu/contract';
|
|
2
|
+
import type { RenderProxy2D } from '@flighthq/render/contract';
|
|
3
|
+
import type { WgpuShapeMesh } from './contract.scene2d-wgpu-types.ts';
|
|
4
|
+
export declare function drawWgpuShapeMeshBatch(state: WgpuRenderState, renderProxy: RenderProxy2D, meshes: readonly WgpuShapeMesh[], buffers: WgpuShapeMeshBuffers, pipelineEntry: WgpuShapeMeshPipeline, uniformBuffers: WgpuBuffer[], bindGroups: WgpuBindGroup[], uniformData: Float32Array): void;
|
|
3
5
|
export declare function drawWgpuShapeMeshes(state: WgpuRenderState, renderProxy: RenderProxy2D, meshes: readonly WgpuShapeMesh[], buffers: WgpuShapeMeshBuffers): void;
|
|
4
6
|
//# sourceMappingURL=wgpuShapeMesh.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuShapeMesh.d.ts","sourceRoot":"","sources":["../src/wgpuShapeMesh.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuShapeMesh.d.ts","sourceRoot":"","sources":["../src/wgpuShapeMesh.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EAEV,eAAe,EACf,oBAAoB,EACpB,qBAAqB,EAEtB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAsBtE,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,eAAe,EACtB,WAAW,EAAE,aAAa,EAC1B,MAAM,EAAE,SAAS,aAAa,EAAE,EAChC,OAAO,EAAE,oBAAoB,EAC7B,aAAa,EAAE,qBAAqB,EACpC,cAAc,EAAE,UAAU,EAAE,EAC5B,UAAU,EAAE,aAAa,EAAE,EAC3B,WAAW,EAAE,YAAY,GACxB,IAAI,CAgDN;AAKD,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,eAAe,EACtB,WAAW,EAAE,aAAa,EAC1B,MAAM,EAAE,SAAS,aAAa,EAAE,EAChC,OAAO,EAAE,oBAAoB,GAC5B,IAAI,CAiBN"}
|
package/dist/wgpuShapeMesh.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { getWgpuBlendState, getWgpuColorAdjustmentMaterialFeature,
|
|
2
|
-
import { flushWgpuQuadBatchWriter } from './wgpuQuadBatchWriter';
|
|
1
|
+
import { WgpuBufferUsage, WgpuShaderStage, getWgpuBlendState, getWgpuColorAdjustmentMaterialFeature, getWgpuRenderPassViewport, getWgpuRenderStateRuntime, retireWgpuBuffer, } from '@flighthq/render-wgpu/contract';
|
|
2
|
+
import { flushWgpuQuadBatchWriter } from './wgpuQuadBatchWriter.js';
|
|
3
3
|
// Wgpu tessellated solid-fill path for Shape — the counterpart to webglShapeMesh, replacing the
|
|
4
4
|
// canvas-raster-to-texture shortcut (resolution-bound, so circles go jagged when scaled up). Each fill
|
|
5
5
|
// region is tessellated to a triangle mesh (CPU, cached by content version in webgpuShape) and drawn here
|
|
@@ -97,7 +97,7 @@ function ensureShapeMeshIndexBuffer(state, buffers, meshIndex, byteLength) {
|
|
|
97
97
|
retireWgpuBuffer(state, buffer);
|
|
98
98
|
buffer = state.device.createBuffer({
|
|
99
99
|
size,
|
|
100
|
-
usage:
|
|
100
|
+
usage: WgpuBufferUsage.INDEX | WgpuBufferUsage.COPY_DST,
|
|
101
101
|
});
|
|
102
102
|
buffers.indexBuffers[meshIndex] = buffer;
|
|
103
103
|
buffers.indexCapacities[meshIndex] = size;
|
|
@@ -111,7 +111,7 @@ function ensureShapeMeshUniform(state, pipelineEntry, uniformBuffers, bindGroups
|
|
|
111
111
|
if (uniformBuffers[meshIndex] === undefined) {
|
|
112
112
|
const uniformBuffer = state.device.createBuffer({
|
|
113
113
|
size: byteLength,
|
|
114
|
-
usage:
|
|
114
|
+
usage: WgpuBufferUsage.UNIFORM | WgpuBufferUsage.COPY_DST,
|
|
115
115
|
});
|
|
116
116
|
uniformBuffers[meshIndex] = uniformBuffer;
|
|
117
117
|
bindGroups[meshIndex] = state.device.createBindGroup({
|
|
@@ -131,7 +131,9 @@ function ensureShapeMeshPipeline(state, blendMode) {
|
|
|
131
131
|
const device = state.device;
|
|
132
132
|
const module = device.createShaderModule({ code: SHAPE_MESH_WGSL });
|
|
133
133
|
const bindGroupLayout = device.createBindGroupLayout({
|
|
134
|
-
entries: [
|
|
134
|
+
entries: [
|
|
135
|
+
{ binding: 0, visibility: WgpuShaderStage.VERTEX | WgpuShaderStage.FRAGMENT, buffer: { type: 'uniform' } },
|
|
136
|
+
],
|
|
135
137
|
});
|
|
136
138
|
const layout = device.createPipelineLayout({ bindGroupLayouts: [bindGroupLayout] });
|
|
137
139
|
const vertexBuffers = [
|
|
@@ -176,7 +178,7 @@ function ensureShapeMeshVertexBuffer(state, buffers, meshIndex, byteLength) {
|
|
|
176
178
|
retireWgpuBuffer(state, buffer);
|
|
177
179
|
buffer = state.device.createBuffer({
|
|
178
180
|
size,
|
|
179
|
-
usage:
|
|
181
|
+
usage: WgpuBufferUsage.VERTEX | WgpuBufferUsage.COPY_DST,
|
|
180
182
|
});
|
|
181
183
|
buffers.vertexBuffers[meshIndex] = buffer;
|
|
182
184
|
buffers.vertexCapacities[meshIndex] = size;
|
|
@@ -188,8 +190,7 @@ function ensureShapeMeshVertexBuffer(state, buffers, meshIndex, byteLength) {
|
|
|
188
190
|
// padded to 4 floats (vec3 -> vec4 std140-style layout). Writes into the shared scratch view; the color
|
|
189
191
|
// (floats 12..15) is filled per mesh by the caller.
|
|
190
192
|
function shapeMeshMatrix(state, renderProxy, out) {
|
|
191
|
-
const
|
|
192
|
-
const viewport = runtime.renderTargetViewport ?? getWgpuSurfaceRenderExtent(state);
|
|
193
|
+
const viewport = getWgpuRenderPassViewport(state);
|
|
193
194
|
const iw = 2 / (viewport.width || 1);
|
|
194
195
|
const ih = 2 / (viewport.height || 1);
|
|
195
196
|
const t = renderProxy.transform2D;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuShapeMesh.js","sourceRoot":"","sources":["../src/wgpuShapeMesh.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,qCAAqC,EACrC,yBAAyB,EACzB,
|
|
1
|
+
{"version":3,"file":"wgpuShapeMesh.js","sourceRoot":"","sources":["../src/wgpuShapeMesh.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { WgpuRenderState
|
|
1
|
+
import type { WgpuRenderState } from '@flighthq/render-wgpu/contract';
|
|
2
|
+
import type { ShapeRasterizer } from '@flighthq/render/contract';
|
|
2
3
|
export declare function getWgpuShapeRasterizer(state: WgpuRenderState): ShapeRasterizer | null;
|
|
3
4
|
export declare function registerWgpuShapeRasterizer(state: WgpuRenderState, rasterizer: ShapeRasterizer | null): void;
|
|
4
5
|
//# sourceMappingURL=wgpuShapeRasterizer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuShapeRasterizer.d.ts","sourceRoot":"","sources":["../src/wgpuShapeRasterizer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"wgpuShapeRasterizer.d.ts","sourceRoot":"","sources":["../src/wgpuShapeRasterizer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,eAAe,GAAG,eAAe,GAAG,IAAI,CAGrF;AAKD,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,eAAe,GAAG,IAAI,GAAG,IAAI,CAG5G"}
|
|
@@ -1,18 +1,13 @@
|
|
|
1
1
|
import { getWgpuRenderStateRuntime } from '@flighthq/render-wgpu/contract';
|
|
2
|
-
import { RegistryEntryState } from '@flighthq/types/contract';
|
|
3
2
|
export function getWgpuShapeRasterizer(state) {
|
|
4
|
-
const entry = getWgpuRenderStateRuntime(state).registries.shapeRasterizer
|
|
5
|
-
return entry
|
|
3
|
+
const entry = getWgpuRenderStateRuntime(state).registries.shapeRasterizer;
|
|
4
|
+
return entry ?? null;
|
|
6
5
|
}
|
|
7
6
|
// Installs the fallback that draws fills the mesh path cannot express. Registration is the opt-in: a
|
|
8
7
|
// state without one draws its solid shapes and reports the rest as a registry miss, and nothing here
|
|
9
8
|
// reaches for a rasterizer the caller did not name. Pass null to remove one.
|
|
10
9
|
export function registerWgpuShapeRasterizer(state, rasterizer) {
|
|
11
10
|
const runtime = getWgpuRenderStateRuntime(state);
|
|
12
|
-
|
|
13
|
-
runtime.registries.shapeRasterizer = {
|
|
14
|
-
...table,
|
|
15
|
-
entry: rasterizer === null ? null : { state: RegistryEntryState.Bound, value: rasterizer },
|
|
16
|
-
};
|
|
11
|
+
runtime.registries.shapeRasterizer = rasterizer;
|
|
17
12
|
}
|
|
18
13
|
//# sourceMappingURL=wgpuShapeRasterizer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuShapeRasterizer.js","sourceRoot":"","sources":["../src/wgpuShapeRasterizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"wgpuShapeRasterizer.js","sourceRoot":"","sources":["../src/wgpuShapeRasterizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAI3E,MAAM,UAAU,sBAAsB,CAAC,KAAsB;IAC3D,MAAM,KAAK,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,eAAe,CAAC;IAC1E,OAAO,KAAK,IAAI,IAAI,CAAC;AACvB,CAAC;AAED,qGAAqG;AACrG,qGAAqG;AACrG,6EAA6E;AAC7E,MAAM,UAAU,2BAA2B,CAAC,KAAsB,EAAE,UAAkC;IACpG,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjD,OAAO,CAAC,UAAU,CAAC,eAAe,GAAG,UAAU,CAAC;AAClD,CAAC"}
|
package/dist/wgpuSprite.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { WgpuRenderState } from '@flighthq/render-wgpu/contract';
|
|
2
|
+
import type { RenderProxy2D, Scene2DRenderer } from '@flighthq/render/contract';
|
|
2
3
|
export declare function drawWgpuSprite(state: WgpuRenderState, renderProxy: RenderProxy2D): void;
|
|
3
|
-
export declare const
|
|
4
|
+
export declare const wgpuSpriteRenderer: Scene2DRenderer;
|
|
4
5
|
//# sourceMappingURL=wgpuSprite.d.ts.map
|
package/dist/wgpuSprite.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuSprite.d.ts","sourceRoot":"","sources":["../src/wgpuSprite.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuSprite.d.ts","sourceRoot":"","sources":["../src/wgpuSprite.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAehF,wBAAgB,cAAc,CAAC,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CA4DvF;AAED,eAAO,MAAM,kBAAkB,EAAE,eAKhC,CAAC"}
|