@flighthq/displayobject-wgpu 0.1.0 → 0.2.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/dist/enableWgpuColorAdjustmentGuards.d.ts +4 -0
- package/dist/enableWgpuColorAdjustmentGuards.d.ts.map +1 -0
- package/dist/enableWgpuColorAdjustmentGuards.js +21 -0
- package/dist/enableWgpuColorAdjustmentGuards.js.map +1 -0
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/wgpuBitmap.d.ts.map +1 -1
- package/dist/wgpuBitmap.js +2 -1
- package/dist/wgpuBitmap.js.map +1 -1
- package/dist/wgpuCache.d.ts.map +1 -1
- package/dist/wgpuCache.js +4 -1
- package/dist/wgpuCache.js.map +1 -1
- package/dist/wgpuColorAdjustment.d.ts +3 -0
- package/dist/wgpuColorAdjustment.d.ts.map +1 -0
- package/dist/wgpuColorAdjustment.js +198 -0
- package/dist/wgpuColorAdjustment.js.map +1 -0
- package/dist/wgpuQuadBatch.d.ts.map +1 -1
- package/dist/wgpuQuadBatch.js +8 -4
- package/dist/wgpuQuadBatch.js.map +1 -1
- package/dist/wgpuRichText.js +1 -0
- package/dist/wgpuRichText.js.map +1 -1
- package/dist/wgpuShape.d.ts.map +1 -1
- package/dist/wgpuShape.js +2 -1
- package/dist/wgpuShape.js.map +1 -1
- package/dist/wgpuSpriteBatch.d.ts +2 -1
- package/dist/wgpuSpriteBatch.d.ts.map +1 -1
- package/dist/wgpuSpriteBatch.js +31 -9
- package/dist/wgpuSpriteBatch.js.map +1 -1
- package/dist/wgpuSpriteRenderer.d.ts.map +1 -1
- package/dist/wgpuSpriteRenderer.js +2 -1
- package/dist/wgpuSpriteRenderer.js.map +1 -1
- package/dist/wgpuTextLabel.d.ts.map +1 -1
- package/dist/wgpuTextLabel.js +3 -1
- package/dist/wgpuTextLabel.js.map +1 -1
- package/dist/wgpuTilemap.d.ts.map +1 -1
- package/dist/wgpuTilemap.js +8 -4
- package/dist/wgpuTilemap.js.map +1 -1
- package/package.json +22 -15
- package/src/enableWgpuColorAdjustmentGuards.test.ts +82 -0
- package/src/wgpuColorAdjustment.test.ts +119 -0
- package/src/wgpuParticleEmitter.test.ts +1 -1
- package/src/wgpuSpriteBatch.test.ts +65 -1
- package/src/wgpuVelocity.test.ts +2 -1
- package/dist/wgpuColorTransformMaterial.d.ts +0 -5
- package/dist/wgpuColorTransformMaterial.d.ts.map +0 -1
- package/dist/wgpuColorTransformMaterial.js +0 -97
- package/dist/wgpuColorTransformMaterial.js.map +0 -1
- package/dist/wgpuMaterials.d.ts +0 -15
- package/dist/wgpuMaterials.d.ts.map +0 -1
- package/dist/wgpuMaterials.js +0 -34
- package/dist/wgpuMaterials.js.map +0 -1
- package/src/wgpuColorTransformMaterial.test.ts +0 -62
- package/src/wgpuMaterials.test.ts +0 -44
package/dist/wgpuSpriteBatch.js
CHANGED
|
@@ -112,7 +112,14 @@ export function flushWgpuSpriteBatch(state) {
|
|
|
112
112
|
const texture = runtime.spriteBatchTexture;
|
|
113
113
|
const blendMode = runtime.spriteBatchBlendMode;
|
|
114
114
|
const renderer = runtime.spriteBatchMaterialRenderer;
|
|
115
|
-
|
|
115
|
+
// The color-adjustment fold is opt-in (enableWgpuColorAdjustment): when installed it resolves a
|
|
116
|
+
// tinted batch to its per-instance @group(3) storage data + folded module; an untinted batch (or an
|
|
117
|
+
// un-enabled state) falls back to the resolved material's own per-instance data, and no fold WGSL is
|
|
118
|
+
// linked into this module. CT and material per-instance data never mix in a built-in batch (built-in
|
|
119
|
+
// materials have no per-instance floats).
|
|
120
|
+
const ctFlush = runtime.wgpuColorAdjustmentFold?.resolveFlush(state, count) ?? null;
|
|
121
|
+
const group3Floats = ctFlush !== null ? ctFlush.floats : runtime.spriteBatchMaterialFloats;
|
|
122
|
+
const group3Data = ctFlush !== null ? ctFlush.data : runtime.spriteBatchMaterialData;
|
|
116
123
|
resetWgpuSpriteBatch(state);
|
|
117
124
|
const resources = ensureWgpuQuadBatchResources(state);
|
|
118
125
|
// Claim a distinct pool slot for this flush. The canvas pass is submitted once at end of frame, so
|
|
@@ -126,14 +133,14 @@ export function flushWgpuSpriteBatch(state) {
|
|
|
126
133
|
slot.instanceCapacity = capacity;
|
|
127
134
|
}
|
|
128
135
|
state.device.queue.writeBuffer(slot.instanceBuffer, 0, runtime.spriteBatchInstanceData.buffer, 0, instanceBytes);
|
|
129
|
-
if (
|
|
130
|
-
const
|
|
131
|
-
if (slot.materialBuffer === null || slot.materialCapacity <
|
|
132
|
-
const capacity = Math.max(
|
|
136
|
+
if (group3Floats > 0) {
|
|
137
|
+
const group3Bytes = count * group3Floats * 4;
|
|
138
|
+
if (slot.materialBuffer === null || slot.materialCapacity < group3Bytes) {
|
|
139
|
+
const capacity = Math.max(group3Bytes, slot.materialCapacity * 2, group3Floats * 4 * 256);
|
|
133
140
|
slot.materialBuffer = createWgpuSpriteBatchBuffer(state, capacity);
|
|
134
141
|
slot.materialCapacity = capacity;
|
|
135
142
|
}
|
|
136
|
-
state.device.queue.writeBuffer(slot.materialBuffer, 0,
|
|
143
|
+
state.device.queue.writeBuffer(slot.materialBuffer, 0, group3Data.buffer, 0, group3Bytes);
|
|
137
144
|
}
|
|
138
145
|
state.applyBlendMode?.(state, blendMode);
|
|
139
146
|
const textureEntry = bindWgpuTexture(state, texture);
|
|
@@ -142,14 +149,14 @@ export function flushWgpuSpriteBatch(state) {
|
|
|
142
149
|
layout: resources.instanceBindGroupLayout,
|
|
143
150
|
entries: [{ binding: 0, resource: { buffer: slot.instanceBuffer } }],
|
|
144
151
|
});
|
|
145
|
-
const module = renderer.getShaderModule(state);
|
|
146
|
-
const pipeline = getWgpuQuadBatchPipeline(state, resources, module,
|
|
152
|
+
const module = ctFlush !== null ? ctFlush.module : renderer.getShaderModule(state);
|
|
153
|
+
const pipeline = getWgpuQuadBatchPipeline(state, resources, module, group3Floats > 0, blendMode);
|
|
147
154
|
const pass = runtime.renderPass;
|
|
148
155
|
pass.setPipeline(pipeline);
|
|
149
156
|
pass.setBindGroup(0, runtime.uniformBindGroup, [uniformOffset]);
|
|
150
157
|
pass.setBindGroup(1, textureEntry.bindGroup);
|
|
151
158
|
pass.setBindGroup(2, instanceBindGroup);
|
|
152
|
-
if (
|
|
159
|
+
if (group3Floats > 0) {
|
|
153
160
|
const materialBindGroup = state.device.createBindGroup({
|
|
154
161
|
layout: resources.materialBindGroupLayout,
|
|
155
162
|
entries: [{ binding: 0, resource: { buffer: slot.materialBuffer } }],
|
|
@@ -261,6 +268,21 @@ export function prepareWgpuSpriteBatchWrite(state, texture, blendMode, material,
|
|
|
261
268
|
}
|
|
262
269
|
return runtime.spriteBatchCount * SPRITE_INSTANCE_FLOATS;
|
|
263
270
|
}
|
|
271
|
+
// Folds instance `instanceIndex`'s effective color transform into the active batch through the opt-in
|
|
272
|
+
// color-adjustment fold, without ever splitting the batch. When the capability was not enabled
|
|
273
|
+
// (enableWgpuColorAdjustment), the fold slot is null and the tint is skipped — the batch draws
|
|
274
|
+
// untinted (the sentinel behavior, never a throw); an installed guard reports the miss. `colorTransform`
|
|
275
|
+
// is null/undefined for an untinted instance, which is a no-op whether or not the fold is enabled.
|
|
276
|
+
export function recordWgpuSpriteBatchColorTransform(state, colorTransform, instanceIndex) {
|
|
277
|
+
const runtime = getWgpuRenderStateRuntime(state);
|
|
278
|
+
const fold = runtime.wgpuColorAdjustmentFold;
|
|
279
|
+
if (fold != null) {
|
|
280
|
+
fold.record(runtime, colorTransform, instanceIndex);
|
|
281
|
+
return;
|
|
282
|
+
}
|
|
283
|
+
if (colorTransform != null)
|
|
284
|
+
runtime.wgpuColorAdjustmentGuard?.(state, colorTransform);
|
|
285
|
+
}
|
|
264
286
|
// Resets the per-frame buffer-pool cursor so the next frame reclaims slots from the start. Must be
|
|
265
287
|
// called once at the start of each frame's batch work — the screen frame via renderWgpuBackground,
|
|
266
288
|
// and the offscreen cache bake via refreshWgpuRenderCache (the bake flushes on its own state).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuSpriteBatch.js","sourceRoot":"","sources":["../src/wgpuSpriteBatch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"wgpuSpriteBatch.js","sourceRoot":"","sources":["../src/wgpuSpriteBatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuSpriteRenderer.d.ts","sourceRoot":"","sources":["../src/wgpuSpriteRenderer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAyB,cAAc,EAAmB,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"wgpuSpriteRenderer.d.ts","sourceRoot":"","sources":["../src/wgpuSpriteRenderer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAyB,cAAc,EAAmB,MAAM,iBAAiB,CAAC;AA0D9F,eAAO,MAAM,yBAAyB,EAAE,cAIvC,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { noopRendererData } from '@flighthq/render';
|
|
|
2
2
|
import { resolveWgpuMaterialRenderer } from '@flighthq/render-wgpu';
|
|
3
3
|
import { getWgpuRenderStateRuntime } from '@flighthq/render-wgpu';
|
|
4
4
|
import { BatchFormat } from '@flighthq/types';
|
|
5
|
-
import { packWgpuSpriteBatchMaterialInstance, prepareWgpuSpriteBatchWrite } from './wgpuSpriteBatch';
|
|
5
|
+
import { packWgpuSpriteBatchMaterialInstance, prepareWgpuSpriteBatchWrite, recordWgpuSpriteBatchColorTransform, } from './wgpuSpriteBatch';
|
|
6
6
|
function submitWgpuSpriteNode(state, spriteNode) {
|
|
7
7
|
const runtime = getWgpuRenderStateRuntime(state);
|
|
8
8
|
if (runtime.renderPass === null)
|
|
@@ -41,6 +41,7 @@ function submitWgpuSpriteNode(state, spriteNode) {
|
|
|
41
41
|
d[base + 11] = (region.y + region.height) * ih;
|
|
42
42
|
d[base + 12] = spriteNode.alpha;
|
|
43
43
|
packWgpuSpriteBatchMaterialInstance(state, spriteNode.materialData, instanceIndex);
|
|
44
|
+
recordWgpuSpriteBatchColorTransform(state, spriteNode.colorTransform, instanceIndex);
|
|
44
45
|
runtime.spriteBatchCount++;
|
|
45
46
|
}
|
|
46
47
|
export const defaultWgpuSpriteRenderer = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuSpriteRenderer.js","sourceRoot":"","sources":["../src/wgpuSpriteRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,
|
|
1
|
+
{"version":3,"file":"wgpuSpriteRenderer.js","sourceRoot":"","sources":["../src/wgpuSpriteRenderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuTextLabel.d.ts","sourceRoot":"","sources":["../src/wgpuTextLabel.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,qBAAqB,EAGrB,aAAa,EAKb,eAAe,EAChB,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"wgpuTextLabel.d.ts","sourceRoot":"","sources":["../src/wgpuTextLabel.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,qBAAqB,EAGrB,aAAa,EAKb,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAuDzB,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CA4H1F;AAED,eAAO,MAAM,4BAA4B,EAAE,qBAK1C,CAAC"}
|
package/dist/wgpuTextLabel.js
CHANGED
|
@@ -8,7 +8,7 @@ import { getTextLabelRuntime } from '@flighthq/text';
|
|
|
8
8
|
import { computeTextLayout, createTextFormatRange, getTextLayoutResult } from '@flighthq/textlayout';
|
|
9
9
|
import { BatchFormat } from '@flighthq/types';
|
|
10
10
|
import { createWgpuRendererData, getWgpuRendererData } from './wgpuRendererData';
|
|
11
|
-
import { ensureWgpuQuadBatchResources, packWgpuSpriteBatchMaterialInstance, prepareWgpuSpriteBatchWrite, } from './wgpuSpriteBatch';
|
|
11
|
+
import { ensureWgpuQuadBatchResources, packWgpuSpriteBatchMaterialInstance, prepareWgpuSpriteBatchWrite, recordWgpuSpriteBatchColorTransform, } from './wgpuSpriteBatch';
|
|
12
12
|
function createWgpuTextLabelData(_state, _source) {
|
|
13
13
|
const canvas = document.createElement('canvas');
|
|
14
14
|
canvas.width = 1;
|
|
@@ -70,6 +70,7 @@ export function drawWgpuTextLabel(state, renderProxy) {
|
|
|
70
70
|
width: fieldWidth,
|
|
71
71
|
height: fieldHeight,
|
|
72
72
|
measure,
|
|
73
|
+
verticalAlign: source.data.autoSize === 'none' ? source.data.verticalAlign : 'top',
|
|
73
74
|
});
|
|
74
75
|
textData.lastContentId = version;
|
|
75
76
|
textData.lastPixelRatio = pixelRatio;
|
|
@@ -146,6 +147,7 @@ export function drawWgpuTextLabel(state, renderProxy) {
|
|
|
146
147
|
d[base + 11] = 1;
|
|
147
148
|
d[base + 12] = renderProxy.alpha;
|
|
148
149
|
packWgpuSpriteBatchMaterialInstance(state, renderProxy.materialData, startCount);
|
|
150
|
+
recordWgpuSpriteBatchColorTransform(state, renderProxy.colorTransform, startCount);
|
|
149
151
|
runtime.spriteBatchCount++;
|
|
150
152
|
}
|
|
151
153
|
export const defaultWgpuTextLabelRenderer = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuTextLabel.js","sourceRoot":"","sources":["../src/wgpuTextLabel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAYrG,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EACL,4BAA4B,EAC5B,mCAAmC,EACnC,2BAA2B,
|
|
1
|
+
{"version":3,"file":"wgpuTextLabel.js","sourceRoot":"","sources":["../src/wgpuTextLabel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuTilemap.d.ts","sourceRoot":"","sources":["../src/wgpuTilemap.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"wgpuTilemap.d.ts","sourceRoot":"","sources":["../src/wgpuTilemap.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAiC,cAAc,EAA4B,MAAM,iBAAiB,CAAC;AA8F/G,eAAO,MAAM,0BAA0B,EAAE,cAIxC,CAAC"}
|
package/dist/wgpuTilemap.js
CHANGED
|
@@ -2,7 +2,7 @@ import { noopRendererData } from '@flighthq/render';
|
|
|
2
2
|
import { resolveWgpuMaterialRenderer } from '@flighthq/render-wgpu';
|
|
3
3
|
import { getWgpuRenderStateRuntime } from '@flighthq/render-wgpu';
|
|
4
4
|
import { BatchFormat } from '@flighthq/types';
|
|
5
|
-
import { packWgpuSpriteBatchMaterialInstance, prepareWgpuSpriteBatchWrite, SPRITE_INSTANCE_FLOATS, } from './wgpuSpriteBatch';
|
|
5
|
+
import { packWgpuSpriteBatchMaterialInstance, prepareWgpuSpriteBatchWrite, recordWgpuSpriteBatchColorTransform, SPRITE_INSTANCE_FLOATS, } from './wgpuSpriteBatch';
|
|
6
6
|
// Each tile writes the 13 base instance floats; any material packs its own per-instance data.
|
|
7
7
|
const INSTANCE_STRIDE_FLOATS = SPRITE_INSTANCE_FLOATS;
|
|
8
8
|
function submitWgpuTilemap(state, tilemapNode) {
|
|
@@ -23,7 +23,9 @@ function submitWgpuTilemap(state, tilemapNode) {
|
|
|
23
23
|
if (materialRenderer === null)
|
|
24
24
|
return;
|
|
25
25
|
const nodeMaterialData = tilemapNode.materialData;
|
|
26
|
-
|
|
26
|
+
// Per-tile color transforms, overriding the node-level tint for the tiles that carry one.
|
|
27
|
+
const perTileColorTransform = source.data.materialData;
|
|
28
|
+
const nodeColorTransform = tilemapNode.colorTransform;
|
|
27
29
|
const startCount = runtime.spriteBatchCount;
|
|
28
30
|
const base = prepareWgpuSpriteBatchWrite(state, atlas.image.source, tilemapNode.blendMode, material, materialRenderer, columns * rows);
|
|
29
31
|
const regions = atlas.regions;
|
|
@@ -60,8 +62,10 @@ function submitWgpuTilemap(state, tilemapNode) {
|
|
|
60
62
|
instanceData[writeBase + 10] = (region.x + region.width) * iw;
|
|
61
63
|
instanceData[writeBase + 11] = (region.y + region.height) * ih;
|
|
62
64
|
instanceData[writeBase + 12] = alpha;
|
|
63
|
-
|
|
64
|
-
|
|
65
|
+
packWgpuSpriteBatchMaterialInstance(state, nodeMaterialData, startCount + drawCount);
|
|
66
|
+
// Per-tile tint overrides the node-level tint (null → the node's, itself possibly null → untinted).
|
|
67
|
+
const colorTransform = perTileColorTransform?.[row * columns + col] ?? nodeColorTransform;
|
|
68
|
+
recordWgpuSpriteBatchColorTransform(state, colorTransform, startCount + drawCount);
|
|
65
69
|
writeBase += INSTANCE_STRIDE_FLOATS;
|
|
66
70
|
drawCount++;
|
|
67
71
|
}
|
package/dist/wgpuTilemap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuTilemap.js","sourceRoot":"","sources":["../src/wgpuTilemap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EACL,mCAAmC,EACnC,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,mBAAmB,CAAC;AAE3B,8FAA8F;AAC9F,MAAM,sBAAsB,GAAG,sBAAsB,CAAC;AAEtD,SAAS,iBAAiB,CAAC,KAAsB,EAAE,WAA0B;IAC3E,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjD,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI;QAAE,OAAO;IAExC,MAAM,MAAM,GAAG,WAAW,CAAC,MAAiB,CAAC;IAC7C,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;IAEtD,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO;IAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC5B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO;IAClF,IAAI,OAAO,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC;QAAE,OAAO;IAExC,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;IACtC,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACtE,IAAI,gBAAgB,KAAK,IAAI;QAAE,OAAO;IACtC,MAAM,gBAAgB,GAAG,WAAW,CAAC,YAAY,CAAC;IAClD,MAAM,
|
|
1
|
+
{"version":3,"file":"wgpuTilemap.js","sourceRoot":"","sources":["../src/wgpuTilemap.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flighthq/displayobject-wgpu",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0",
|
|
4
|
+
"repository": {
|
|
5
|
+
"type": "git",
|
|
6
|
+
"url": "https://github.com/flighthq/flight.git",
|
|
7
|
+
"directory": "packages/displayobject-wgpu"
|
|
8
|
+
},
|
|
4
9
|
"type": "module",
|
|
5
10
|
"main": "dist/index.js",
|
|
6
11
|
"types": "dist/index.d.ts",
|
|
@@ -27,22 +32,24 @@
|
|
|
27
32
|
"clean:dist": "tsx ../../scripts/clean-package-dist.ts"
|
|
28
33
|
},
|
|
29
34
|
"dependencies": {
|
|
30
|
-
"@flighthq/displayobject": "0.
|
|
31
|
-
"@flighthq/displayobject-canvas": "0.
|
|
32
|
-
"@flighthq/geometry": "0.
|
|
33
|
-
"@flighthq/
|
|
34
|
-
"@flighthq/
|
|
35
|
-
"@flighthq/
|
|
36
|
-
"@flighthq/
|
|
37
|
-
"@flighthq/render
|
|
38
|
-
"@flighthq/
|
|
39
|
-
"@flighthq/
|
|
40
|
-
"@flighthq/
|
|
41
|
-
"@flighthq/
|
|
42
|
-
"@flighthq/
|
|
43
|
-
"@flighthq/
|
|
35
|
+
"@flighthq/displayobject": "0.2.0",
|
|
36
|
+
"@flighthq/displayobject-canvas": "0.2.0",
|
|
37
|
+
"@flighthq/geometry": "0.2.0",
|
|
38
|
+
"@flighthq/log": "0.2.0",
|
|
39
|
+
"@flighthq/materials": "0.2.0",
|
|
40
|
+
"@flighthq/node": "0.2.0",
|
|
41
|
+
"@flighthq/path": "0.2.0",
|
|
42
|
+
"@flighthq/render": "0.2.0",
|
|
43
|
+
"@flighthq/render-wgpu": "0.2.0",
|
|
44
|
+
"@flighthq/shape": "0.2.0",
|
|
45
|
+
"@flighthq/text": "0.2.0",
|
|
46
|
+
"@flighthq/textinput": "0.2.0",
|
|
47
|
+
"@flighthq/textlayout": "0.2.0",
|
|
48
|
+
"@flighthq/types": "0.2.0",
|
|
49
|
+
"@flighthq/velocity": "0.2.0"
|
|
44
50
|
},
|
|
45
51
|
"devDependencies": {
|
|
52
|
+
"@flighthq/particleemitter": "*",
|
|
46
53
|
"@flighthq/sprite": "*",
|
|
47
54
|
"@webgpu/types": "*",
|
|
48
55
|
"typescript": "^5.3.0"
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { addLogSink, createMemoryLogSink, getMemoryLogSinkEntries, removeLogSink } from '@flighthq/log';
|
|
2
|
+
import { getWgpuRenderStateRuntime } from '@flighthq/render-wgpu';
|
|
3
|
+
import { createWgpuRenderStateForTest, installWgpuMock } from '@flighthq/render-wgpu';
|
|
4
|
+
import type { ColorTransform } from '@flighthq/types';
|
|
5
|
+
|
|
6
|
+
import {
|
|
7
|
+
areWgpuColorAdjustmentGuardsEnabled,
|
|
8
|
+
enableWgpuColorAdjustmentGuards,
|
|
9
|
+
} from './enableWgpuColorAdjustmentGuards';
|
|
10
|
+
import { recordWgpuSpriteBatchColorTransform } from './wgpuSpriteBatch';
|
|
11
|
+
|
|
12
|
+
beforeAll(() => {
|
|
13
|
+
installWgpuMock();
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
function ct(): ColorTransform {
|
|
17
|
+
return {
|
|
18
|
+
redMultiplier: 0.5,
|
|
19
|
+
greenMultiplier: 0.5,
|
|
20
|
+
blueMultiplier: 0.5,
|
|
21
|
+
alphaMultiplier: 1,
|
|
22
|
+
redOffset: 0,
|
|
23
|
+
greenOffset: 0,
|
|
24
|
+
blueOffset: 0,
|
|
25
|
+
alphaOffset: 0,
|
|
26
|
+
} as ColorTransform;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
describe('areWgpuColorAdjustmentGuardsEnabled', () => {
|
|
30
|
+
it('reports false until guards are installed, then true', async () => {
|
|
31
|
+
const state = await createWgpuRenderStateForTest();
|
|
32
|
+
expect(areWgpuColorAdjustmentGuardsEnabled(state)).toBe(false);
|
|
33
|
+
enableWgpuColorAdjustmentGuards(state);
|
|
34
|
+
expect(areWgpuColorAdjustmentGuardsEnabled(state)).toBe(true);
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
describe('enableWgpuColorAdjustmentGuards', () => {
|
|
39
|
+
it('warns once when a color transform is recorded but color adjustment was never enabled', async () => {
|
|
40
|
+
const state = await createWgpuRenderStateForTest();
|
|
41
|
+
const sink = createMemoryLogSink(8);
|
|
42
|
+
addLogSink(sink.sink);
|
|
43
|
+
try {
|
|
44
|
+
enableWgpuColorAdjustmentGuards(state);
|
|
45
|
+
recordWgpuSpriteBatchColorTransform(state, ct(), 0);
|
|
46
|
+
const entries = getMemoryLogSinkEntries(sink);
|
|
47
|
+
expect(entries.length).toBe(1);
|
|
48
|
+
const data = entries[0].data as Record<string, unknown>;
|
|
49
|
+
expect(String(data.message)).toContain('enableWgpuColorAdjustment');
|
|
50
|
+
} finally {
|
|
51
|
+
removeLogSink(sink.sink);
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
it('stays silent for an untinted instance', async () => {
|
|
56
|
+
const state = await createWgpuRenderStateForTest();
|
|
57
|
+
const sink = createMemoryLogSink(8);
|
|
58
|
+
addLogSink(sink.sink);
|
|
59
|
+
try {
|
|
60
|
+
enableWgpuColorAdjustmentGuards(state);
|
|
61
|
+
recordWgpuSpriteBatchColorTransform(state, null, 0);
|
|
62
|
+
expect(getMemoryLogSinkEntries(sink).length).toBe(0);
|
|
63
|
+
} finally {
|
|
64
|
+
removeLogSink(sink.sink);
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
it('does not warn when the guard slot is present but color adjustment is also enabled', async () => {
|
|
69
|
+
const state = await createWgpuRenderStateForTest();
|
|
70
|
+
const runtime = getWgpuRenderStateRuntime(state);
|
|
71
|
+
const sink = createMemoryLogSink(8);
|
|
72
|
+
addLogSink(sink.sink);
|
|
73
|
+
try {
|
|
74
|
+
enableWgpuColorAdjustmentGuards(state);
|
|
75
|
+
runtime.wgpuColorAdjustmentFold = { record: () => {}, resolveFlush: () => null };
|
|
76
|
+
recordWgpuSpriteBatchColorTransform(state, ct(), 0);
|
|
77
|
+
expect(getMemoryLogSinkEntries(sink).length).toBe(0);
|
|
78
|
+
} finally {
|
|
79
|
+
removeLogSink(sink.sink);
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
});
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { renderWgpuBackground, submitWgpuRenderPass } from '@flighthq/render-wgpu';
|
|
2
|
+
import { getWgpuRenderStateRuntime } from '@flighthq/render-wgpu';
|
|
3
|
+
import { createWgpuRenderStateForTest, installWgpuMock } from '@flighthq/render-wgpu';
|
|
4
|
+
import type { ColorTransform } from '@flighthq/types';
|
|
5
|
+
|
|
6
|
+
import { enableWgpuColorAdjustment } from './wgpuColorAdjustment';
|
|
7
|
+
import { defaultWgpuMaterialRenderer } from './wgpuDefaultMaterial';
|
|
8
|
+
import {
|
|
9
|
+
flushWgpuSpriteBatch,
|
|
10
|
+
prepareWgpuSpriteBatchWrite,
|
|
11
|
+
recordWgpuSpriteBatchColorTransform,
|
|
12
|
+
} from './wgpuSpriteBatch';
|
|
13
|
+
|
|
14
|
+
beforeAll(() => {
|
|
15
|
+
installWgpuMock();
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
function ct(
|
|
19
|
+
redMultiplier = 1,
|
|
20
|
+
greenMultiplier = 1,
|
|
21
|
+
blueMultiplier = 1,
|
|
22
|
+
alphaMultiplier = 1,
|
|
23
|
+
redOffset = 0,
|
|
24
|
+
greenOffset = 0,
|
|
25
|
+
blueOffset = 0,
|
|
26
|
+
alphaOffset = 0,
|
|
27
|
+
): ColorTransform {
|
|
28
|
+
return {
|
|
29
|
+
redMultiplier,
|
|
30
|
+
greenMultiplier,
|
|
31
|
+
blueMultiplier,
|
|
32
|
+
alphaMultiplier,
|
|
33
|
+
redOffset,
|
|
34
|
+
greenOffset,
|
|
35
|
+
blueOffset,
|
|
36
|
+
alphaOffset,
|
|
37
|
+
} as ColorTransform;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
const CT_MODE_NONE = 0;
|
|
41
|
+
const CT_MODE_UNIFORM = 1;
|
|
42
|
+
const CT_MODE_PER_INSTANCE = 2;
|
|
43
|
+
|
|
44
|
+
describe('enableWgpuColorAdjustment', () => {
|
|
45
|
+
it('installs the fold so recorded tints drive the color-adjustment state machine', async () => {
|
|
46
|
+
const state = await createWgpuRenderStateForTest();
|
|
47
|
+
const runtime = getWgpuRenderStateRuntime(state);
|
|
48
|
+
enableWgpuColorAdjustment(state);
|
|
49
|
+
expect(runtime.wgpuColorAdjustmentFold).toBeDefined();
|
|
50
|
+
expect(runtime.wgpuColorAdjustmentFold).not.toBeNull();
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
it('is idempotent', async () => {
|
|
54
|
+
const state = await createWgpuRenderStateForTest();
|
|
55
|
+
const runtime = getWgpuRenderStateRuntime(state);
|
|
56
|
+
enableWgpuColorAdjustment(state);
|
|
57
|
+
const fold = runtime.wgpuColorAdjustmentFold;
|
|
58
|
+
enableWgpuColorAdjustment(state);
|
|
59
|
+
expect(runtime.wgpuColorAdjustmentFold).toBe(fold);
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
it('stays untinted (mode NONE) when no instance carries a color transform', async () => {
|
|
63
|
+
const state = await createWgpuRenderStateForTest();
|
|
64
|
+
const runtime = getWgpuRenderStateRuntime(state);
|
|
65
|
+
enableWgpuColorAdjustment(state);
|
|
66
|
+
recordWgpuSpriteBatchColorTransform(state, null, 0);
|
|
67
|
+
recordWgpuSpriteBatchColorTransform(state, null, 1);
|
|
68
|
+
expect(runtime.spriteBatchColorTransformMode).toBe(CT_MODE_NONE);
|
|
69
|
+
});
|
|
70
|
+
|
|
71
|
+
it('uses one whole-batch uniform when every instance shares one tint', async () => {
|
|
72
|
+
const state = await createWgpuRenderStateForTest();
|
|
73
|
+
const runtime = getWgpuRenderStateRuntime(state);
|
|
74
|
+
enableWgpuColorAdjustment(state);
|
|
75
|
+
const tint = ct(0.5);
|
|
76
|
+
recordWgpuSpriteBatchColorTransform(state, tint, 0);
|
|
77
|
+
recordWgpuSpriteBatchColorTransform(state, tint, 1);
|
|
78
|
+
expect(runtime.spriteBatchColorTransformMode).toBe(CT_MODE_UNIFORM);
|
|
79
|
+
expect(runtime.spriteBatchUniformColorTransform).toBe(tint);
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
it('promotes to per-instance (never splits) when tints diverge, back-filling the earlier tint', async () => {
|
|
83
|
+
const state = await createWgpuRenderStateForTest();
|
|
84
|
+
const runtime = getWgpuRenderStateRuntime(state);
|
|
85
|
+
enableWgpuColorAdjustment(state);
|
|
86
|
+
recordWgpuSpriteBatchColorTransform(state, ct(0.5), 0);
|
|
87
|
+
recordWgpuSpriteBatchColorTransform(state, ct(0.25), 1);
|
|
88
|
+
expect(runtime.spriteBatchColorTransformMode).toBe(CT_MODE_PER_INSTANCE);
|
|
89
|
+
expect(runtime.spriteBatchColorTransformData![0]).toBe(0.5);
|
|
90
|
+
expect(runtime.spriteBatchColorTransformData![8]).toBe(0.25);
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
it('promotes with identity fill when a tinted instance follows an untinted one', async () => {
|
|
94
|
+
const state = await createWgpuRenderStateForTest();
|
|
95
|
+
const runtime = getWgpuRenderStateRuntime(state);
|
|
96
|
+
enableWgpuColorAdjustment(state);
|
|
97
|
+
recordWgpuSpriteBatchColorTransform(state, null, 0);
|
|
98
|
+
recordWgpuSpriteBatchColorTransform(state, ct(0.5), 1);
|
|
99
|
+
expect(runtime.spriteBatchColorTransformMode).toBe(CT_MODE_PER_INSTANCE);
|
|
100
|
+
expect(runtime.spriteBatchColorTransformData![0]).toBe(1);
|
|
101
|
+
expect(runtime.spriteBatchColorTransformData![8]).toBe(0.5);
|
|
102
|
+
});
|
|
103
|
+
|
|
104
|
+
it('replicates the uniform tint per instance on flush', async () => {
|
|
105
|
+
const state = await createWgpuRenderStateForTest();
|
|
106
|
+
enableWgpuColorAdjustment(state);
|
|
107
|
+
renderWgpuBackground(state);
|
|
108
|
+
const runtime = getWgpuRenderStateRuntime(state);
|
|
109
|
+
const tex = document.createElement('img');
|
|
110
|
+
prepareWgpuSpriteBatchWrite(state, tex, null, null, defaultWgpuMaterialRenderer, 2);
|
|
111
|
+
recordWgpuSpriteBatchColorTransform(state, ct(0.5), 0);
|
|
112
|
+
recordWgpuSpriteBatchColorTransform(state, ct(0.5), 1);
|
|
113
|
+
runtime.spriteBatchCount = 2;
|
|
114
|
+
flushWgpuSpriteBatch(state);
|
|
115
|
+
expect(runtime.spriteBatchColorTransformData![0]).toBe(0.5);
|
|
116
|
+
expect(runtime.spriteBatchColorTransformData![8]).toBe(0.5);
|
|
117
|
+
submitWgpuRenderPass(state);
|
|
118
|
+
});
|
|
119
|
+
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
+
import { createParticleEmitter } from '@flighthq/particleemitter';
|
|
1
2
|
import { getRenderProxy2D, prepareDisplayObjectRender } from '@flighthq/render';
|
|
2
3
|
import { renderWgpuBackground, submitWgpuRenderPass } from '@flighthq/render-wgpu';
|
|
3
4
|
import { createWgpuRenderStateForTest, installWgpuMock } from '@flighthq/render-wgpu';
|
|
4
|
-
import { createParticleEmitter } from '@flighthq/sprite';
|
|
5
5
|
|
|
6
6
|
import { defaultWgpuParticleEmitterRenderer, drawWgpuParticleEmitter } from './wgpuParticleEmitter';
|
|
7
7
|
|