@flighthq/scene2d-wgpu 0.5.1-next.3302.76ece6b → 0.5.1-next.4304.322dc96
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/enableWgpuColorAdjustmentGuards.d.ts +2 -1
- package/dist/enableWgpuColorAdjustmentGuards.d.ts.map +1 -1
- package/dist/enableWgpuColorAdjustmentGuards.js +22 -8
- package/dist/enableWgpuColorAdjustmentGuards.js.map +1 -1
- package/dist/scene2DWgpuPipeline.d.ts.map +1 -1
- package/dist/scene2DWgpuPipeline.js +2 -1
- package/dist/scene2DWgpuPipeline.js.map +1 -1
- package/dist/wgpuRichText.d.ts.map +1 -1
- package/dist/wgpuRichText.js +3 -4
- package/dist/wgpuRichText.js.map +1 -1
- package/dist/wgpuTextInput.d.ts +2 -1
- package/dist/wgpuTextInput.d.ts.map +1 -1
- package/dist/wgpuTextInput.js +1 -1
- package/dist/wgpuTextInput.js.map +1 -1
- package/dist/wgpuTextLabel.d.ts.map +1 -1
- package/dist/wgpuTextLabel.js +2 -3
- package/dist/wgpuTextLabel.js.map +1 -1
- package/package.json +21 -21
- package/src/enableWgpuColorAdjustmentGuards.test.ts +43 -16
- package/src/scene2DWgpuPipeline.test.ts +1 -2
- package/src/wgpuCache.test.ts +1 -1
- package/src/wgpuMeshShapeRenderer.test.ts +1 -1
- package/src/wgpuRasterShapeRenderer.test.ts +1 -1
package/README.md
CHANGED
|
@@ -13,5 +13,5 @@ Import the supported application-facing API from `@flighthq/scene2d-wgpu`. The `
|
|
|
13
13
|
This package is part of the locked-version Flight SDK graph. Applications may instead install and import `@flighthq/sdk` when package-level tree shaking is sufficient.
|
|
14
14
|
|
|
15
15
|
- [Flight project](https://github.com/flighthq/flight)
|
|
16
|
-
- [Source for @flighthq/scene2d-wgpu@0.5.1-next.
|
|
17
|
-
- [License](https://github.com/flighthq/flight/blob/
|
|
16
|
+
- [Source for @flighthq/scene2d-wgpu@0.5.1-next.4304.322dc96](https://github.com/flighthq/flight/tree/322dc963fc5a404a31bc0cc612e906de504ea024/packages/scene2d-wgpu)
|
|
17
|
+
- [License](https://github.com/flighthq/flight/blob/322dc963fc5a404a31bc0cc612e906de504ea024/LICENSE.md)
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import type { LogState } from '@flighthq/log/contract';
|
|
1
2
|
import type { WgpuRenderState } from '@flighthq/types/contract';
|
|
2
3
|
export declare function areWgpuColorAdjustmentGuardsEnabled(state: WgpuRenderState): boolean;
|
|
3
|
-
export declare function enableWgpuColorAdjustmentGuards(state: WgpuRenderState): void;
|
|
4
|
+
export declare function enableWgpuColorAdjustmentGuards(state: WgpuRenderState, logState: LogState | null): void;
|
|
4
5
|
//# sourceMappingURL=enableWgpuColorAdjustmentGuards.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enableWgpuColorAdjustmentGuards.d.ts","sourceRoot":"","sources":["../src/enableWgpuColorAdjustmentGuards.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"enableWgpuColorAdjustmentGuards.d.ts","sourceRoot":"","sources":["../src/enableWgpuColorAdjustmentGuards.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAIhE,wBAAgB,mCAAmC,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAEnF;AAUD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,CAYvG"}
|
|
@@ -7,17 +7,31 @@ export function areWgpuColorAdjustmentGuardsEnabled(state) {
|
|
|
7
7
|
}
|
|
8
8
|
// Installs the shakeable color-adjustment guard on `state`: when a node carries a color adjustment but
|
|
9
9
|
// registerWgpuColorAdjustmentMaterialFeature was never called, recordWgpuQuadBatchColorScaleBias reaches this guard
|
|
10
|
-
// through its optional persistent registry slot and warns once (the tint is skipped, drawn
|
|
11
|
-
// behavior, never a throw).
|
|
12
|
-
// the
|
|
13
|
-
|
|
10
|
+
// through its optional persistent registry slot and warns once into `logState` (the tint is skipped, drawn
|
|
11
|
+
// untinted — the sentinel behavior, never a throw). Every call records `logState`, so a null `logState`
|
|
12
|
+
// leaves the guard installed but silent, including after an earlier non-null call. Not calling this — the
|
|
13
|
+
// production default — costs the batch nothing, since the message and @flighthq/log dependency live only
|
|
14
|
+
// in this separately-imported module.
|
|
15
|
+
// Idempotent: the installed guard is the same function on every call.
|
|
16
|
+
export function enableWgpuColorAdjustmentGuards(state, logState) {
|
|
17
|
+
let slot = _guardSlots.get(state);
|
|
18
|
+
if (slot === undefined) {
|
|
19
|
+
const created = { guard: () => warnWgpuColorAdjustmentNotEnabled(created.logState), logState: null };
|
|
20
|
+
slot = created;
|
|
21
|
+
_guardSlots.set(state, slot);
|
|
22
|
+
}
|
|
23
|
+
slot.logState = logState;
|
|
14
24
|
const runtime = getWgpuRenderStateRuntime(state);
|
|
15
|
-
if (runtime.registries.colorAdjustmentFeatureGuard !==
|
|
16
|
-
runtime.registries.colorAdjustmentFeatureGuard =
|
|
25
|
+
if (runtime.registries.colorAdjustmentFeatureGuard !== slot.guard) {
|
|
26
|
+
runtime.registries.colorAdjustmentFeatureGuard = slot.guard;
|
|
17
27
|
}
|
|
18
28
|
}
|
|
19
|
-
|
|
20
|
-
|
|
29
|
+
// The installed guard and its log state, per render state, so re-enabling keeps one guard identity.
|
|
30
|
+
const _guardSlots = new WeakMap();
|
|
31
|
+
function warnWgpuColorAdjustmentNotEnabled(logState) {
|
|
32
|
+
if (logState === null)
|
|
33
|
+
return;
|
|
34
|
+
logOnce(logState, 0, 'scene2d-wgpu:color-adjustment-not-enabled', LogLevel.Warn, {
|
|
21
35
|
message: 'recordWgpuQuadBatchColorScaleBias: color adjustment present but WGPU color adjustment not enabled — call registerWgpuColorAdjustmentMaterialFeature(state)',
|
|
22
36
|
}, 'scene2d-wgpu');
|
|
23
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enableWgpuColorAdjustmentGuards.js","sourceRoot":"","sources":["../src/enableWgpuColorAdjustmentGuards.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"enableWgpuColorAdjustmentGuards.js","sourceRoot":"","sources":["../src/enableWgpuColorAdjustmentGuards.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,0CAA0C,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAEvH,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,sGAAsG;AACtG,MAAM,UAAU,mCAAmC,CAAC,KAAsB;IACxE,OAAO,0CAA0C,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC;AACnE,CAAC;AAED,uGAAuG;AACvG,oHAAoH;AACpH,2GAA2G;AAC3G,wGAAwG;AACxG,0GAA0G;AAC1G,yGAAyG;AACzG,sCAAsC;AACtC,sEAAsE;AACtE,MAAM,UAAU,+BAA+B,CAAC,KAAsB,EAAE,QAAyB;IAC/F,IAAI,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAClC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,OAAO,GAAc,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,iCAAiC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QAChH,IAAI,GAAG,OAAO,CAAC;QACf,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IACD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IACzB,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjD,IAAI,OAAO,CAAC,UAAU,CAAC,2BAA2B,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;QAClE,OAAO,CAAC,UAAU,CAAC,2BAA2B,GAAG,IAAI,CAAC,KAAK,CAAC;IAC9D,CAAC;AACH,CAAC;AAOD,oGAAoG;AACpG,MAAM,WAAW,GAAG,IAAI,OAAO,EAA8B,CAAC;AAE9D,SAAS,iCAAiC,CAAC,QAAyB;IAClE,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO;IAC9B,OAAO,CACL,QAAQ,EACR,CAAC,EACD,2CAA2C,EAC3C,QAAQ,CAAC,IAAI,EACb;QACE,OAAO,EACL,4JAA4J;KAC/J,EACD,cAAc,CACf,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scene2DWgpuPipeline.d.ts","sourceRoot":"","sources":["../src/scene2DWgpuPipeline.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scene2DWgpuPipeline.d.ts","sourceRoot":"","sources":["../src/scene2DWgpuPipeline.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAsB,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAgDzF;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAGzF,CAAC;AAEH,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,oBAAoB,CAGjE,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { withKindMapEntry } from '@flighthq/registry/contract';
|
|
2
2
|
import { buildWgpuRenderRegistries } from '@flighthq/render-wgpu/contract';
|
|
3
|
-
import {
|
|
3
|
+
import { RichTextKind, TextLabelKind } from '@flighthq/text/contract';
|
|
4
|
+
import { BitmapTextKind, DisplayObjectKind, MorphShapeKind, ParticleEmitter2DKind, QuadBatchKind, RenderCacheKind, Scale9ShapeKind, Scale9SpriteKind, ShapeKind, SpriteKind, StandardMaterialKind, TilemapKind, } from '@flighthq/types/contract';
|
|
4
5
|
import { wgpuBitmapTextRenderer } from "./wgpuBitmapText.js";
|
|
5
6
|
import { wgpuRenderCacheRenderer } from "./wgpuCache.js";
|
|
6
7
|
import { wgpuScene2DRenderer } from "./wgpuNode2D.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scene2DWgpuPipeline.js","sourceRoot":"","sources":["../src/scene2DWgpuPipeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"scene2DWgpuPipeline.js","sourceRoot":"","sources":["../src/scene2DWgpuPipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuRichText.d.ts","sourceRoot":"","sources":["../src/wgpuRichText.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuRichText.d.ts","sourceRoot":"","sources":["../src/wgpuRichText.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAGV,OAAO,EACP,YAAY,EACZ,aAAa,EACb,WAAW,EACX,eAAe,EACf,eAAe,EACf,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAclC,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,GAAG,YAAY,CAE1F;AAID,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAaxF;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CASzF;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,eAAe,EACtB,WAAW,EAAE,aAAa,EAC1B,OAAO,CAAC,EAAE,mBAAmB,GAC5B,IAAI,CA0DN;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAE/E;AAED,eAAO,MAAM,oBAAoB,EAAE,eAIlC,CAAC"}
|
package/dist/wgpuRichText.js
CHANGED
|
@@ -3,9 +3,8 @@ import { invalidateImageResource } from '@flighthq/image/contract';
|
|
|
3
3
|
import { bindWgpuImageResourceTexture, drawWgpuQuad } from '@flighthq/render-wgpu/contract';
|
|
4
4
|
import { getWgpuRenderStateRuntime, resolveWgpuApplyBlendMode } from '@flighthq/render-wgpu/contract';
|
|
5
5
|
import { createCanvasHostSurface, destroyCanvasHostSurface } from '@flighthq/render/contract';
|
|
6
|
-
import { computeTextFormatFontString } from '@flighthq/text/contract';
|
|
7
|
-
import {
|
|
8
|
-
import { computeRichTextContent, computeTextBoundsHeight, computeTextBoundsOffsetX, computeTextBoundsWidth, computeTextLayout, getRichTextContent, getRichTextScrollYOffset, getTextLayoutResult, } from '@flighthq/textlayout/contract';
|
|
6
|
+
import { computeRichTextContent, computeTextFormatFontString, getRichTextContent, getRichTextPasswordCharacter, getRichTextRuntime, getRichTextScrollYOffset, getTextLayoutResult, } from '@flighthq/text/contract';
|
|
7
|
+
import { computeTextBoundsHeight, computeTextBoundsOffsetX, computeTextBoundsWidth, computeTextLayout, } from '@flighthq/textlayout/contract';
|
|
9
8
|
import { flushWgpuQuadBatchWriter } from "./wgpuQuadBatchWriter.js";
|
|
10
9
|
import { createWgpuRendererData, getWgpuRendererData } from "./wgpuRendererData.js";
|
|
11
10
|
export function createWgpuRichTextData(_state, _source) {
|
|
@@ -47,7 +46,7 @@ export function drawWgpuRichTextWithOverlay(state, renderProxy, overlay) {
|
|
|
47
46
|
const data = source.data;
|
|
48
47
|
const richTextRuntime = getRichTextRuntime(source);
|
|
49
48
|
const content = getRichTextContent(richTextRuntime);
|
|
50
|
-
computeRichTextContent(content, data, getRichTextPasswordCharacter(source));
|
|
49
|
+
computeRichTextContent(content, data, getRichTextPasswordCharacter(source) ?? undefined);
|
|
51
50
|
if (content.text.length === 0 && !data.background && !data.border)
|
|
52
51
|
return;
|
|
53
52
|
const richData = getWgpuRendererData(renderProxy.rendererData);
|
package/dist/wgpuRichText.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuRichText.js","sourceRoot":"","sources":["../src/wgpuRichText.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,4BAA4B,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC5F,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AACtG,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAC9F,OAAO,
|
|
1
|
+
{"version":3,"file":"wgpuRichText.js","sourceRoot":"","sources":["../src/wgpuRichText.ts"],"names":[],"mappings":"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"}
|
package/dist/wgpuTextInput.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { RichText
|
|
1
|
+
import type { RichText } from '@flighthq/text/contract';
|
|
2
|
+
import type { TextLayoutResult } from '@flighthq/types/contract';
|
|
2
3
|
export declare function drawWgpuTextInputOverlay(context: CanvasRenderingContext2D, source: RichText, result: TextLayoutResult, fieldW: number, fieldH: number, _text: string): void;
|
|
3
4
|
export declare function enableWgpuTextInput(): void;
|
|
4
5
|
//# sourceMappingURL=wgpuTextInput.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuTextInput.d.ts","sourceRoot":"","sources":["../src/wgpuTextInput.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuTextInput.d.ts","sourceRoot":"","sources":["../src/wgpuTextInput.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAQxD,OAAO,KAAK,EAAE,gBAAgB,EAA0B,MAAM,0BAA0B,CAAC;AAOzF,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,wBAAwB,EACjC,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,GACZ,IAAI,CAmCN;AAID,wBAAgB,mBAAmB,IAAI,IAAI,CAE1C"}
|
package/dist/wgpuTextInput.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { computeRgbaCssString } from '@flighthq/color/contract';
|
|
2
|
+
import { getRichTextScrollYOffset } from '@flighthq/text/contract';
|
|
2
3
|
import { getTextInputCaretRectangle, getTextInputSelectionBeginIndex, getTextInputSelectionEndIndex, getTextInputSelectionRectangles, getTextInputState, } from '@flighthq/textinput/contract';
|
|
3
|
-
import { getRichTextScrollYOffset } from '@flighthq/textlayout/contract';
|
|
4
4
|
import { registerWgpuTextInputOverlay } from "./wgpuRichText.js";
|
|
5
5
|
// NodeRenderer-agnostic caret/selection overlay drawn onto the rich text offscreen canvas of a RichText whose
|
|
6
6
|
// input slot is present. Identical to the Gl TextInput overlay — both backends rasterize the field to
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuTextInput.js","sourceRoot":"","sources":["../src/wgpuTextInput.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EACL,0BAA0B,EAC1B,+BAA+B,EAC/B,6BAA6B,EAC7B,+BAA+B,EAC/B,iBAAiB,GAClB,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"wgpuTextInput.js","sourceRoot":"","sources":["../src/wgpuTextInput.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EACL,0BAA0B,EAC1B,+BAA+B,EAC/B,6BAA6B,EAC7B,+BAA+B,EAC/B,iBAAiB,GAClB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAC;AAEjE,8GAA8G;AAC9G,sGAAsG;AACtG,wGAAwG;AACxG,MAAM,UAAU,wBAAwB,CACtC,OAAiC,EACjC,MAAgB,EAChB,MAAwB,EACxB,MAAc,EACd,MAAc,EACd,KAAa;IAEb,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC;QAAE,OAAO;IAE7E,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChH,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IAE1C,OAAO,CAAC,IAAI,EAAE,CAAC;IACf,OAAO,CAAC,SAAS,EAAE,CAAC;IACpB,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,OAAO,CAAC,IAAI,EAAE,CAAC;IAEf,+BAA+B,CAAC,mBAAmB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACrE,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,OAAO,CAAC,SAAS,GAAG,oBAAoB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC/D,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,cAAc,CAAC;QAC3C,KAAK,MAAM,IAAI,IAAI,mBAAmB,EAAE,CAAC;YACvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,aAAa,EAAE,IAAI,CAAC,CAAC,GAAG,aAAa,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,IAAI,+BAA+B,CAAC,MAAM,CAAC,KAAK,6BAA6B,CAAC,MAAM,CAAC,EAAE,CAAC;QACvG,0BAA0B,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3D,OAAO,CAAC,SAAS,GAAG,oBAAoB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC3D,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC;QACxB,OAAO,CAAC,QAAQ,CACd,cAAc,CAAC,CAAC,GAAG,aAAa,EAChC,cAAc,CAAC,CAAC,GAAG,aAAa,EAChC,WAAW,EACX,cAAc,CAAC,MAAM,CACtB,CAAC;IACJ,CAAC;IAED,OAAO,CAAC,OAAO,EAAE,CAAC;AACpB,CAAC;AAED,wGAAwG;AACxG,8FAA8F;AAC9F,MAAM,UAAU,mBAAmB;IACjC,4BAA4B,CAAC,wBAAwB,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,WAAW,GAAG,CAAC,CAAC;AACtB,MAAM,cAAc,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AACzE,MAAM,mBAAmB,GAA6B,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuTextLabel.d.ts","sourceRoot":"","sources":["../src/wgpuTextLabel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuTextLabel.d.ts","sourceRoot":"","sources":["../src/wgpuTextLabel.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAKV,aAAa,EAEb,eAAe,EACf,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAoDlC,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,CA0G1F;AAED,eAAO,MAAM,qBAAqB,EAAE,eAKnC,CAAC"}
|
package/dist/wgpuTextLabel.js
CHANGED
|
@@ -4,10 +4,9 @@ import { getNodeLocalContentRevision } from '@flighthq/node/contract';
|
|
|
4
4
|
import { bindWgpuImageResourceTexture, resolveWgpuQuadMaterialRenderer } from '@flighthq/render-wgpu/contract';
|
|
5
5
|
import { getWgpuRenderStateRuntime } from '@flighthq/render-wgpu/contract';
|
|
6
6
|
import { createCanvasHostSurface, destroyCanvasHostSurface } from '@flighthq/render/contract';
|
|
7
|
-
import { computeTextFormatFontString } from '@flighthq/text/contract';
|
|
8
|
-
import { getTextLabelRuntime } from '@flighthq/text/contract';
|
|
7
|
+
import { computeTextFormatFontString, getTextLabelRuntime, getTextLayoutResult } from '@flighthq/text/contract';
|
|
9
8
|
import { createTextFormatRange } from '@flighthq/textformat/contract';
|
|
10
|
-
import { computeTextLayout
|
|
9
|
+
import { computeTextLayout } from '@flighthq/textlayout/contract';
|
|
11
10
|
import { BatchFormat } from '@flighthq/types/contract';
|
|
12
11
|
import { QUAD_BATCH_INSTANCE_FLOATS, ensureWgpuQuadBatchResources, packWgpuQuadBatchMaterialInstance, prepareWgpuQuadBatchWrite, recordWgpuQuadBatchColorScaleBias, writeWgpuQuadBatchInstance, } from "./wgpuQuadBatchWriter.js";
|
|
13
12
|
import { createWgpuRendererData, getWgpuRendererData } from "./wgpuRendererData.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuTextLabel.js","sourceRoot":"","sources":["../src/wgpuTextLabel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AAC/G,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAC9F,OAAO,EAAE,2BAA2B,EAAE,
|
|
1
|
+
{"version":3,"file":"wgpuTextLabel.js","sourceRoot":"","sources":["../src/wgpuTextLabel.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flighthq/scene2d-wgpu",
|
|
3
|
-
"version": "0.5.1-next.
|
|
3
|
+
"version": "0.5.1-next.4304.322dc96",
|
|
4
4
|
"author": "Joshua Granick and other contributors",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -38,26 +38,26 @@
|
|
|
38
38
|
"clean:dist": "tsx ../../scripts/clean-package-dist.ts"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@flighthq/color": "0.5.1-next.
|
|
42
|
-
"@flighthq/entity": "0.5.1-next.
|
|
43
|
-
"@flighthq/scene2d": "0.5.1-next.
|
|
44
|
-
"@flighthq/scene2d-canvas": "0.5.1-next.
|
|
45
|
-
"@flighthq/geometry": "0.5.1-next.
|
|
46
|
-
"@flighthq/image": "0.5.1-next.
|
|
47
|
-
"@flighthq/log": "0.5.1-next.
|
|
48
|
-
"@flighthq/node": "0.5.1-next.
|
|
49
|
-
"@flighthq/path": "0.5.1-next.
|
|
50
|
-
"@flighthq/registry": "0.5.1-next.
|
|
51
|
-
"@flighthq/render": "0.5.1-next.
|
|
52
|
-
"@flighthq/render-wgpu": "0.5.1-next.
|
|
53
|
-
"@flighthq/shape": "0.5.1-next.
|
|
54
|
-
"@flighthq/text": "0.5.1-next.
|
|
55
|
-
"@flighthq/textformat": "0.5.1-next.
|
|
56
|
-
"@flighthq/textinput": "0.5.1-next.
|
|
57
|
-
"@flighthq/textlayout": "0.5.1-next.
|
|
58
|
-
"@flighthq/texture": "0.5.1-next.
|
|
59
|
-
"@flighthq/types": "0.5.1-next.
|
|
60
|
-
"@flighthq/velocity": "0.5.1-next.
|
|
41
|
+
"@flighthq/color": "0.5.1-next.4304.322dc96",
|
|
42
|
+
"@flighthq/entity": "0.5.1-next.4304.322dc96",
|
|
43
|
+
"@flighthq/scene2d": "0.5.1-next.4304.322dc96",
|
|
44
|
+
"@flighthq/scene2d-canvas": "0.5.1-next.4304.322dc96",
|
|
45
|
+
"@flighthq/geometry": "0.5.1-next.4304.322dc96",
|
|
46
|
+
"@flighthq/image": "0.5.1-next.4304.322dc96",
|
|
47
|
+
"@flighthq/log": "0.5.1-next.4304.322dc96",
|
|
48
|
+
"@flighthq/node": "0.5.1-next.4304.322dc96",
|
|
49
|
+
"@flighthq/path": "0.5.1-next.4304.322dc96",
|
|
50
|
+
"@flighthq/registry": "0.5.1-next.4304.322dc96",
|
|
51
|
+
"@flighthq/render": "0.5.1-next.4304.322dc96",
|
|
52
|
+
"@flighthq/render-wgpu": "0.5.1-next.4304.322dc96",
|
|
53
|
+
"@flighthq/shape": "0.5.1-next.4304.322dc96",
|
|
54
|
+
"@flighthq/text": "0.5.1-next.4304.322dc96",
|
|
55
|
+
"@flighthq/textformat": "0.5.1-next.4304.322dc96",
|
|
56
|
+
"@flighthq/textinput": "0.5.1-next.4304.322dc96",
|
|
57
|
+
"@flighthq/textlayout": "0.5.1-next.4304.322dc96",
|
|
58
|
+
"@flighthq/texture": "0.5.1-next.4304.322dc96",
|
|
59
|
+
"@flighthq/types": "0.5.1-next.4304.322dc96",
|
|
60
|
+
"@flighthq/velocity": "0.5.1-next.4304.322dc96"
|
|
61
61
|
},
|
|
62
62
|
"peerDependencies": {
|
|
63
63
|
"@webgpu/types": "^0.1.70"
|
|
@@ -1,7 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
addLogSink,
|
|
3
|
+
createLogState,
|
|
4
|
+
createMemoryLogSink,
|
|
5
|
+
getMemoryLogSinkEntries,
|
|
6
|
+
removeLogSink,
|
|
7
|
+
} from '@flighthq/log/contract';
|
|
2
8
|
import { createWgpuRenderStateForTest, installWgpuMock } from '@flighthq/render-wgpu/contract';
|
|
3
9
|
import { getWgpuRenderStateRuntime } from '@flighthq/render-wgpu/contract';
|
|
4
|
-
import type { ColorScaleBias } from '@flighthq/types/contract';
|
|
10
|
+
import type { ColorScaleBias, LogEntry, MemoryLogSink } from '@flighthq/types/contract';
|
|
5
11
|
|
|
6
12
|
import {
|
|
7
13
|
areWgpuColorAdjustmentGuardsEnabled,
|
|
@@ -31,11 +37,11 @@ describe('areWgpuColorAdjustmentGuardsEnabled', () => {
|
|
|
31
37
|
it('reports false until guards are installed, then true', async () => {
|
|
32
38
|
const state = await createWgpuRenderStateForTest();
|
|
33
39
|
expect(areWgpuColorAdjustmentGuardsEnabled(state)).toBe(false);
|
|
34
|
-
enableWgpuColorAdjustmentGuards(state);
|
|
40
|
+
enableWgpuColorAdjustmentGuards(state, createLogState());
|
|
35
41
|
expect(areWgpuColorAdjustmentGuardsEnabled(state)).toBe(true);
|
|
36
42
|
const guard = getWgpuRenderStateRuntime(state).registries.colorAdjustmentFeatureGuard;
|
|
37
43
|
expect(guard).not.toBeNull();
|
|
38
|
-
enableWgpuColorAdjustmentGuards(state);
|
|
44
|
+
enableWgpuColorAdjustmentGuards(state, null);
|
|
39
45
|
expect(getWgpuRenderStateRuntime(state).registries.colorAdjustmentFeatureGuard).toBe(guard);
|
|
40
46
|
});
|
|
41
47
|
});
|
|
@@ -43,44 +49,65 @@ describe('areWgpuColorAdjustmentGuardsEnabled', () => {
|
|
|
43
49
|
describe('enableWgpuColorAdjustmentGuards', () => {
|
|
44
50
|
it('warns once when a color adjustment is recorded but color adjustment was never enabled', async () => {
|
|
45
51
|
const state = await createWgpuRenderStateForTest();
|
|
52
|
+
const logState = createLogState();
|
|
46
53
|
const sink = createMemoryLogSink(8);
|
|
47
|
-
addLogSink(sink.sink);
|
|
54
|
+
addLogSink(logState, sink.sink);
|
|
48
55
|
try {
|
|
49
|
-
enableWgpuColorAdjustmentGuards(state);
|
|
56
|
+
enableWgpuColorAdjustmentGuards(state, logState);
|
|
50
57
|
recordWgpuQuadBatchColorScaleBias(state, ct(), 0);
|
|
51
|
-
const entries =
|
|
58
|
+
const entries = readMemoryLogEntries(sink);
|
|
52
59
|
expect(entries.length).toBe(1);
|
|
53
60
|
const data = entries[0].data as Record<string, unknown>;
|
|
54
61
|
expect(String(data.message)).toContain('registerWgpuColorAdjustmentMaterialFeature');
|
|
55
62
|
} finally {
|
|
56
|
-
removeLogSink(sink.sink);
|
|
63
|
+
removeLogSink(logState, sink.sink);
|
|
57
64
|
}
|
|
58
65
|
});
|
|
59
66
|
|
|
67
|
+
it('stays silent after a later enable with null replaces an earlier log state', async () => {
|
|
68
|
+
const state = await createWgpuRenderStateForTest();
|
|
69
|
+
const logState = createLogState();
|
|
70
|
+
const sink = createMemoryLogSink(8);
|
|
71
|
+
addLogSink(logState, sink.sink);
|
|
72
|
+
enableWgpuColorAdjustmentGuards(state, logState);
|
|
73
|
+
enableWgpuColorAdjustmentGuards(state, null);
|
|
74
|
+
recordWgpuQuadBatchColorScaleBias(state, ct(), 0);
|
|
75
|
+
expect(readMemoryLogEntries(sink)).toHaveLength(0);
|
|
76
|
+
expect(areWgpuColorAdjustmentGuardsEnabled(state)).toBe(true);
|
|
77
|
+
});
|
|
78
|
+
|
|
60
79
|
it('stays silent for an untinted instance', async () => {
|
|
61
80
|
const state = await createWgpuRenderStateForTest();
|
|
81
|
+
const logState = createLogState();
|
|
62
82
|
const sink = createMemoryLogSink(8);
|
|
63
|
-
addLogSink(sink.sink);
|
|
83
|
+
addLogSink(logState, sink.sink);
|
|
64
84
|
try {
|
|
65
|
-
enableWgpuColorAdjustmentGuards(state);
|
|
85
|
+
enableWgpuColorAdjustmentGuards(state, logState);
|
|
66
86
|
recordWgpuQuadBatchColorScaleBias(state, null, 0);
|
|
67
|
-
expect(
|
|
87
|
+
expect(readMemoryLogEntries(sink).length).toBe(0);
|
|
68
88
|
} finally {
|
|
69
|
-
removeLogSink(sink.sink);
|
|
89
|
+
removeLogSink(logState, sink.sink);
|
|
70
90
|
}
|
|
71
91
|
});
|
|
72
92
|
|
|
73
93
|
it('does not warn when the guard slot is present but color adjustment is also enabled', async () => {
|
|
74
94
|
const state = await createWgpuRenderStateForTest();
|
|
95
|
+
const logState = createLogState();
|
|
75
96
|
const sink = createMemoryLogSink(8);
|
|
76
|
-
addLogSink(sink.sink);
|
|
97
|
+
addLogSink(logState, sink.sink);
|
|
77
98
|
try {
|
|
78
|
-
enableWgpuColorAdjustmentGuards(state);
|
|
99
|
+
enableWgpuColorAdjustmentGuards(state, logState);
|
|
79
100
|
registerWgpuColorAdjustmentMaterialFeature(state);
|
|
80
101
|
recordWgpuQuadBatchColorScaleBias(state, ct(), 0);
|
|
81
|
-
expect(
|
|
102
|
+
expect(readMemoryLogEntries(sink).length).toBe(0);
|
|
82
103
|
} finally {
|
|
83
|
-
removeLogSink(sink.sink);
|
|
104
|
+
removeLogSink(logState, sink.sink);
|
|
84
105
|
}
|
|
85
106
|
});
|
|
86
107
|
});
|
|
108
|
+
|
|
109
|
+
function readMemoryLogEntries(sink: Readonly<MemoryLogSink>): LogEntry[] {
|
|
110
|
+
const entries: LogEntry[] = [];
|
|
111
|
+
getMemoryLogSinkEntries(entries, sink);
|
|
112
|
+
return entries;
|
|
113
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { buildWgpuRenderRegistries } from '@flighthq/render-wgpu/contract';
|
|
2
|
+
import { RichTextKind, TextLabelKind } from '@flighthq/text/contract';
|
|
2
3
|
import {
|
|
3
4
|
BitmapTextKind,
|
|
4
5
|
DisplayObjectKind,
|
|
@@ -6,13 +7,11 @@ import {
|
|
|
6
7
|
ParticleEmitter2DKind,
|
|
7
8
|
QuadBatchKind,
|
|
8
9
|
RenderCacheKind,
|
|
9
|
-
RichTextKind,
|
|
10
10
|
Scale9ShapeKind,
|
|
11
11
|
Scale9SpriteKind,
|
|
12
12
|
ShapeKind,
|
|
13
13
|
SpriteKind,
|
|
14
14
|
StandardMaterialKind,
|
|
15
|
-
TextLabelKind,
|
|
16
15
|
TilemapKind,
|
|
17
16
|
} from '@flighthq/types/contract';
|
|
18
17
|
import { describe, expect, it } from 'vitest';
|
package/src/wgpuCache.test.ts
CHANGED
|
@@ -228,7 +228,7 @@ describe('createWgpuCacheState', () => {
|
|
|
228
228
|
screenRuntime.registries.colorAdjustmentFeature = colorAdjustmentFeature;
|
|
229
229
|
screenRuntime.registries.colorAdjustmentFeatureGuard = colorAdjustmentFeatureGuard;
|
|
230
230
|
screenRuntime.registries.renderRootGuard = renderRootGuard;
|
|
231
|
-
enableColorAdjustmentGuards(screen);
|
|
231
|
+
enableColorAdjustmentGuards(screen, null);
|
|
232
232
|
enableWgpuRenderCache(screen);
|
|
233
233
|
const cacheState = createCacheState(screen);
|
|
234
234
|
expect(renderWgpu.getWgpuRenderStateRuntime(cacheState).registries.nodeRenderers.get(RenderCacheKind)).toEqual(
|
|
@@ -153,7 +153,7 @@ describe('wgpuMeshShapeRenderer', () => {
|
|
|
153
153
|
const state = await createWgpuRenderStateForTest();
|
|
154
154
|
beginWgpuScreenRenderPassForTest(state);
|
|
155
155
|
getWgpuRenderStateRuntime(state).renderPass = makeMeshPassSpy();
|
|
156
|
-
enableRenderRegistriesGuards(state);
|
|
156
|
+
enableRenderRegistriesGuards(state, null);
|
|
157
157
|
|
|
158
158
|
wgpuMeshShapeRenderer.submit!(state, makeShapeProxy({ commands: gradientShape().data.commands, version: 1 }));
|
|
159
159
|
|
|
@@ -190,7 +190,7 @@ describe('drawWgpuRasterShape', () => {
|
|
|
190
190
|
setTestHosts(state);
|
|
191
191
|
beginWgpuScreenRenderPassForTest(state);
|
|
192
192
|
getWgpuRenderStateRuntime(state).renderPass = makeMeshPassSpy();
|
|
193
|
-
enableRenderRegistriesGuards(state);
|
|
193
|
+
enableRenderRegistriesGuards(state, null);
|
|
194
194
|
|
|
195
195
|
drawWgpuRasterShape(state, makeShapeProxy({ commands: solidShape().data.commands, version: 1 }));
|
|
196
196
|
|