@flighthq/scene2d-wgpu 0.3.0-next.1729.f927a3b → 0.3.0-next.1781.5d072ef
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/wgpuCache.d.ts.map +1 -1
- package/dist/wgpuCache.js +3 -1
- package/dist/wgpuCache.js.map +1 -1
- package/dist/wgpuColorAdjustmentMaterialFeature.d.ts.map +1 -1
- package/dist/wgpuColorAdjustmentMaterialFeature.js +92 -3
- package/dist/wgpuColorAdjustmentMaterialFeature.js.map +1 -1
- package/dist/wgpuShapeData.d.ts.map +1 -1
- package/dist/wgpuShapeData.js +6 -0
- package/dist/wgpuShapeData.js.map +1 -1
- package/dist/wgpuShapeMesh.d.ts +2 -1
- package/dist/wgpuShapeMesh.d.ts.map +1 -1
- package/dist/wgpuShapeMesh.js +46 -38
- package/dist/wgpuShapeMesh.js.map +1 -1
- package/package.json +20 -18
- package/src/wgpuCache.test.ts +3 -0
- package/src/wgpuColorAdjustmentMaterialFeature.test.ts +3 -0
- package/src/wgpuMeshShapeRenderer.test.ts +2 -0
- package/src/wgpuRasterShapeRenderer.test.ts +2 -0
- package/src/wgpuShape.test.ts +2 -0
- package/src/wgpuShapeData.test.ts +4 -0
- package/src/wgpuShapeMesh.test.ts +147 -7
package/dist/wgpuCache.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuCache.d.ts","sourceRoot":"","sources":["../src/wgpuCache.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EACV,MAAM,EACN,eAAe,EAEf,WAAW,EACX,yBAAyB,EAEzB,eAAe,EACf,gBAAgB,EACjB,MAAM,0BAA0B,CAAC;AAMlC;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,eAAe,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"wgpuCache.d.ts","sourceRoot":"","sources":["../src/wgpuCache.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EACV,MAAM,EACN,eAAe,EAEf,WAAW,EACX,yBAAyB,EAEzB,eAAe,EACf,gBAAgB,EACjB,MAAM,0BAA0B,CAAC;AAMlC;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,eAAe,GAAG,eAAe,CAyFlF;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAElE;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,eAAe,EACtB,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,gBAAgB,CAUlB;AAID,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,eAAe,GAAG,eAAe,CAErF;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,GAAG,gBAAgB,GAAG,IAAI,CAE5G;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,eAAe,EAC3B,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAC5C,OAAO,CAuET;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI,CAOvF;AA0BD,eAAO,MAAM,8BAA8B,EAAE,eAG5C,CAAC"}
|
package/dist/wgpuCache.js
CHANGED
|
@@ -83,7 +83,9 @@ export function createWgpuCacheState(screenState) {
|
|
|
83
83
|
cacheRuntime.quadBatchWriterSampler = null;
|
|
84
84
|
cacheRuntime.quadBatchWriterSmoothing = null;
|
|
85
85
|
// Propagate the opt-in color-adjustment fold + guard so tinted nodes inside a cached subtree fold the
|
|
86
|
-
// same way when baked offscreen.
|
|
86
|
+
// same way when baked offscreen. Accumulation uses its independent base-runtime slot; per-batch CT
|
|
87
|
+
// data lives on cacheRuntime and grows lazily.
|
|
88
|
+
cacheRuntime.colorAdjustmentResolver = screenRuntime.colorAdjustmentResolver;
|
|
87
89
|
cacheRuntime.wgpuColorAdjustmentMaterialFeature = screenRuntime.wgpuColorAdjustmentMaterialFeature;
|
|
88
90
|
cacheRuntime.wgpuColorAdjustmentMaterialFeatureGuard = screenRuntime.wgpuColorAdjustmentMaterialFeatureGuard;
|
|
89
91
|
// The bake state owns its own buffer pool (its flushes record into the same frame, so they must
|
package/dist/wgpuCache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuCache.js","sourceRoot":"","sources":["../src/wgpuCache.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"wgpuCache.js","sourceRoot":"","sources":["../src/wgpuCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuColorAdjustmentMaterialFeature.d.ts","sourceRoot":"","sources":["../src/wgpuColorAdjustmentMaterialFeature.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuColorAdjustmentMaterialFeature.d.ts","sourceRoot":"","sources":["../src/wgpuColorAdjustmentMaterialFeature.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAKV,eAAe,EAMhB,MAAM,0BAA0B,CAAC;AAYlC,wBAAgB,0CAA0C,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAKvF"}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
|
-
import { getWgpuRenderStateRuntime } from '@flighthq/render-wgpu/contract';
|
|
1
|
+
import { getWgpuBlendState, getWgpuRenderStateRuntime } from '@flighthq/render-wgpu/contract';
|
|
2
|
+
import { enableColorAdjustments } from '@flighthq/render/contract';
|
|
2
3
|
import { getWgpuQuadBatchPreludeWGSL } from './wgpuQuadBatchWriter';
|
|
3
|
-
|
|
4
|
+
import { drawWgpuShapeMeshBatch } from './wgpuShapeMesh';
|
|
5
|
+
// Enables the opt-in color-adjustment accumulator and inline fold on a WebGPU render state: the fused-color-matrix
|
|
4
6
|
// scene2d the sprite/quad batch draws through so a color adjustment (and, later, other pointwise
|
|
5
7
|
// adjustments) folds into the batch as per-instance storage data at @group(3) — replicated across the
|
|
6
8
|
// batch for a whole-batch tint, or varied per instance — without ever splitting the batch. Until a
|
|
7
|
-
// state calls this, its batch renderer carries none of this module's WGSL
|
|
9
|
+
// state calls this, its render proxies stay unadjusted and the batch renderer carries none of this module's WGSL
|
|
10
|
+
// (both tree-shake out) and
|
|
8
11
|
// recordWgpuQuadBatchColorScaleBias silently skips every tint. Idempotent; safe to call per state.
|
|
9
12
|
export function registerWgpuColorAdjustmentMaterialFeature(state) {
|
|
13
|
+
enableColorAdjustments(state);
|
|
10
14
|
const runtime = getWgpuRenderStateRuntime(state);
|
|
11
15
|
runtime.wgpuColorAdjustmentMaterialFeature = wgpuColorAdjustmentMaterialFeature;
|
|
12
16
|
if (runtime.quadBatchWriterColorScaleBiasMode === undefined)
|
|
@@ -450,6 +454,90 @@ function getColorBias(value, channel) {
|
|
|
450
454
|
return value.blueBias;
|
|
451
455
|
return value.alphaBias;
|
|
452
456
|
}
|
|
457
|
+
// Draws tessellated solid fills through the same opt-in scale/bias fold as quad batches. A shape has
|
|
458
|
+
// one resolved node adjustment, so the value is uploaded once in each per-mesh uniform rather than as
|
|
459
|
+
// vertex data. The source color remains premultiplied by mesh alpha × node alpha in the shared driver;
|
|
460
|
+
// the fragment shader preserves the established unpremultiply → adjust → repremultiply order.
|
|
461
|
+
function drawWgpuShapeMeshesColorScaleBias(state, renderProxy, meshes, buffers) {
|
|
462
|
+
const colorScaleBias = renderProxy.colorScaleBias;
|
|
463
|
+
const uniform = _shapeMeshColorScaleBiasUniformScratch;
|
|
464
|
+
uniform[16] = colorScaleBias.redScale;
|
|
465
|
+
uniform[17] = colorScaleBias.greenScale;
|
|
466
|
+
uniform[18] = colorScaleBias.blueScale;
|
|
467
|
+
uniform[19] = colorScaleBias.alphaScale;
|
|
468
|
+
uniform[20] = colorScaleBias.redBias;
|
|
469
|
+
uniform[21] = colorScaleBias.greenBias;
|
|
470
|
+
uniform[22] = colorScaleBias.blueBias;
|
|
471
|
+
uniform[23] = colorScaleBias.alphaBias;
|
|
472
|
+
drawWgpuShapeMeshBatch(state, renderProxy, meshes, buffers, ensureWgpuShapeMeshColorScaleBiasPipeline(state, renderProxy.blendMode), buffers.colorScaleBiasUniformBuffers, buffers.colorScaleBiasBindGroups, uniform);
|
|
473
|
+
}
|
|
474
|
+
function ensureWgpuShapeMeshColorScaleBiasPipeline(state, blendMode) {
|
|
475
|
+
let cache = _shapeMeshColorScaleBiasPipelines.get(state.device);
|
|
476
|
+
if (cache === undefined) {
|
|
477
|
+
cache = new Map();
|
|
478
|
+
_shapeMeshColorScaleBiasPipelines.set(state.device, cache);
|
|
479
|
+
}
|
|
480
|
+
const runtime = getWgpuRenderStateRuntime(state);
|
|
481
|
+
const format = runtime.currentColorFormat ?? state.format;
|
|
482
|
+
const key = `${format}|${blendMode ?? 'null'}`;
|
|
483
|
+
const existing = cache.get(key);
|
|
484
|
+
if (existing !== undefined)
|
|
485
|
+
return existing;
|
|
486
|
+
const device = state.device;
|
|
487
|
+
const module = device.createShaderModule({ code: SHAPE_MESH_COLOR_SCALE_BIAS_WGSL });
|
|
488
|
+
const bindGroupLayout = device.createBindGroupLayout({
|
|
489
|
+
entries: [{ binding: 0, visibility: GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT, buffer: { type: 'uniform' } }],
|
|
490
|
+
});
|
|
491
|
+
const layout = device.createPipelineLayout({ bindGroupLayouts: [bindGroupLayout] });
|
|
492
|
+
const pipeline = device.createRenderPipeline({
|
|
493
|
+
layout,
|
|
494
|
+
vertex: {
|
|
495
|
+
module,
|
|
496
|
+
entryPoint: 'vs_main',
|
|
497
|
+
buffers: [{ arrayStride: 8, attributes: [{ shaderLocation: 0, offset: 0, format: 'float32x2' }] }],
|
|
498
|
+
},
|
|
499
|
+
fragment: {
|
|
500
|
+
module,
|
|
501
|
+
entryPoint: 'fs_main',
|
|
502
|
+
targets: [{ format, blend: getWgpuBlendState(blendMode) }],
|
|
503
|
+
},
|
|
504
|
+
primitive: { topology: 'triangle-list', cullMode: 'none' },
|
|
505
|
+
depthStencil: {
|
|
506
|
+
format: 'depth24plus-stencil8',
|
|
507
|
+
depthWriteEnabled: false,
|
|
508
|
+
depthCompare: 'always',
|
|
509
|
+
stencilFront: { compare: 'equal', passOp: 'keep', failOp: 'keep', depthFailOp: 'keep' },
|
|
510
|
+
stencilBack: { compare: 'equal', passOp: 'keep', failOp: 'keep', depthFailOp: 'keep' },
|
|
511
|
+
stencilReadMask: 0xff,
|
|
512
|
+
stencilWriteMask: 0x00,
|
|
513
|
+
},
|
|
514
|
+
});
|
|
515
|
+
const created = { pipeline, bindGroupLayout };
|
|
516
|
+
cache.set(key, created);
|
|
517
|
+
return created;
|
|
518
|
+
}
|
|
519
|
+
const SHAPE_MESH_COLOR_SCALE_BIAS_WGSL = /* wgsl */ `
|
|
520
|
+
${WGPU_COLOR_ADJUSTMENT_FRAGMENT_CHUNK}
|
|
521
|
+
struct ShapeMeshUniforms {
|
|
522
|
+
matrix : mat3x3f,
|
|
523
|
+
color : vec4f,
|
|
524
|
+
colorScale : vec4f,
|
|
525
|
+
colorBias : vec4f,
|
|
526
|
+
}
|
|
527
|
+
@group(0) @binding(0) var<uniform> u : ShapeMeshUniforms;
|
|
528
|
+
@vertex fn vs_main(@location(0) position : vec2f) -> @builtin(position) vec4f {
|
|
529
|
+
let p = u.matrix * vec3f(position, 1.0);
|
|
530
|
+
return vec4f(p.x, p.y, 0.0, 1.0);
|
|
531
|
+
}
|
|
532
|
+
@fragment fn fs_main() -> @location(0) vec4f {
|
|
533
|
+
if (u.color.a <= 0.0) { discard; }
|
|
534
|
+
var color = vec4f(u.color.rgb / u.color.a, u.color.a);
|
|
535
|
+
color = applyFlightColorAdjustment(color, u.colorScale, u.colorBias);
|
|
536
|
+
return vec4f(color.rgb * color.a, color.a);
|
|
537
|
+
}
|
|
538
|
+
`;
|
|
539
|
+
const _shapeMeshColorScaleBiasPipelines = new WeakMap();
|
|
540
|
+
const _shapeMeshColorScaleBiasUniformScratch = new Float32Array(24);
|
|
453
541
|
const COLOR_SCALE_BIAS_WGSL = /* wgsl */ `
|
|
454
542
|
${WGPU_COLOR_ADJUSTMENT_FRAGMENT_CHUNK}
|
|
455
543
|
@group(3) @binding(0) var<storage, read> ctData : array<f32>;
|
|
@@ -566,6 +654,7 @@ const _colorMatrixModules = new WeakMap();
|
|
|
566
654
|
const wgpuColorAdjustmentMaterialFeature = {
|
|
567
655
|
fragmentShaderChunk: WGPU_COLOR_ADJUSTMENT_FRAGMENT_CHUNK,
|
|
568
656
|
matrixFragmentShaderChunk: WGPU_COLOR_MATRIX_FRAGMENT_CHUNK,
|
|
657
|
+
drawShapeMeshes: drawWgpuShapeMeshesColorScaleBias,
|
|
569
658
|
record: recordWgpuColorAdjustment,
|
|
570
659
|
resolveFlush: resolveWgpuColorAdjustmentFlush,
|
|
571
660
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuColorAdjustmentMaterialFeature.js","sourceRoot":"","sources":["../src/wgpuColorAdjustmentMaterialFeature.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"wgpuColorAdjustmentMaterialFeature.js","sourceRoot":"","sources":["../src/wgpuColorAdjustmentMaterialFeature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC9F,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAcnE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,mHAAmH;AACnH,iGAAiG;AACjG,sGAAsG;AACtG,mGAAmG;AACnG,iHAAiH;AACjH,4BAA4B;AAC5B,mGAAmG;AACnG,MAAM,UAAU,0CAA0C,CAAC,KAAsB;IAC/E,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAC9B,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjD,OAAO,CAAC,kCAAkC,GAAG,kCAAkC,CAAC;IAChF,IAAI,OAAO,CAAC,iCAAiC,KAAK,SAAS;QAAE,OAAO,CAAC,iCAAiC,GAAG,YAAY,CAAC;AACxH,CAAC;AAED,4FAA4F;AAC5F,qGAAqG;AACrG,yDAAyD;AACzD,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAClC,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAE/B,2GAA2G;AAC3G,mGAAmG;AACnG,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,eAAe,GAAG,CAAC,CAAC;AAC1B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAC/B,MAAM,cAAc,GAAG,CAAC,CAAC;AAIzB,oGAAoG;AACpG,kGAAkG;AAClG,MAAM,oCAAoC,GAAG,UAAU,CAAC;;;;CAIvD,CAAC;AACF,MAAM,gCAAgC,GAAG,UAAU,CAAC;;;;;;;;;;;;CAYnD,CAAC;AAEF,uGAAuG;AACvG,wFAAwF;AACxF,SAAS,yBAAyB,CAChC,OAA+B,EAC/B,cAAsD,EACtD,aAAqB;IAErB,MAAM,IAAI,GAAG,OAAO,CAAC,iCAAiC,IAAI,YAAY,CAAC;IACvE,MAAM,IAAI,GAAG,cAAc,IAAI,IAAI,CAAC;IAEpC,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;QAC5B,4BAA4B,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;QAC3D,OAAO;IACT,CAAC;IAED,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;QAC1B,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO;QAC1B,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,CAAC,iCAAiC,GAAG,eAAe,CAAC;YAC5D,OAAO,CAAC,oCAAoC,GAAG,IAAI,CAAC;YACpD,OAAO;QACT,CAAC;QACD,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,gDAAgD,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;YAC/E,4BAA4B,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QACD,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACxB,oDAAoD,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;YACnF,2BAA2B,CAAC,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACN,qDAAqD,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;YACpF,+BAA+B,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;QAChE,CAAC;QACD,OAAO;IACT,CAAC;IAED,IAAI,IAAI,KAAK,eAAe,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,OAAO,CAAC,oCAAoC,IAAI,IAAI,CAAC;QACrE,IAAI,4BAA4B,CAAC,IAAI,EAAE,OAAO,CAAC;YAAE,OAAO;QACxD,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YAChF,gDAAgD,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;YAClF,4BAA4B,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QACD,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,aAAa,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YAC3D,oDAAoD,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;YACtF,2BAA2B,CAAC,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACN,qDAAqD,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;YACvF,+BAA+B,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;QAChE,CAAC;QACD,OAAO;IACT,CAAC;IAED,IAAI,IAAI,KAAK,mBAAmB,EAAE,CAAC;QACjC,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,kCAAkC,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YAC3D,4BAA4B,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QACD,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACxB,2BAA2B,CAAC,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACN,qCAAqC,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YAC9D,+BAA+B,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;QAChE,CAAC;QACD,OAAO;IACT,CAAC;IAED,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,iCAAiC,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC1D,4BAA4B,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;QAC3D,OAAO;IACT,CAAC;IACD,+BAA+B,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;AAChE,CAAC;AAED,mGAAmG;AACnG,sGAAsG;AACtG,2GAA2G;AAC3G,kBAAkB;AAClB,SAAS,+BAA+B,CAAC,KAAsB,EAAE,KAAa;IAC5E,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,OAAO,CAAC,iCAAiC,IAAI,YAAY,CAAC;IACzE,IAAI,MAAM,KAAK,YAAY;QAAE,OAAO,IAAI,CAAC;IACzC,IAAI,MAAM,KAAK,eAAe,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,oCAAqC,CAAC;QAC9D,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,iCAAiC,GAAG,cAAc,CAAC;YAC3D,yCAAyC,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACrE,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBACxB,OAAO,CAAC,iCAAiC,GAAG,mBAAmB,CAAC;gBAChE,wCAAwC,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;YACvE,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,iCAAiC,GAAG,oBAAoB,CAAC;gBACjE,4CAA4C,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,YAAY,GAAG,OAAO,CAAC,iCAAiC,CAAC;IAC/D,OAAO,CAAC,iCAAiC,GAAG,YAAY,CAAC;IACzD,OAAO,CAAC,oCAAoC,GAAG,IAAI,CAAC;IACpD,IAAI,YAAY,KAAK,mBAAmB,EAAE,CAAC;QACzC,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,4BAA6B;YAC3C,MAAM,EAAE,CAAC;YACT,MAAM,EAAE,sCAAsC,CAAC,KAAK,CAAC;SACtD,CAAC;IACJ,CAAC;IACD,IAAI,YAAY,KAAK,cAAc,EAAE,CAAC;QACpC,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,8BAA+B;YAC7C,MAAM,EAAE,mBAAmB;YAC3B,MAAM,EAAE,uCAAuC,CAAC,KAAK,CAAC;SACvD,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,iCAAkC;QAChD,MAAM,EAAE,uBAAuB;QAC/B,MAAM,EAAE,0CAA0C,CAAC,KAAK,CAAC;KAC1D,CAAC;AACJ,CAAC;AAED,qGAAqG;AACrG,gFAAgF;AAChF,SAAS,4BAA4B,CACnC,CAAuC,EACvC,CAAuC;IAEvC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACzB,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,iBAAiB,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QACjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,EAAE,CAAC,EAAE;YAAE,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAC;QAC9E,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;QAC7C,IACE,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC;YACvD,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,EACrD,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,mGAAmG;AACnG,qBAAqB;AACrB,SAAS,gCAAgC,CAAC,OAA+B,EAAE,YAAoB;IAC7F,MAAM,QAAQ,GAAG,OAAO,CAAC,iCAAiC,CAAC;IAC3D,IAAI,QAAQ,KAAK,SAAS,IAAI,YAAY,IAAI,QAAQ,CAAC,MAAM;QAAE,OAAO;IACtE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,uBAAuB,GAAG,GAAG,CAAC,CAAC;IACnG,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC;IACxC,IAAI,QAAQ,KAAK,SAAS;QAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChD,OAAO,CAAC,iCAAiC,GAAG,KAAK,CAAC;AACpD,CAAC;AAED,sGAAsG;AACtG,sGAAsG;AACtG,SAAS,4CAA4C,CACnD,OAA+B,EAC/B,cAA2D,EAC3D,KAAa;IAEb,gCAAgC,CAAC,OAAO,EAAE,KAAK,GAAG,uBAAuB,CAAC,CAAC;IAC3E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE;QAAE,+BAA+B,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;AAC9F,CAAC;AAED,SAAS,wCAAwC,CAAC,OAA+B,EAAE,IAAY,EAAE,KAAa;IAC5G,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE;QAAE,2BAA2B,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAChF,CAAC;AAED,SAAS,yCAAyC,CAChD,OAA+B,EAC/B,MAAyB,EACzB,KAAa;IAEb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE;QAAE,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;AACnF,CAAC;AAED,yGAAyG;AACzG,uGAAuG;AACvG,gGAAgG;AAChG,0EAA0E;AAC1E,SAAS,0CAA0C,CAAC,KAAsB;IACxE,MAAM,MAAM,GAAG,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxD,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IACxC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC;QAC7C,IAAI,EAAE,2BAA2B,EAAE,GAAG,qBAAqB;KAC5D,CAAC,CAAC;IACH,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,sCAAsC,CAAC,KAAsB;IACpE,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpD,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IACxC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC;QAC7C,IAAI,EAAE,2BAA2B,EAAE,GAAG,gBAAgB;KACvD,CAAC,CAAC;IACH,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,uCAAuC,CAAC,KAAsB;IACrE,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACrD,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IACxC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC;QAC7C,IAAI,EAAE,2BAA2B,EAAE,GAAG,iBAAiB;KACxD,CAAC,CAAC;IACH,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,yFAAyF;AACzF,8EAA8E;AAC9E,SAAS,qDAAqD,CAC5D,OAA+B,EAC/B,aAAqB,EACrB,IAAwD;IAExD,OAAO,CAAC,iCAAiC,GAAG,oBAAoB,CAAC;IACjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE;QAAE,+BAA+B,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,oDAAoD,CAC3D,OAA+B,EAC/B,aAAqB,EACrB,IAAwD;IAExD,OAAO,CAAC,iCAAiC,GAAG,mBAAmB,CAAC;IAChE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE;QAAE,2BAA2B,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,CAAE,EAAE,CAAC,CAAC,CAAC;AACxG,CAAC;AAED,SAAS,qCAAqC,CAAC,OAA+B,EAAE,aAAqB;IACnG,OAAO,CAAC,iCAAiC,GAAG,oBAAoB,CAAC;IACjE,MAAM,MAAM,GAAG,OAAO,CAAC,4BAA6B,CAAC;IACrD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE;QAAE,yCAAyC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC3G,CAAC;AAED,SAAS,gDAAgD,CACvD,OAA+B,EAC/B,aAAqB,EACrB,IAA0C;IAE1C,OAAO,CAAC,iCAAiC,GAAG,cAAc,CAAC;IAC3D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE;QAAE,4BAA4B,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACzF,CAAC;AAED,SAAS,kCAAkC,CAAC,OAA+B,EAAE,aAAqB;IAChG,MAAM,MAAM,GAAG,OAAO,CAAC,4BAA6B,CAAC;IACrD,OAAO,CAAC,iCAAiC,GAAG,cAAc,CAAC;IAC3D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE;QAAE,sCAAsC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACxG,CAAC;AAED,SAAS,iCAAiC,CAAC,OAA+B,EAAE,aAAqB;IAC/F,MAAM,MAAM,GAAG,OAAO,CAAC,iCAAkC,CAAC;IAC1D,OAAO,CAAC,iCAAiC,GAAG,cAAc,CAAC;IAC3D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,kCAAkC,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,GAAG,uBAAuB,EAAE,CAAC,CAAC,CAAC;IACtF,CAAC;AACH,CAAC;AAED,wGAAwG;AACxG,kFAAkF;AAClF,SAAS,+BAA+B,CACtC,OAA+B,EAC/B,cAAkE,EAClE,aAAqB;IAErB,MAAM,MAAM,GAAG,aAAa,GAAG,uBAAuB,CAAC;IACvD,gCAAgC,CAAC,OAAO,EAAE,MAAM,GAAG,uBAAuB,CAAC,CAAC;IAC5E,MAAM,GAAG,GAAG,OAAO,CAAC,iCAAkC,CAAC;IACvD,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;QAC5B,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;YAC7C,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,aAAa,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC/D,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;SAAM,CAAC;QACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACpB,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACpB,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACpB,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACpB,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACpB,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACpB,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAED,SAAS,4BAA4B,CACnC,OAA+B,EAC/B,UAAgD,EAChD,aAAqB;IAErB,MAAM,MAAM,GAAG,aAAa,GAAG,mBAAmB,CAAC;IACnD,IAAI,GAAG,GAAG,OAAO,CAAC,8BAA8B,CAAC;IACjD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,GAAG,GAAG,IAAI,YAAY,CAAC,mBAAmB,GAAG,GAAG,CAAC,CAAC;QAClD,OAAO,CAAC,8BAA8B,GAAG,GAAG,CAAC;IAC/C,CAAC;SAAM,IAAI,MAAM,GAAG,mBAAmB,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;QACrD,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,mBAAmB,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QACvF,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACf,OAAO,CAAC,8BAA8B,GAAG,KAAK,CAAC;QAC/C,GAAG,GAAG,KAAK,CAAC;IACd,CAAC;IACD,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QACxB,wBAAwB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;SAAM,IAAI,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC;QACzC,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC;YACjC,MAAM,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC;YACvB,MAAM,MAAM,GAAG,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC;YAChC,GAAG,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,CAAE,CAAC;YAClC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;YAC1C,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;YAC1C,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;YAC1C,GAAG,CAAC,MAAM,GAAG,EAAE,GAAG,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;QACnD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,wBAAwB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACtC,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;YAC7C,GAAG,CAAC,MAAM,GAAG,OAAO,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YACzE,GAAG,CAAC,MAAM,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,wBAAwB,CAAC,GAAiB,EAAE,MAAc;IACjE,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAAC,CAAC;IAClD,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,sCAAsC,CAC7C,OAA+B,EAC/B,UAAkB,EAClB,aAAqB;IAErB,4BAA4B,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;IAC3D,MAAM,GAAG,GAAG,OAAO,CAAC,8BAA+B,CAAC;IACpD,MAAM,MAAM,GAAG,aAAa,GAAG,mBAAmB,CAAC;IACnD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;IACxC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;IACpD,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;IACtD,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;AACxD,CAAC;AAED,SAAS,kCAAkC,CACzC,OAA+B,EAC/B,MAAoB,EACpB,YAAoB,EACpB,aAAqB;IAErB,4BAA4B,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;IAC3D,MAAM,GAAG,GAAG,OAAO,CAAC,8BAA+B,CAAC;IACpD,MAAM,MAAM,GAAG,aAAa,GAAG,mBAAmB,CAAC;IACnD,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;QAC7C,GAAG,CAAC,MAAM,GAAG,OAAO,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,MAAM,CAAC,YAAY,GAAG,OAAO,CAAE,CAAC;QACtE,GAAG,CAAC,MAAM,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,MAAM,CAAC,YAAY,GAAG,CAAC,GAAG,OAAO,CAAE,CAAC;IACnE,CAAC;AACH,CAAC;AAED,SAAS,2BAA2B,CAAC,OAA+B,EAAE,IAAY,EAAE,aAAqB;IACvG,IAAI,IAAI,GAAG,OAAO,CAAC,4BAA4B,CAAC;IAChD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,IAAI,GAAG,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC;QAC5B,OAAO,CAAC,4BAA4B,GAAG,IAAI,CAAC;IAC9C,CAAC;SAAM,IAAI,aAAa,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,GAAG,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5E,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChB,OAAO,CAAC,4BAA4B,GAAG,KAAK,CAAC;QAC7C,IAAI,GAAG,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC,aAAa,CAAC,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,yCAAyC,CAChD,OAA+B,EAC/B,UAAkB,EAClB,aAAqB;IAErB,MAAM,MAAM,GAAG,aAAa,GAAG,uBAAuB,CAAC;IACvD,+BAA+B,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG,OAAO,CAAC,iCAAkC,CAAC;IACxD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;IACzC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;IACrD,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;IACtD,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;AACxD,CAAC;AAED,SAAS,aAAa,CAAC,KAAyD;IAC9E,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,UAAU,CAAC;IACtC,IAAI,kBAAkB,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC;IACvD,IACE,KAAK,CAAC,OAAO,KAAK,CAAC;QACnB,KAAK,CAAC,SAAS,KAAK,CAAC;QACrB,KAAK,CAAC,QAAQ,KAAK,CAAC;QACpB,KAAK,CAAC,SAAS,KAAK,CAAC;QACrB,KAAK,CAAC,QAAQ,GAAG,CAAC;QAClB,KAAK,CAAC,QAAQ,GAAG,CAAC;QAClB,KAAK,CAAC,UAAU,GAAG,CAAC;QACpB,KAAK,CAAC,UAAU,GAAG,CAAC;QACpB,KAAK,CAAC,SAAS,GAAG,CAAC;QACnB,KAAK,CAAC,SAAS,GAAG,CAAC;QACnB,KAAK,CAAC,UAAU,GAAG,CAAC;QACpB,KAAK,CAAC,UAAU,GAAG,CAAC,EACpB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,CACL,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QACvC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QAC1C,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC;QACrC,CAAC,CACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,KAA2C;IACpE,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY;IACxC,OAAO,CACL,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAChH,CAAC,CACF,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAkD;IAC5E,OAAO,MAAM,IAAI,KAAK,CAAC;AACzB,CAAC;AAED,SAAS,aAAa,CAAC,KAAkD,EAAE,OAAe;IACxF,IAAI,kBAAkB,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;IACzF,IAAI,OAAO,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,QAAQ,CAAC;IACzC,IAAI,OAAO,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,UAAU,CAAC;IAC3C,IAAI,OAAO,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,SAAS,CAAC;IAC1C,OAAO,KAAK,CAAC,UAAU,CAAC;AAC1B,CAAC;AAED,SAAS,YAAY,CAAC,KAAkD,EAAE,OAAe;IACvF,IAAI,kBAAkB,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IACxC,IAAI,OAAO,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,OAAO,CAAC;IACxC,IAAI,OAAO,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,SAAS,CAAC;IAC1C,IAAI,OAAO,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,QAAQ,CAAC;IACzC,OAAO,KAAK,CAAC,SAAS,CAAC;AACzB,CAAC;AAED,qGAAqG;AACrG,sGAAsG;AACtG,uGAAuG;AACvG,8FAA8F;AAC9F,SAAS,iCAAiC,CACxC,KAAsB,EACtB,WAA0B,EAC1B,MAAgC,EAChC,OAA6B;IAE7B,MAAM,cAAc,GAAG,WAAW,CAAC,cAAe,CAAC;IACnD,MAAM,OAAO,GAAG,sCAAsC,CAAC;IACvD,OAAO,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC;IACtC,OAAO,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,UAAU,CAAC;IACxC,OAAO,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,SAAS,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,UAAU,CAAC;IACxC,OAAO,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC;IACrC,OAAO,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,SAAS,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC;IACtC,OAAO,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,SAAS,CAAC;IACvC,sBAAsB,CACpB,KAAK,EACL,WAAW,EACX,MAAM,EACN,OAAO,EACP,yCAAyC,CAAC,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,EACvE,OAAO,CAAC,4BAA4B,EACpC,OAAO,CAAC,wBAAwB,EAChC,OAAO,CACR,CAAC;AACJ,CAAC;AAED,SAAS,yCAAyC,CAChD,KAAsB,EACtB,SAAqC;IAErC,IAAI,KAAK,GAAG,iCAAiC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,KAAK,GAAG,IAAI,GAAG,EAAE,CAAC;QAClB,iCAAiC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,OAAO,CAAC,kBAAkB,IAAI,KAAK,CAAC,MAAM,CAAC;IAC1D,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;IAC/C,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChC,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAE5C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,gCAAgC,EAAE,CAAC,CAAC;IACrF,MAAM,eAAe,GAAG,MAAM,CAAC,qBAAqB,CAAC;QACnD,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC;KACpH,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,CAAC,oBAAoB,CAAC,EAAE,gBAAgB,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IACpF,MAAM,QAAQ,GAAG,MAAM,CAAC,oBAAoB,CAAC;QAC3C,MAAM;QACN,MAAM,EAAE;YACN,MAAM;YACN,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;SACnG;QACD,QAAQ,EAAE;YACR,MAAM;YACN,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC;SAC3D;QACD,SAAS,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,EAAE;QAC1D,YAAY,EAAE;YACZ,MAAM,EAAE,sBAAsB;YAC9B,iBAAiB,EAAE,KAAK;YACxB,YAAY,EAAE,QAAQ;YACtB,YAAY,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;YACvF,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;YACtF,eAAe,EAAE,IAAI;YACrB,gBAAgB,EAAE,IAAI;SACvB;KACF,CAAC,CAAC;IACH,MAAM,OAAO,GAA0B,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;IACrE,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACxB,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,gCAAgC,GAAG,UAAU,CAAC;EAClD,oCAAoC;;;;;;;;;;;;;;;;;;CAkBrC,CAAC;AAEF,MAAM,iCAAiC,GAAG,IAAI,OAAO,EAAiD,CAAC;AACvG,MAAM,sCAAsC,GAAG,IAAI,YAAY,CAAC,EAAE,CAAC,CAAC;AAEpE,MAAM,qBAAqB,GAAG,UAAU,CAAC;EACvC,oCAAoC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmCrC,CAAC;AAEF,MAAM,gBAAgB,GAAG,UAAU,CAAC;EAClC,oCAAoC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BrC,CAAC;AAEF,MAAM,iBAAiB,GAAG,UAAU,CAAC;EACnC,gCAAgC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsCjC,CAAC;AAEF,MAAM,sBAAsB,GAAG,IAAI,OAAO,EAA8B,CAAC;AACzE,MAAM,kBAAkB,GAAG,IAAI,OAAO,EAA8B,CAAC;AACrE,MAAM,mBAAmB,GAAG,IAAI,OAAO,EAA8B,CAAC;AAEtE,MAAM,kCAAkC,GAAuC;IAC7E,mBAAmB,EAAE,oCAAoC;IACzD,yBAAyB,EAAE,gCAAgC;IAC3D,eAAe,EAAE,iCAAiC;IAClD,MAAM,EAAE,yBAAyB;IACjC,YAAY,EAAE,+BAA+B;CAC9C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuShapeData.d.ts","sourceRoot":"","sources":["../src/wgpuShapeData.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,EACV,YAAY,EACZ,WAAW,EACX,eAAe,EACf,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,0BAA0B,CAAC;AAMlC,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,qBAAqB,GAAG,sBAAsB,CAajG;AAID,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"wgpuShapeData.d.ts","sourceRoot":"","sources":["../src/wgpuShapeData.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,EACV,YAAY,EACZ,WAAW,EACX,eAAe,EACf,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,0BAA0B,CAAC;AAMlC,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,qBAAqB,GAAG,sBAAsB,CAajG;AAID,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,GAAG,YAAY,CAoB1F;AAKD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAyBrF;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,qBAAqB,GAAG,IAAI,CAEjF"}
|
package/dist/wgpuShapeData.js
CHANGED
|
@@ -36,6 +36,8 @@ export function createWgpuShapeData(_state, _source) {
|
|
|
36
36
|
indexCapacities: [],
|
|
37
37
|
uniformBuffers: [],
|
|
38
38
|
bindGroups: [],
|
|
39
|
+
colorScaleBiasUniformBuffers: [],
|
|
40
|
+
colorScaleBiasBindGroups: [],
|
|
39
41
|
},
|
|
40
42
|
});
|
|
41
43
|
}
|
|
@@ -62,12 +64,16 @@ export function destroyWgpuShapeData(state, data) {
|
|
|
62
64
|
buffer.destroy();
|
|
63
65
|
for (const buffer of b.uniformBuffers)
|
|
64
66
|
buffer.destroy();
|
|
67
|
+
for (const buffer of b.colorScaleBiasUniformBuffers)
|
|
68
|
+
buffer.destroy();
|
|
65
69
|
b.vertexBuffers.length = 0;
|
|
66
70
|
b.vertexCapacities.length = 0;
|
|
67
71
|
b.indexBuffers.length = 0;
|
|
68
72
|
b.indexCapacities.length = 0;
|
|
69
73
|
b.uniformBuffers.length = 0;
|
|
70
74
|
b.bindGroups.length = 0;
|
|
75
|
+
b.colorScaleBiasUniformBuffers.length = 0;
|
|
76
|
+
b.colorScaleBiasBindGroups.length = 0;
|
|
71
77
|
}
|
|
72
78
|
export function getWgpuShapeData(data) {
|
|
73
79
|
return getWgpuRendererData(data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuShapeData.js","sourceRoot":"","sources":["../src/wgpuShapeData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAU3E,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEjF,iGAAiG;AACjG,sGAAsG;AACtG,MAAM,UAAU,6BAA6B,CAAC,IAA2B;IACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;IAC9B,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO,QAAQ,CAAC;IACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;IACjB,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAClB,MAAM,OAAO,GAA2B;QACtC,MAAM;QACN,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAE;QAC7B,KAAK,EAAE,mBAAmB,CAAC,MAAM,CAAC;KACnC,CAAC;IACF,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACvB,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,qGAAqG;AACrG,+DAA+D;AAC/D,MAAM,UAAU,mBAAmB,CAAC,MAAmB,EAAE,OAAmB;IAC1E,OAAO,sBAAsB,CAAwB;QACnD,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;
|
|
1
|
+
{"version":3,"file":"wgpuShapeData.js","sourceRoot":"","sources":["../src/wgpuShapeData.ts"],"names":[],"mappings":"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"}
|
package/dist/wgpuShapeMesh.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
import type { RenderProxy2D, WgpuRenderState, WgpuShapeMesh, WgpuShapeMeshBuffers } from '@flighthq/types/contract';
|
|
1
|
+
import type { RenderProxy2D, WgpuRenderState, WgpuShapeMesh, WgpuShapeMeshBuffers, WgpuShapeMeshPipeline } from '@flighthq/types/contract';
|
|
2
|
+
export declare function drawWgpuShapeMeshBatch(state: WgpuRenderState, renderProxy: RenderProxy2D, meshes: readonly WgpuShapeMesh[], buffers: WgpuShapeMeshBuffers, pipelineEntry: WgpuShapeMeshPipeline, uniformBuffers: GPUBuffer[], bindGroups: GPUBindGroup[], uniformData: Float32Array): void;
|
|
2
3
|
export declare function drawWgpuShapeMeshes(state: WgpuRenderState, renderProxy: RenderProxy2D, meshes: readonly WgpuShapeMesh[], buffers: WgpuShapeMeshBuffers): void;
|
|
3
4
|
//# sourceMappingURL=wgpuShapeMesh.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuShapeMesh.d.ts","sourceRoot":"","sources":["../src/wgpuShapeMesh.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EACf,aAAa,EACb,oBAAoB,
|
|
1
|
+
{"version":3,"file":"wgpuShapeMesh.d.ts","sourceRoot":"","sources":["../src/wgpuShapeMesh.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EACf,aAAa,EACb,oBAAoB,EACpB,qBAAqB,EACtB,MAAM,0BAA0B,CAAC;AAuBlC,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,SAAS,EAAE,EAC3B,UAAU,EAAE,YAAY,EAAE,EAC1B,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
|
@@ -14,12 +14,11 @@ import { flushWgpuQuadBatchWriter } from './wgpuQuadBatchWriter';
|
|
|
14
14
|
//
|
|
15
15
|
// The shape-stroke-ring-fallback functional scene exercises this path through the headless software
|
|
16
16
|
// adapter and keeps its closed-ring pixels in parity with Canvas and WebGL.
|
|
17
|
-
// Draws the shape's tessellated fill meshes
|
|
18
|
-
// pipeline
|
|
19
|
-
//
|
|
20
|
-
//
|
|
21
|
-
|
|
22
|
-
export function drawWgpuShapeMeshes(state, renderProxy, meshes, buffers) {
|
|
17
|
+
// Draws the shape's tessellated fill meshes through `pipelineEntry`. `uniformData` already carries any
|
|
18
|
+
// pipeline-specific tail after the shared matrix + color fields; the driver writes only those common
|
|
19
|
+
// fields. Supplying distinct uniform/bind-group arrays lets the opt-in color-adjustment feature own a
|
|
20
|
+
// larger uniform without taxing or invalidating the lean path's 64-byte bindings.
|
|
21
|
+
export function drawWgpuShapeMeshBatch(state, renderProxy, meshes, buffers, pipelineEntry, uniformBuffers, bindGroups, uniformData) {
|
|
23
22
|
if (meshes.length === 0)
|
|
24
23
|
return;
|
|
25
24
|
const runtime = getWgpuRenderStateRuntime(state);
|
|
@@ -27,12 +26,11 @@ export function drawWgpuShapeMeshes(state, renderProxy, meshes, buffers) {
|
|
|
27
26
|
const pass = runtime.renderPass;
|
|
28
27
|
if (pass === null)
|
|
29
28
|
return;
|
|
30
|
-
const pipelineEntry = ensureShapeMeshPipeline(state, renderProxy.blendMode);
|
|
31
29
|
const device = state.device;
|
|
32
30
|
const queue = device.queue;
|
|
33
|
-
// Writes the projection·world matrix into uniform columns 0..11
|
|
34
|
-
// the
|
|
35
|
-
shapeMeshMatrix(state, renderProxy);
|
|
31
|
+
// Writes the projection·world matrix into uniform columns 0..11; per-mesh color fills 12..15 in
|
|
32
|
+
// the loop. Any pipeline-specific tail starts at 16 and is left untouched.
|
|
33
|
+
shapeMeshMatrix(state, renderProxy, uniformData);
|
|
36
34
|
pass.setPipeline(pipelineEntry.pipeline);
|
|
37
35
|
// The cleared stencil is 0, so at depth 0 'equal 0' passes everywhere; inside a contour clip only its
|
|
38
36
|
// stamped region equals currentMaskDepth, so the fill is confined to the clip.
|
|
@@ -45,7 +43,7 @@ export function drawWgpuShapeMeshes(state, renderProxy, meshes, buffers) {
|
|
|
45
43
|
const a = mesh.alpha * nodeAlpha;
|
|
46
44
|
if (a <= 0)
|
|
47
45
|
continue;
|
|
48
|
-
|
|
46
|
+
ensureShapeMeshUniform(state, pipelineEntry, uniformBuffers, bindGroups, i, uniformData.byteLength);
|
|
49
47
|
const vertexBuffer = ensureShapeMeshVertexBuffer(state, buffers, i, mesh.vertices.byteLength);
|
|
50
48
|
const indexBuffer = ensureShapeMeshIndexBuffer(state, buffers, i, mesh.indices.byteLength);
|
|
51
49
|
queue.writeBuffer(vertexBuffer, 0, mesh.vertices.buffer, mesh.vertices.byteOffset, mesh.vertices.byteLength);
|
|
@@ -54,17 +52,30 @@ export function drawWgpuShapeMeshes(state, renderProxy, meshes, buffers) {
|
|
|
54
52
|
const r = ((mesh.color >> 16) & 0xff) / 255;
|
|
55
53
|
const g = ((mesh.color >> 8) & 0xff) / 255;
|
|
56
54
|
const b = (mesh.color & 0xff) / 255;
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
queue.writeBuffer(
|
|
62
|
-
pass.setBindGroup(0,
|
|
55
|
+
uniformData[12] = r * a;
|
|
56
|
+
uniformData[13] = g * a;
|
|
57
|
+
uniformData[14] = b * a;
|
|
58
|
+
uniformData[15] = a;
|
|
59
|
+
queue.writeBuffer(uniformBuffers[i], 0, uniformData.buffer, uniformData.byteOffset, uniformData.byteLength);
|
|
60
|
+
pass.setBindGroup(0, bindGroups[i]);
|
|
63
61
|
pass.setVertexBuffer(0, vertexBuffer);
|
|
64
62
|
pass.setIndexBuffer(indexBuffer, 'uint16');
|
|
65
63
|
pass.drawIndexed(mesh.indices.length);
|
|
66
64
|
}
|
|
67
65
|
}
|
|
66
|
+
// Draws the shape's tessellated fill meshes. Delegates to the registered color-adjustment feature only
|
|
67
|
+
// for a resolved ColorScaleBias; a full color matrix remains outside this bounded fold. Otherwise the
|
|
68
|
+
// lean flat-color pipeline and 64-byte uniform stay unchanged and carry no adjustment shader code.
|
|
69
|
+
export function drawWgpuShapeMeshes(state, renderProxy, meshes, buffers) {
|
|
70
|
+
if (meshes.length === 0)
|
|
71
|
+
return;
|
|
72
|
+
const fold = getWgpuRenderStateRuntime(state).wgpuColorAdjustmentMaterialFeature;
|
|
73
|
+
if (fold?.drawShapeMeshes !== undefined && renderProxy.colorMatrix == null && renderProxy.colorScaleBias != null) {
|
|
74
|
+
fold.drawShapeMeshes(state, renderProxy, meshes, buffers);
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
drawWgpuShapeMeshBatch(state, renderProxy, meshes, buffers, ensureShapeMeshPipeline(state, renderProxy.blendMode), buffers.uniformBuffers, buffers.bindGroups, _shapeMeshUniformScratch);
|
|
78
|
+
}
|
|
68
79
|
const SHAPE_MESH_WGSL = /* wgsl */ `
|
|
69
80
|
struct ShapeMeshUniforms { matrix : mat3x3f, color : vec4f }
|
|
70
81
|
@group(0) @binding(0) var<uniform> u : ShapeMeshUniforms;
|
|
@@ -98,19 +109,18 @@ function ensureShapeMeshIndexBuffer(state, buffers, meshIndex, byteLength) {
|
|
|
98
109
|
// Lazily builds (once per shape) the uniform buffer + bind group, then returns the scratch float view the
|
|
99
110
|
// caller fills with the matrix (uploaded once) and per-mesh color. The matrix columns are written here so
|
|
100
111
|
// every draw shares them; only color (floats 12..15) changes per mesh.
|
|
101
|
-
function ensureShapeMeshUniform(state, pipelineEntry,
|
|
102
|
-
if (
|
|
112
|
+
function ensureShapeMeshUniform(state, pipelineEntry, uniformBuffers, bindGroups, meshIndex, byteLength) {
|
|
113
|
+
if (uniformBuffers[meshIndex] === undefined) {
|
|
103
114
|
const uniformBuffer = state.device.createBuffer({
|
|
104
|
-
size:
|
|
115
|
+
size: byteLength,
|
|
105
116
|
usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
|
|
106
117
|
});
|
|
107
|
-
|
|
108
|
-
|
|
118
|
+
uniformBuffers[meshIndex] = uniformBuffer;
|
|
119
|
+
bindGroups[meshIndex] = state.device.createBindGroup({
|
|
109
120
|
layout: pipelineEntry.bindGroupLayout,
|
|
110
121
|
entries: [{ binding: 0, resource: { buffer: uniformBuffer } }],
|
|
111
122
|
});
|
|
112
123
|
}
|
|
113
|
-
return _shapeMeshUniformScratch;
|
|
114
124
|
}
|
|
115
125
|
function ensureShapeMeshPipeline(state, blendMode) {
|
|
116
126
|
const runtime = getWgpuRenderStateRuntime(state);
|
|
@@ -181,26 +191,24 @@ function ensureShapeMeshVertexBuffer(state, buffers, meshIndex, byteLength) {
|
|
|
181
191
|
// webgpuClipContours/webgpuDraw build it (so the fill lands in identical clip space). Each column is
|
|
182
192
|
// padded to 4 floats (vec3 -> vec4 std140-style layout). Writes into the shared scratch view; the color
|
|
183
193
|
// (floats 12..15) is filled per mesh by the caller.
|
|
184
|
-
function shapeMeshMatrix(state, renderProxy) {
|
|
194
|
+
function shapeMeshMatrix(state, renderProxy, out) {
|
|
185
195
|
const runtime = getWgpuRenderStateRuntime(state);
|
|
186
196
|
const viewport = runtime.renderTargetViewport ?? state.canvas;
|
|
187
197
|
const iw = 2 / (viewport.width || 1);
|
|
188
198
|
const ih = 2 / (viewport.height || 1);
|
|
189
199
|
const t = renderProxy.transform2D;
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
m[11] = 0;
|
|
203
|
-
return m;
|
|
200
|
+
out[0] = t.a * iw;
|
|
201
|
+
out[1] = -t.b * ih;
|
|
202
|
+
out[2] = 0;
|
|
203
|
+
out[3] = 0;
|
|
204
|
+
out[4] = t.c * iw;
|
|
205
|
+
out[5] = -t.d * ih;
|
|
206
|
+
out[6] = 0;
|
|
207
|
+
out[7] = 0;
|
|
208
|
+
out[8] = t.tx * iw - 1;
|
|
209
|
+
out[9] = -t.ty * ih + 1;
|
|
210
|
+
out[10] = 1;
|
|
211
|
+
out[11] = 0;
|
|
204
212
|
}
|
|
205
213
|
// Uploads uint16 indices to the index buffer. writeBuffer requires the byte count to be a multiple of 4,
|
|
206
214
|
// but a mesh with an odd index count (e.g. a single triangle, 3 indices = 6 bytes) is not; pad the upload
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuShapeMesh.js","sourceRoot":"","sources":["../src/wgpuShapeMesh.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAS9F,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,
|
|
1
|
+
{"version":3,"file":"wgpuShapeMesh.js","sourceRoot":"","sources":["../src/wgpuShapeMesh.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAS9F,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,yFAAyF;QACzF,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;QAC5C,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;QAC3C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;QACpC,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxB,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxB,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxB,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QACpB,KAAK,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;QAE5G,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;QACtC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AAED,uGAAuG;AACvG,sGAAsG;AACtG,mGAAmG;AACnG,MAAM,UAAU,mBAAmB,CACjC,KAAsB,EACtB,WAA0B,EAC1B,MAAgC,EAChC,OAA6B;IAE7B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAChC,MAAM,IAAI,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC,kCAAkC,CAAC;IACjF,IAAI,IAAI,EAAE,eAAe,KAAK,SAAS,IAAI,WAAW,CAAC,WAAW,IAAI,IAAI,IAAI,WAAW,CAAC,cAAc,IAAI,IAAI,EAAE,CAAC;QACjH,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC1D,OAAO;IACT,CAAC;IACD,sBAAsB,CACpB,KAAK,EACL,WAAW,EACX,MAAM,EACN,OAAO,EACP,uBAAuB,CAAC,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,EACrD,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,UAAU,EAClB,wBAAwB,CACzB,CAAC;AACJ,CAAC;AAED,MAAM,eAAe,GAAG,UAAU,CAAC;;;;;;;;CAQlC,CAAC;AAEF,uGAAuG;AACvG,MAAM,wBAAwB,GAAG,EAAE,CAAC;AACpC,MAAM,yBAAyB,GAAG,wBAAwB,GAAG,CAAC,CAAC;AAE/D,SAAS,0BAA0B,CACjC,KAAsB,EACtB,OAA6B,EAC7B,SAAiB,EACjB,UAAkB;IAElB,gGAAgG;IAChG,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAChD,IAAI,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAC7C,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC;QAC7E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;YACjD,CAAC,OAAO,CAAC,cAAc,IAAI,CAAC,OAAO,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC;YACjC,IAAI;YACJ,KAAK,EAAE,cAAc,CAAC,KAAK,GAAG,cAAc,CAAC,QAAQ;SACtD,CAAC,CAAC;QACH,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;QACzC,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IAC5C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,0GAA0G;AAC1G,0GAA0G;AAC1G,uEAAuE;AACvE,SAAS,sBAAsB,CAC7B,KAAsB,EACtB,aAAoC,EACpC,cAA2B,EAC3B,UAA0B,EAC1B,SAAiB,EACjB,UAAkB;IAElB,IAAI,cAAc,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;QAC5C,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC;YAC9C,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,QAAQ;SACxD,CAAC,CAAC;QACH,cAAc,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC;QAC1C,UAAU,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC;YACnD,MAAM,EAAE,aAAa,CAAC,eAAe;YACrC,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,CAAC;SAC/D,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAsB,EAAE,SAAqC;IAC5F,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,OAAO,CAAC,kBAAkB,IAAI,KAAK,CAAC,MAAM,CAAC;IAC1D,MAAM,KAAK,GAAG,OAAO,CAAC,kBAAkB,IAAI,CAAC,OAAO,CAAC,kBAAkB,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC;IACrF,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;IAC/C,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChC,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAE5C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,MAAM,CAAC,qBAAqB,CAAC;QACnD,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC;KACpH,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,CAAC,oBAAoB,CAAC,EAAE,gBAAgB,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IACpF,MAAM,aAAa,GAA4B;QAC7C,EAAE,WAAW,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,EAAE;KACxF,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,CAAC,oBAAoB,CAAC;QAC3C,MAAM;QACN,MAAM,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE;QACjE,QAAQ,EAAE;YACR,MAAM;YACN,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE;gBACP;oBACE,MAAM;oBACN,oFAAoF;oBACpF,oCAAoC;oBACpC,KAAK,EAAE,iBAAiB,CAAC,SAAS,CAAC;iBACpC;aACF;SACF;QACD,SAAS,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,EAAE;QAC1D,YAAY,EAAE;YACZ,MAAM,EAAE,sBAAsB;YAC9B,iBAAiB,EAAE,KAAK;YACxB,YAAY,EAAE,QAAQ;YACtB,yFAAyF;YACzF,YAAY,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;YACvF,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;YACtF,eAAe,EAAE,IAAI;YACrB,gBAAgB,EAAE,IAAI;SACvB;KACF,CAAC,CAAC;IAEH,MAAM,KAAK,GAA0B,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;IACnE,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACtB,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,2BAA2B,CAClC,KAAsB,EACtB,OAA6B,EAC7B,SAAiB,EACjB,UAAkB;IAElB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;IACrC,IAAI,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAC9C,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC;QAC9E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;YACjD,CAAC,OAAO,CAAC,cAAc,IAAI,CAAC,OAAO,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC;YACjC,IAAI;YACJ,KAAK,EAAE,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,QAAQ;SACvD,CAAC,CAAC;QACH,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;QAC1C,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IAC7C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,0GAA0G;AAC1G,qGAAqG;AACrG,wGAAwG;AACxG,oDAAoD;AACpD,SAAS,eAAe,CAAC,KAAsB,EAAE,WAA0B,EAAE,GAAiB;IAC5F,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAG,OAAO,CAAC,oBAAoB,IAAI,KAAK,CAAC,MAAM,CAAC;IAC9D,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;IACrC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;IACtC,MAAM,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC;IAClC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IAClB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IACnB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACX,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACX,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IAClB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IACnB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACX,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACX,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACvB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACxB,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACZ,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAED,yGAAyG;AACzG,0GAA0G;AAC1G,6GAA6G;AAC7G,iGAAiG;AACjG,SAAS,qBAAqB,CAAC,KAAe,EAAE,WAAsB,EAAE,OAA8B;IACpG,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACtC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,KAAK,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAClF,OAAO;IACT,CAAC;IACD,MAAM,WAAW,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,WAAW,IAAI,CAAC,CAAC;IACnC,IAAI,sBAAsB,CAAC,MAAM,GAAG,SAAS;QAAE,sBAAsB,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;IACnG,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACpC,KAAK,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,EAAE,sBAAsB,CAAC,MAAM,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC;AACnF,CAAC;AAED,qGAAqG;AACrG,wFAAwF;AACxF,MAAM,wBAAwB,GAAG,IAAI,YAAY,CAAC,yBAAyB,CAAC,CAAC;AAE7E,2GAA2G;AAC3G,0FAA0F;AAC1F,IAAI,sBAAsB,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flighthq/scene2d-wgpu",
|
|
3
|
-
"version": "0.3.0-next.
|
|
3
|
+
"version": "0.3.0-next.1781.5d072ef",
|
|
4
|
+
"author": "Joshua Granick and other contributors",
|
|
5
|
+
"license": "MIT",
|
|
4
6
|
"repository": {
|
|
5
7
|
"type": "git",
|
|
6
8
|
"url": "https://github.com/flighthq/flight.git",
|
|
@@ -36,23 +38,23 @@
|
|
|
36
38
|
"clean:dist": "tsx ../../scripts/clean-package-dist.ts"
|
|
37
39
|
},
|
|
38
40
|
"dependencies": {
|
|
39
|
-
"@flighthq/color": "0.3.0-next.
|
|
40
|
-
"@flighthq/scene2d": "0.3.0-next.
|
|
41
|
-
"@flighthq/scene2d-canvas": "0.3.0-next.
|
|
42
|
-
"@flighthq/geometry": "0.3.0-next.
|
|
43
|
-
"@flighthq/image": "0.3.0-next.
|
|
44
|
-
"@flighthq/log": "0.3.0-next.
|
|
45
|
-
"@flighthq/node": "0.3.0-next.
|
|
46
|
-
"@flighthq/path": "0.3.0-next.
|
|
47
|
-
"@flighthq/render": "0.3.0-next.
|
|
48
|
-
"@flighthq/render-wgpu": "0.3.0-next.
|
|
49
|
-
"@flighthq/shape": "0.3.0-next.
|
|
50
|
-
"@flighthq/text": "0.3.0-next.
|
|
51
|
-
"@flighthq/textinput": "0.3.0-next.
|
|
52
|
-
"@flighthq/textlayout": "0.3.0-next.
|
|
53
|
-
"@flighthq/texture": "0.3.0-next.
|
|
54
|
-
"@flighthq/types": "0.3.0-next.
|
|
55
|
-
"@flighthq/velocity": "0.3.0-next.
|
|
41
|
+
"@flighthq/color": "0.3.0-next.1781.5d072ef",
|
|
42
|
+
"@flighthq/scene2d": "0.3.0-next.1781.5d072ef",
|
|
43
|
+
"@flighthq/scene2d-canvas": "0.3.0-next.1781.5d072ef",
|
|
44
|
+
"@flighthq/geometry": "0.3.0-next.1781.5d072ef",
|
|
45
|
+
"@flighthq/image": "0.3.0-next.1781.5d072ef",
|
|
46
|
+
"@flighthq/log": "0.3.0-next.1781.5d072ef",
|
|
47
|
+
"@flighthq/node": "0.3.0-next.1781.5d072ef",
|
|
48
|
+
"@flighthq/path": "0.3.0-next.1781.5d072ef",
|
|
49
|
+
"@flighthq/render": "0.3.0-next.1781.5d072ef",
|
|
50
|
+
"@flighthq/render-wgpu": "0.3.0-next.1781.5d072ef",
|
|
51
|
+
"@flighthq/shape": "0.3.0-next.1781.5d072ef",
|
|
52
|
+
"@flighthq/text": "0.3.0-next.1781.5d072ef",
|
|
53
|
+
"@flighthq/textinput": "0.3.0-next.1781.5d072ef",
|
|
54
|
+
"@flighthq/textlayout": "0.3.0-next.1781.5d072ef",
|
|
55
|
+
"@flighthq/texture": "0.3.0-next.1781.5d072ef",
|
|
56
|
+
"@flighthq/types": "0.3.0-next.1781.5d072ef",
|
|
57
|
+
"@flighthq/velocity": "0.3.0-next.1781.5d072ef"
|
|
56
58
|
},
|
|
57
59
|
"devDependencies": {
|
|
58
60
|
"@flighthq/bitmaptext": "*",
|
package/src/wgpuCache.test.ts
CHANGED
|
@@ -126,6 +126,8 @@ function makeCacheNode(source: unknown): any {
|
|
|
126
126
|
describe('createWgpuCacheState', () => {
|
|
127
127
|
it('copies renderers and shares the GPU device but keeps its own node map', () => {
|
|
128
128
|
const screen = fakeScreen();
|
|
129
|
+
const resolver = vi.fn();
|
|
130
|
+
getWgpuRenderStateRuntime(screen).colorAdjustmentResolver = resolver;
|
|
129
131
|
enableWgpuRenderCache(screen);
|
|
130
132
|
const cacheState = createWgpuCacheState(screen);
|
|
131
133
|
expect(getWgpuRenderStateRuntime(cacheState).rendererMap.get(RenderCacheKind)).toBe(defaultWgpuRenderCacheRenderer);
|
|
@@ -133,6 +135,7 @@ describe('createWgpuCacheState', () => {
|
|
|
133
135
|
expect(getWgpuRenderStateRuntime(cacheState).renderProxyMap).not.toBe(
|
|
134
136
|
getWgpuRenderStateRuntime(screen).renderProxyMap,
|
|
135
137
|
);
|
|
138
|
+
expect(getWgpuRenderStateRuntime(cacheState).colorAdjustmentResolver).toBe(resolver);
|
|
136
139
|
});
|
|
137
140
|
});
|
|
138
141
|
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { renderWgpuBackground, submitWgpuRenderPass } from '@flighthq/render-wgpu/contract';
|
|
2
2
|
import { getWgpuRenderStateRuntime } from '@flighthq/render-wgpu/contract';
|
|
3
3
|
import { createWgpuRenderStateForTest, installWgpuMock } from '@flighthq/render-wgpu/contract';
|
|
4
|
+
import { areColorAdjustmentsEnabled } from '@flighthq/render/contract';
|
|
4
5
|
import type { ColorScaleBias } from '@flighthq/types/contract';
|
|
5
6
|
|
|
6
7
|
import { registerWgpuColorAdjustmentMaterialFeature } from './wgpuColorAdjustmentMaterialFeature';
|
|
@@ -49,8 +50,10 @@ describe('registerWgpuColorAdjustmentMaterialFeature', () => {
|
|
|
49
50
|
const state = await createWgpuRenderStateForTest();
|
|
50
51
|
const runtime = getWgpuRenderStateRuntime(state);
|
|
51
52
|
registerWgpuColorAdjustmentMaterialFeature(state);
|
|
53
|
+
expect(areColorAdjustmentsEnabled(state)).toBe(true);
|
|
52
54
|
expect(runtime.wgpuColorAdjustmentMaterialFeature).toBeDefined();
|
|
53
55
|
expect(runtime.wgpuColorAdjustmentMaterialFeature).not.toBeNull();
|
|
56
|
+
expect(runtime.wgpuColorAdjustmentMaterialFeature?.drawShapeMeshes).toBeTypeOf('function');
|
|
54
57
|
});
|
|
55
58
|
|
|
56
59
|
it('is idempotent', async () => {
|
package/src/wgpuShape.test.ts
CHANGED
|
@@ -29,6 +29,8 @@ function emptyData(): WgpuShapeRendererData {
|
|
|
29
29
|
indexCapacities: [],
|
|
30
30
|
uniformBuffers: [],
|
|
31
31
|
bindGroups: [],
|
|
32
|
+
colorScaleBiasUniformBuffers: [],
|
|
33
|
+
colorScaleBiasBindGroups: [],
|
|
32
34
|
},
|
|
33
35
|
};
|
|
34
36
|
}
|
|
@@ -75,12 +77,14 @@ describe('destroyWgpuShapeData', () => {
|
|
|
75
77
|
} as never);
|
|
76
78
|
const bufferDestroy = vi.fn();
|
|
77
79
|
shapeData.meshBuffers.vertexBuffers.push({ destroy: bufferDestroy } as never);
|
|
80
|
+
shapeData.meshBuffers.colorScaleBiasUniformBuffers.push({ destroy: bufferDestroy } as never);
|
|
78
81
|
|
|
79
82
|
destroyWgpuShapeData(state, data);
|
|
80
83
|
|
|
81
84
|
expect(destroy).toHaveBeenCalled();
|
|
82
85
|
expect(bufferDestroy).toHaveBeenCalled();
|
|
83
86
|
expect(shapeData.meshBuffers.vertexBuffers).toHaveLength(0);
|
|
87
|
+
expect(shapeData.meshBuffers.colorScaleBiasUniformBuffers).toHaveLength(0);
|
|
84
88
|
});
|
|
85
89
|
});
|
|
86
90
|
|
|
@@ -1,11 +1,18 @@
|
|
|
1
1
|
import { createMatrix } from '@flighthq/geometry/contract';
|
|
2
2
|
import { getWgpuRenderStateRuntime } from '@flighthq/render-wgpu/contract';
|
|
3
3
|
import { createWgpuRenderStateForTest, installWgpuMock } from '@flighthq/render-wgpu/contract';
|
|
4
|
-
import type {
|
|
4
|
+
import type {
|
|
5
|
+
ColorScaleBias,
|
|
6
|
+
RenderProxy2D,
|
|
7
|
+
WgpuRenderState,
|
|
8
|
+
WgpuShapeMeshBuffers,
|
|
9
|
+
WgpuShapeMeshPipeline,
|
|
10
|
+
} from '@flighthq/types/contract';
|
|
5
11
|
import type { WgpuShapeMesh } from '@flighthq/types/contract';
|
|
6
12
|
import { BlendMode } from '@flighthq/types/contract';
|
|
7
13
|
|
|
8
|
-
import {
|
|
14
|
+
import { registerWgpuColorAdjustmentMaterialFeature } from './wgpuColorAdjustmentMaterialFeature';
|
|
15
|
+
import { drawWgpuShapeMeshBatch, drawWgpuShapeMeshes } from './wgpuShapeMesh';
|
|
9
16
|
|
|
10
17
|
beforeAll(() => {
|
|
11
18
|
installWgpuMock();
|
|
@@ -26,6 +33,8 @@ function makeBuffers(): WgpuShapeMeshBuffers {
|
|
|
26
33
|
indexCapacities: [],
|
|
27
34
|
uniformBuffers: [],
|
|
28
35
|
bindGroups: [],
|
|
36
|
+
colorScaleBiasUniformBuffers: [],
|
|
37
|
+
colorScaleBiasBindGroups: [],
|
|
29
38
|
};
|
|
30
39
|
}
|
|
31
40
|
|
|
@@ -41,8 +50,37 @@ function makePassSpy(): GPURenderPassEncoder {
|
|
|
41
50
|
} as unknown as GPURenderPassEncoder;
|
|
42
51
|
}
|
|
43
52
|
|
|
44
|
-
function makeProxy(
|
|
45
|
-
return {
|
|
53
|
+
function makeProxy(overrides?: Partial<RenderProxy2D>): RenderProxy2D {
|
|
54
|
+
return {
|
|
55
|
+
alpha: 1,
|
|
56
|
+
blendMode: null,
|
|
57
|
+
colorMatrix: null,
|
|
58
|
+
colorScaleBias: null,
|
|
59
|
+
transform2D: createMatrix(),
|
|
60
|
+
...overrides,
|
|
61
|
+
} as unknown as RenderProxy2D;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
function ct(
|
|
65
|
+
redScale = 1,
|
|
66
|
+
greenScale = 1,
|
|
67
|
+
blueScale = 1,
|
|
68
|
+
alphaScale = 1,
|
|
69
|
+
redBias = 0,
|
|
70
|
+
greenBias = 0,
|
|
71
|
+
blueBias = 0,
|
|
72
|
+
alphaBias = 0,
|
|
73
|
+
): ColorScaleBias {
|
|
74
|
+
return {
|
|
75
|
+
redScale,
|
|
76
|
+
greenScale,
|
|
77
|
+
blueScale,
|
|
78
|
+
alphaScale,
|
|
79
|
+
redBias,
|
|
80
|
+
greenBias,
|
|
81
|
+
blueBias,
|
|
82
|
+
alphaBias,
|
|
83
|
+
} as ColorScaleBias;
|
|
46
84
|
}
|
|
47
85
|
|
|
48
86
|
async function makeState(): Promise<WgpuRenderState> {
|
|
@@ -51,6 +89,42 @@ async function makeState(): Promise<WgpuRenderState> {
|
|
|
51
89
|
return state;
|
|
52
90
|
}
|
|
53
91
|
|
|
92
|
+
describe('drawWgpuShapeMeshBatch', () => {
|
|
93
|
+
it('writes only the shared matrix and color fields, preserving a feature-owned uniform tail', async () => {
|
|
94
|
+
const state = await makeState();
|
|
95
|
+
const buffers = makeBuffers();
|
|
96
|
+
const uniformBuffers: GPUBuffer[] = [];
|
|
97
|
+
const bindGroups: GPUBindGroup[] = [];
|
|
98
|
+
const uniformData = new Float32Array(24);
|
|
99
|
+
uniformData.set([0.25, 0.5, 0.75, 1, 0.1, 0.2, 0.3, 0.4], 16);
|
|
100
|
+
const pipelineEntry: WgpuShapeMeshPipeline = {
|
|
101
|
+
bindGroupLayout: {} as GPUBindGroupLayout,
|
|
102
|
+
pipeline: {} as GPURenderPipeline,
|
|
103
|
+
};
|
|
104
|
+
let upload: Float32Array | undefined;
|
|
105
|
+
state.device.queue.writeBuffer = vi.fn((buffer: GPUBuffer, _offset: number, data: BufferSource) => {
|
|
106
|
+
if (buffer !== uniformBuffers[0]) return;
|
|
107
|
+
const view = ArrayBuffer.isView(data) ? data : new Uint8Array(data as ArrayBuffer);
|
|
108
|
+
upload = new Float32Array(view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength));
|
|
109
|
+
}) as unknown as GPUQueue['writeBuffer'];
|
|
110
|
+
|
|
111
|
+
drawWgpuShapeMeshBatch(
|
|
112
|
+
state,
|
|
113
|
+
makeProxy({ alpha: 0.5 }),
|
|
114
|
+
[{ ...TRIANGLE, color: 0xffffff }],
|
|
115
|
+
buffers,
|
|
116
|
+
pipelineEntry,
|
|
117
|
+
uniformBuffers,
|
|
118
|
+
bindGroups,
|
|
119
|
+
uniformData,
|
|
120
|
+
);
|
|
121
|
+
|
|
122
|
+
expect(uniformBuffers).toHaveLength(1);
|
|
123
|
+
expect(upload?.slice(12, 16)).toEqual(new Float32Array([0.5, 0.5, 0.5, 0.5]));
|
|
124
|
+
expect(upload?.slice(16, 24)).toEqual(new Float32Array([0.25, 0.5, 0.75, 1, 0.1, 0.2, 0.3, 0.4]));
|
|
125
|
+
});
|
|
126
|
+
});
|
|
127
|
+
|
|
54
128
|
describe('drawWgpuShapeMeshes', () => {
|
|
55
129
|
it('sets the shape-mesh pipeline and draws each mesh', async () => {
|
|
56
130
|
const state = await makeState();
|
|
@@ -121,8 +195,8 @@ describe('drawWgpuShapeMeshes', () => {
|
|
|
121
195
|
it('bakes the node blend mode into a distinct shape pipeline', async () => {
|
|
122
196
|
const state = await makeState();
|
|
123
197
|
|
|
124
|
-
drawWgpuShapeMeshes(state, makeProxy(
|
|
125
|
-
drawWgpuShapeMeshes(state, makeProxy(
|
|
198
|
+
drawWgpuShapeMeshes(state, makeProxy({ blendMode: BlendMode.Normal }), [TRIANGLE], makeBuffers());
|
|
199
|
+
drawWgpuShapeMeshes(state, makeProxy({ blendMode: BlendMode.Add }), [TRIANGLE], makeBuffers());
|
|
126
200
|
|
|
127
201
|
const pipelines = [...getWgpuRenderStateRuntime(state).shapeMeshPipelines!.values()].map(
|
|
128
202
|
(entry) => entry.pipeline,
|
|
@@ -145,7 +219,7 @@ describe('drawWgpuShapeMeshes', () => {
|
|
|
145
219
|
}
|
|
146
220
|
}) as unknown as GPUQueue['writeBuffer'];
|
|
147
221
|
|
|
148
|
-
drawWgpuShapeMeshes(state, makeProxy(
|
|
222
|
+
drawWgpuShapeMeshes(state, makeProxy({ alpha: 0.5 }), [{ ...TRIANGLE, color: 0xffffff }], buffers);
|
|
149
223
|
|
|
150
224
|
const uniformData = writes.get(buffers.uniformBuffers[0]);
|
|
151
225
|
expect(uniformData).toBeDefined();
|
|
@@ -176,4 +250,70 @@ describe('drawWgpuShapeMeshes', () => {
|
|
|
176
250
|
expect(pass.setPipeline).not.toHaveBeenCalled();
|
|
177
251
|
expect(runtime.shapeMeshPipelines?.size ?? 0).toBe(0);
|
|
178
252
|
});
|
|
253
|
+
|
|
254
|
+
it('ignores ColorScaleBias when the opt-in feature is not registered', async () => {
|
|
255
|
+
const state = await makeState();
|
|
256
|
+
const buffers = makeBuffers();
|
|
257
|
+
|
|
258
|
+
drawWgpuShapeMeshes(state, makeProxy({ colorScaleBias: ct(0.5) }), [TRIANGLE], buffers);
|
|
259
|
+
|
|
260
|
+
expect(buffers.uniformBuffers).toHaveLength(1);
|
|
261
|
+
expect(buffers.colorScaleBiasUniformBuffers).toHaveLength(0);
|
|
262
|
+
});
|
|
263
|
+
|
|
264
|
+
it('keeps registered but unadjusted meshes on the lean uniform path', async () => {
|
|
265
|
+
const state = await makeState();
|
|
266
|
+
const buffers = makeBuffers();
|
|
267
|
+
registerWgpuColorAdjustmentMaterialFeature(state);
|
|
268
|
+
|
|
269
|
+
drawWgpuShapeMeshes(state, makeProxy(), [TRIANGLE], buffers);
|
|
270
|
+
|
|
271
|
+
expect(buffers.uniformBuffers).toHaveLength(1);
|
|
272
|
+
expect(buffers.colorScaleBiasUniformBuffers).toHaveLength(0);
|
|
273
|
+
});
|
|
274
|
+
|
|
275
|
+
it('folds ColorScaleBias through a separate 96-byte uniform and shader', async () => {
|
|
276
|
+
const state = await makeState();
|
|
277
|
+
const buffers = makeBuffers();
|
|
278
|
+
registerWgpuColorAdjustmentMaterialFeature(state);
|
|
279
|
+
const createShaderModule = vi.spyOn(state.device, 'createShaderModule');
|
|
280
|
+
const writes = new Map<GPUBuffer, Float32Array>();
|
|
281
|
+
state.device.queue.writeBuffer = vi.fn((buffer: GPUBuffer, _offset: number, data: BufferSource) => {
|
|
282
|
+
const view = ArrayBuffer.isView(data) ? data : new Uint8Array(data as ArrayBuffer);
|
|
283
|
+
if (view.byteLength % 4 === 0) {
|
|
284
|
+
writes.set(buffer, new Float32Array(view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength)));
|
|
285
|
+
}
|
|
286
|
+
}) as unknown as GPUQueue['writeBuffer'];
|
|
287
|
+
|
|
288
|
+
drawWgpuShapeMeshes(
|
|
289
|
+
state,
|
|
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: 0xffffff }],
|
|
292
|
+
buffers,
|
|
293
|
+
);
|
|
294
|
+
|
|
295
|
+
expect(buffers.uniformBuffers).toHaveLength(0);
|
|
296
|
+
expect(buffers.colorScaleBiasUniformBuffers).toHaveLength(1);
|
|
297
|
+
const uniform = writes.get(buffers.colorScaleBiasUniformBuffers[0]);
|
|
298
|
+
expect(uniform).toHaveLength(24);
|
|
299
|
+
expect(uniform?.slice(12, 16)).toEqual(new Float32Array([0.5, 0.5, 0.5, 0.5]));
|
|
300
|
+
expect(uniform?.slice(16, 24)).toEqual(new Float32Array([0.25, 0.5, 0.75, 0.8, 0.1, 0.2, 0.3, 0.4]));
|
|
301
|
+
const shader = createShaderModule.mock.calls
|
|
302
|
+
.map(([descriptor]) => descriptor.code)
|
|
303
|
+
.find((code) => code.includes('struct ShapeMeshUniforms'));
|
|
304
|
+
expect(shader).toContain('u.color.rgb / u.color.a');
|
|
305
|
+
expect(shader).toContain('applyFlightColorAdjustment(color, u.colorScale, u.colorBias)');
|
|
306
|
+
expect(shader).toContain('color.rgb * color.a');
|
|
307
|
+
});
|
|
308
|
+
|
|
309
|
+
it('leaves the full color-matrix path outside the bounded solid-mesh fold', async () => {
|
|
310
|
+
const state = await makeState();
|
|
311
|
+
const buffers = makeBuffers();
|
|
312
|
+
registerWgpuColorAdjustmentMaterialFeature(state);
|
|
313
|
+
|
|
314
|
+
drawWgpuShapeMeshes(state, makeProxy({ colorMatrix: new Array(20).fill(0) }), [TRIANGLE], buffers);
|
|
315
|
+
|
|
316
|
+
expect(buffers.uniformBuffers).toHaveLength(1);
|
|
317
|
+
expect(buffers.colorScaleBiasUniformBuffers).toHaveLength(0);
|
|
318
|
+
});
|
|
179
319
|
});
|