@flighthq/scene2d-wgpu 0.3.1-next.996.06087b5 → 0.4.0-next.1263.aa14a22
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/wgpuShapeMesh.js +8 -8
- package/dist/wgpuShapeMesh.js.map +1 -1
- package/package.json +19 -19
- package/src/wgpuMeshShapeRenderer.test.ts +3 -3
- package/src/wgpuRasterShapeRenderer.test.ts +1 -1
- package/src/wgpuScale9Shape.test.ts +1 -1
- package/src/wgpuShape.test.ts +5 -5
- package/src/wgpuShapeMesh.test.ts +5 -5
package/dist/wgpuShapeMesh.js
CHANGED
|
@@ -48,14 +48,14 @@ export function drawWgpuShapeMeshBatch(state, renderProxy, meshes, buffers, pipe
|
|
|
48
48
|
const indexBuffer = ensureShapeMeshIndexBuffer(state, buffers, i, mesh.indices.byteLength);
|
|
49
49
|
queue.writeBuffer(vertexBuffer, 0, mesh.vertices.buffer, mesh.vertices.byteOffset, mesh.vertices.byteLength);
|
|
50
50
|
writeShapeMeshIndices(queue, indexBuffer, mesh.indices);
|
|
51
|
-
|
|
52
|
-
const
|
|
53
|
-
const
|
|
54
|
-
const
|
|
55
|
-
uniformData[12] = r *
|
|
56
|
-
uniformData[13] = g *
|
|
57
|
-
uniformData[14] = b *
|
|
58
|
-
uniformData[15] =
|
|
51
|
+
const r = ((mesh.color >>> 24) & 0xff) / 255;
|
|
52
|
+
const g = ((mesh.color >>> 16) & 0xff) / 255;
|
|
53
|
+
const b = ((mesh.color >>> 8) & 0xff) / 255;
|
|
54
|
+
const ca = ((mesh.color & 0xff) / 255) * a;
|
|
55
|
+
uniformData[12] = r * ca;
|
|
56
|
+
uniformData[13] = g * ca;
|
|
57
|
+
uniformData[14] = b * ca;
|
|
58
|
+
uniformData[15] = ca;
|
|
59
59
|
queue.writeBuffer(uniformBuffers[i], 0, uniformData.buffer, uniformData.byteOffset, uniformData.byteLength);
|
|
60
60
|
pass.setBindGroup(0, bindGroups[i]);
|
|
61
61
|
pass.setVertexBuffer(0, vertexBuffer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuShapeMesh.js","sourceRoot":"","sources":["../src/wgpuShapeMesh.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,qCAAqC,EACrC,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,gCAAgC,CAAC;AASxC,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,gGAAgG;AAChG,uGAAuG;AACvG,0GAA0G;AAC1G,uGAAuG;AACvG,uGAAuG;AACvG,QAAQ;AACR,EAAE;AACF,uGAAuG;AACvG,wGAAwG;AACxG,sGAAsG;AACtG,sGAAsG;AACtG,EAAE;AACF,oGAAoG;AACpG,4EAA4E;AAE5E,uGAAuG;AACvG,qGAAqG;AACrG,sGAAsG;AACtG,kFAAkF;AAClF,MAAM,UAAU,sBAAsB,CACpC,KAAsB,EACtB,WAA0B,EAC1B,MAAgC,EAChC,OAA6B,EAC7B,aAAoC,EACpC,cAA2B,EAC3B,UAA0B,EAC1B,WAAyB;IAEzB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAChC,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjD,wBAAwB,CAAC,KAAK,CAAC,CAAC;IAEhC,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;IAChC,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO;IAE1B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAE3B,gGAAgG;IAChG,2EAA2E;IAC3E,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAEjD,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACzC,sGAAsG;IACtG,+EAA+E;IAC/E,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEnD,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC;IACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACvB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QACxC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACjC,IAAI,CAAC,IAAI,CAAC;YAAE,SAAS;QAErB,sBAAsB,CAAC,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;QACpG,MAAM,YAAY,GAAG,2BAA2B,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC9F,MAAM,WAAW,GAAG,0BAA0B,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC3F,KAAK,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC7G,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAExD,
|
|
1
|
+
{"version":3,"file":"wgpuShapeMesh.js","sourceRoot":"","sources":["../src/wgpuShapeMesh.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flighthq/scene2d-wgpu",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0-next.1263.aa14a22",
|
|
4
4
|
"author": "Joshua Granick and other contributors",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -38,24 +38,24 @@
|
|
|
38
38
|
"clean:dist": "tsx ../../scripts/clean-package-dist.ts"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@flighthq/color": "0.
|
|
42
|
-
"@flighthq/scene2d": "0.
|
|
43
|
-
"@flighthq/scene2d-canvas": "0.
|
|
44
|
-
"@flighthq/geometry": "0.
|
|
45
|
-
"@flighthq/image": "0.
|
|
46
|
-
"@flighthq/log": "0.
|
|
47
|
-
"@flighthq/node": "0.
|
|
48
|
-
"@flighthq/path": "0.
|
|
49
|
-
"@flighthq/registry": "0.
|
|
50
|
-
"@flighthq/render": "0.
|
|
51
|
-
"@flighthq/render-wgpu": "0.
|
|
52
|
-
"@flighthq/shape": "0.
|
|
53
|
-
"@flighthq/text": "0.
|
|
54
|
-
"@flighthq/textinput": "0.
|
|
55
|
-
"@flighthq/textlayout": "0.
|
|
56
|
-
"@flighthq/texture": "0.
|
|
57
|
-
"@flighthq/types": "0.
|
|
58
|
-
"@flighthq/velocity": "0.
|
|
41
|
+
"@flighthq/color": "0.4.0-next.1263.aa14a22",
|
|
42
|
+
"@flighthq/scene2d": "0.4.0-next.1263.aa14a22",
|
|
43
|
+
"@flighthq/scene2d-canvas": "0.4.0-next.1263.aa14a22",
|
|
44
|
+
"@flighthq/geometry": "0.4.0-next.1263.aa14a22",
|
|
45
|
+
"@flighthq/image": "0.4.0-next.1263.aa14a22",
|
|
46
|
+
"@flighthq/log": "0.4.0-next.1263.aa14a22",
|
|
47
|
+
"@flighthq/node": "0.4.0-next.1263.aa14a22",
|
|
48
|
+
"@flighthq/path": "0.4.0-next.1263.aa14a22",
|
|
49
|
+
"@flighthq/registry": "0.4.0-next.1263.aa14a22",
|
|
50
|
+
"@flighthq/render": "0.4.0-next.1263.aa14a22",
|
|
51
|
+
"@flighthq/render-wgpu": "0.4.0-next.1263.aa14a22",
|
|
52
|
+
"@flighthq/shape": "0.4.0-next.1263.aa14a22",
|
|
53
|
+
"@flighthq/text": "0.4.0-next.1263.aa14a22",
|
|
54
|
+
"@flighthq/textinput": "0.4.0-next.1263.aa14a22",
|
|
55
|
+
"@flighthq/textlayout": "0.4.0-next.1263.aa14a22",
|
|
56
|
+
"@flighthq/texture": "0.4.0-next.1263.aa14a22",
|
|
57
|
+
"@flighthq/types": "0.4.0-next.1263.aa14a22",
|
|
58
|
+
"@flighthq/velocity": "0.4.0-next.1263.aa14a22"
|
|
59
59
|
},
|
|
60
60
|
"peerDependencies": {
|
|
61
61
|
"@webgpu/types": "^0.1.70"
|
|
@@ -80,7 +80,7 @@ function makeMeshPassSpy(): GPURenderPassEncoder {
|
|
|
80
80
|
|
|
81
81
|
function gradientShape() {
|
|
82
82
|
const shape = createShape();
|
|
83
|
-
appendShapeBeginGradientFill(shape, 'linear', [
|
|
83
|
+
appendShapeBeginGradientFill(shape, 'linear', [0xff0000ff, 0x0000ffff], [1, 1], [0, 255], null);
|
|
84
84
|
appendShapeRectangle(shape, 8, 8, 32, 24);
|
|
85
85
|
appendShapeEndFill(shape);
|
|
86
86
|
return shape;
|
|
@@ -133,7 +133,7 @@ describe('drawWgpuMeshShape', () => {
|
|
|
133
133
|
const pass = makeMeshPassSpy();
|
|
134
134
|
getWgpuRenderStateRuntime(state).renderPass = pass;
|
|
135
135
|
const shape = createShape();
|
|
136
|
-
appendShapeBeginFill(shape,
|
|
136
|
+
appendShapeBeginFill(shape, 0x00cc00ff);
|
|
137
137
|
appendShapeRectangle(shape, 8, 8, 32, 24);
|
|
138
138
|
appendShapeEndFill(shape);
|
|
139
139
|
|
|
@@ -154,7 +154,7 @@ describe('drawWgpuMeshShape', () => {
|
|
|
154
154
|
const state = await createWgpuRenderStateForTest();
|
|
155
155
|
renderWgpuBackground(state);
|
|
156
156
|
const shape = createShape();
|
|
157
|
-
appendShapeBeginFill(shape,
|
|
157
|
+
appendShapeBeginFill(shape, 0x00cc00ff);
|
|
158
158
|
appendShapeRectangle(shape, 8, 8, 32, 24);
|
|
159
159
|
appendShapeEndFill(shape);
|
|
160
160
|
|
|
@@ -76,7 +76,7 @@ function makeMeshPassSpy(): GPURenderPassEncoder {
|
|
|
76
76
|
// A plain solid rectangle — precisely the shape the mesh strategy would tessellate.
|
|
77
77
|
function solidShape() {
|
|
78
78
|
const shape = createShape();
|
|
79
|
-
appendShapeBeginFill(shape,
|
|
79
|
+
appendShapeBeginFill(shape, 0x00cc00ff);
|
|
80
80
|
appendShapeRectangle(shape, 8, 8, 32, 24);
|
|
81
81
|
appendShapeEndFill(shape);
|
|
82
82
|
return shape;
|
|
@@ -60,7 +60,7 @@ describe('drawWgpuScale9Shape', () => {
|
|
|
60
60
|
const state = await createWgpuRenderStateForTest();
|
|
61
61
|
renderWgpuBackground(state);
|
|
62
62
|
const shape = createScale9Shape(grid);
|
|
63
|
-
appendShapeBeginFill(shape,
|
|
63
|
+
appendShapeBeginFill(shape, 0xff0000ff);
|
|
64
64
|
appendShapeRectangle(shape, 0, 0, 100, 100);
|
|
65
65
|
prepareScene2DRender(state, shape);
|
|
66
66
|
const renderProxy = getOrCreateRenderProxy2D(state, shape);
|
package/src/wgpuShape.test.ts
CHANGED
|
@@ -116,10 +116,10 @@ describe('drawWgpuShape', () => {
|
|
|
116
116
|
renderWgpuBackground(state);
|
|
117
117
|
getWgpuRenderStateRuntime(state).renderPass = makeMeshPassSpy();
|
|
118
118
|
const shape = createShape();
|
|
119
|
-
appendShapeBeginFill(shape,
|
|
119
|
+
appendShapeBeginFill(shape, 0x00cc00ff);
|
|
120
120
|
appendShapeRectangle(shape, 8, 8, 32, 24);
|
|
121
121
|
appendShapeEndFill(shape);
|
|
122
|
-
appendShapeLineStyle(shape, 4,
|
|
122
|
+
appendShapeLineStyle(shape, 4, 0xff0000ff);
|
|
123
123
|
appendShapeMoveTo(shape, 8, 4);
|
|
124
124
|
appendShapeLineTo(shape, 40, 4);
|
|
125
125
|
const rendererData = defaultWgpuShapeRenderer.createData!(state, shape)!;
|
|
@@ -141,7 +141,7 @@ describe('drawWgpuShape', () => {
|
|
|
141
141
|
renderWgpuBackground(state);
|
|
142
142
|
getWgpuRenderStateRuntime(state).renderPass = makeMeshPassSpy();
|
|
143
143
|
const shape = createShape();
|
|
144
|
-
appendShapeLineStyle(shape, 8,
|
|
144
|
+
appendShapeLineStyle(shape, 8, 0xff0000ff);
|
|
145
145
|
appendShapeRectangle(shape, 8, 8, 32, 24);
|
|
146
146
|
const rendererData = defaultWgpuShapeRenderer.createData!(state, shape)!;
|
|
147
147
|
|
|
@@ -163,7 +163,7 @@ describe('drawWgpuShape', () => {
|
|
|
163
163
|
const pass = makeMeshPassSpy();
|
|
164
164
|
getWgpuRenderStateRuntime(state).renderPass = pass;
|
|
165
165
|
const shape = createShape();
|
|
166
|
-
appendShapeLineStyle(shape, 8,
|
|
166
|
+
appendShapeLineStyle(shape, 8, 0xff0000ff);
|
|
167
167
|
appendShapeRectangle(shape, 8, 8, 32, 24);
|
|
168
168
|
const rendererData = defaultWgpuShapeRenderer.createData!(state, shape)!;
|
|
169
169
|
|
|
@@ -183,7 +183,7 @@ describe('drawWgpuShape', () => {
|
|
|
183
183
|
const pass = makeMeshPassSpy();
|
|
184
184
|
getWgpuRenderStateRuntime(state).renderPass = pass;
|
|
185
185
|
const shape = createShape();
|
|
186
|
-
appendShapeLineStyle(shape, 8,
|
|
186
|
+
appendShapeLineStyle(shape, 8, 0xff0000ff);
|
|
187
187
|
appendShapePath(
|
|
188
188
|
shape,
|
|
189
189
|
[PathCommand.MOVE_TO, PathCommand.LINE_TO, PathCommand.LINE_TO, PathCommand.LINE_TO, PathCommand.CLOSE],
|
|
@@ -21,7 +21,7 @@ beforeAll(() => {
|
|
|
21
21
|
const TRIANGLE: WgpuShapeMesh = {
|
|
22
22
|
vertices: new Float32Array([0, 0, 10, 0, 0, 10]),
|
|
23
23
|
indices: new Uint16Array([0, 1, 2]),
|
|
24
|
-
color:
|
|
24
|
+
color: 0xff8040ff,
|
|
25
25
|
alpha: 1,
|
|
26
26
|
};
|
|
27
27
|
|
|
@@ -111,7 +111,7 @@ describe('drawWgpuShapeMeshBatch', () => {
|
|
|
111
111
|
drawWgpuShapeMeshBatch(
|
|
112
112
|
state,
|
|
113
113
|
makeProxy({ alpha: 0.5 }),
|
|
114
|
-
[{ ...TRIANGLE, color:
|
|
114
|
+
[{ ...TRIANGLE, color: 0xffffffff }],
|
|
115
115
|
buffers,
|
|
116
116
|
pipelineEntry,
|
|
117
117
|
uniformBuffers,
|
|
@@ -146,7 +146,7 @@ describe('drawWgpuShapeMeshes', () => {
|
|
|
146
146
|
const state = await makeState();
|
|
147
147
|
const buffers = makeBuffers();
|
|
148
148
|
|
|
149
|
-
drawWgpuShapeMeshes(state, makeProxy(), [TRIANGLE, { ...TRIANGLE, color:
|
|
149
|
+
drawWgpuShapeMeshes(state, makeProxy(), [TRIANGLE, { ...TRIANGLE, color: 0x0080ffff }], buffers);
|
|
150
150
|
|
|
151
151
|
expect(buffers.vertexBuffers).toHaveLength(2);
|
|
152
152
|
expect(buffers.indexBuffers).toHaveLength(2);
|
|
@@ -219,7 +219,7 @@ describe('drawWgpuShapeMeshes', () => {
|
|
|
219
219
|
}
|
|
220
220
|
}) as unknown as GPUQueue['writeBuffer'];
|
|
221
221
|
|
|
222
|
-
drawWgpuShapeMeshes(state, makeProxy({ alpha: 0.5 }), [{ ...TRIANGLE, color:
|
|
222
|
+
drawWgpuShapeMeshes(state, makeProxy({ alpha: 0.5 }), [{ ...TRIANGLE, color: 0xffffffff }], buffers);
|
|
223
223
|
|
|
224
224
|
const uniformData = writes.get(buffers.uniformBuffers[0]);
|
|
225
225
|
expect(uniformData).toBeDefined();
|
|
@@ -288,7 +288,7 @@ describe('drawWgpuShapeMeshes', () => {
|
|
|
288
288
|
drawWgpuShapeMeshes(
|
|
289
289
|
state,
|
|
290
290
|
makeProxy({ alpha: 0.5, colorScaleBias: ct(0.25, 0.5, 0.75, 0.8, 0.1, 0.2, 0.3, 0.4) }),
|
|
291
|
-
[{ ...TRIANGLE, color:
|
|
291
|
+
[{ ...TRIANGLE, color: 0xffffffff }],
|
|
292
292
|
buffers,
|
|
293
293
|
);
|
|
294
294
|
|