@flighthq/scene2d-wgpu 0.5.1-next.920.da8f530 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/.tsbuildinfo.contract +1 -0
- package/dist/.tsbuildinfo.runtime +1 -0
- package/dist/contract.d.ts +32 -34
- package/dist/contract.d.ts.map +1 -1
- package/dist/contract.js +32 -34
- package/dist/contract.js.map +1 -1
- package/dist/contract.scene2d-wgpu-types.d.ts +6 -0
- package/dist/contract.scene2d-wgpu-types.d.ts.map +1 -0
- package/dist/contract.scene2d-wgpu-types.js +2 -0
- package/dist/contract.scene2d-wgpu-types.js.map +1 -0
- package/dist/enableWgpuColorAdjustmentGuards.d.ts +3 -2
- package/dist/enableWgpuColorAdjustmentGuards.d.ts.map +1 -1
- package/dist/enableWgpuColorAdjustmentGuards.js +23 -14
- package/dist/enableWgpuColorAdjustmentGuards.js.map +1 -1
- package/dist/enableWgpuStrokePathTessellation.d.ts +1 -1
- package/dist/enableWgpuStrokePathTessellation.d.ts.map +1 -1
- package/dist/enableWgpuStrokePathTessellation.js +1 -6
- package/dist/enableWgpuStrokePathTessellation.js.map +1 -1
- package/dist/index.d.ts +23 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +23 -2
- package/dist/index.js.map +1 -1
- package/dist/scene2DWgpuPipeline.d.ts +13 -0
- package/dist/scene2DWgpuPipeline.d.ts.map +1 -0
- package/dist/scene2DWgpuPipeline.js +59 -0
- package/dist/scene2DWgpuPipeline.js.map +1 -0
- package/dist/types/WgpuColorAdjustmentMaterialFeature.d.ts +2 -0
- package/dist/types/WgpuColorAdjustmentMaterialFeature.d.ts.map +1 -0
- package/dist/types/WgpuColorAdjustmentMaterialFeature.js +2 -0
- package/dist/types/WgpuColorAdjustmentMaterialFeature.js.map +1 -0
- package/dist/types/WgpuRenderStats.d.ts +12 -0
- package/dist/types/WgpuRenderStats.d.ts.map +1 -0
- package/dist/types/WgpuRenderStats.js +2 -0
- package/dist/types/WgpuRenderStats.js.map +1 -0
- package/dist/types/WgpuRichTextOverlay.d.ts +4 -0
- package/dist/types/WgpuRichTextOverlay.d.ts.map +1 -0
- package/dist/types/WgpuRichTextOverlay.js +2 -0
- package/dist/types/WgpuRichTextOverlay.js.map +1 -0
- package/dist/types/WgpuShapeMesh.d.ts +2 -0
- package/dist/types/WgpuShapeMesh.d.ts.map +1 -0
- package/dist/types/WgpuShapeMesh.js +2 -0
- package/dist/types/WgpuShapeMesh.js.map +1 -0
- package/dist/types/WgpuShapeRendererData.d.ts +17 -0
- package/dist/types/WgpuShapeRendererData.d.ts.map +1 -0
- package/dist/types/WgpuShapeRendererData.js +2 -0
- package/dist/types/WgpuShapeRendererData.js.map +1 -0
- package/dist/wgpuBitmapText.d.ts +2 -2
- package/dist/wgpuBitmapText.d.ts.map +1 -1
- package/dist/wgpuBitmapText.js +20 -19
- package/dist/wgpuBitmapText.js.map +1 -1
- package/dist/wgpuCache.d.ts +9 -6
- package/dist/wgpuCache.d.ts.map +1 -1
- package/dist/wgpuCache.js +17 -18
- package/dist/wgpuCache.js.map +1 -1
- package/dist/wgpuClip.d.ts +1 -1
- package/dist/wgpuClip.d.ts.map +1 -1
- package/dist/wgpuClip.js +2 -2
- package/dist/wgpuClip.js.map +1 -1
- package/dist/wgpuClipContours.d.ts +3 -1
- package/dist/wgpuClipContours.d.ts.map +1 -1
- package/dist/wgpuClipContours.js +7 -8
- package/dist/wgpuClipContours.js.map +1 -1
- package/dist/wgpuClipRectangle.d.ts +2 -1
- package/dist/wgpuClipRectangle.d.ts.map +1 -1
- package/dist/wgpuClipRectangle.js +4 -5
- package/dist/wgpuClipRectangle.js.map +1 -1
- package/dist/wgpuColorAdjustmentMaterialFeature.d.ts +1 -1
- package/dist/wgpuColorAdjustmentMaterialFeature.d.ts.map +1 -1
- package/dist/wgpuColorAdjustmentMaterialFeature.js +9 -13
- package/dist/wgpuColorAdjustmentMaterialFeature.js.map +1 -1
- package/dist/wgpuMeshShapeRenderer.d.ts +3 -2
- package/dist/wgpuMeshShapeRenderer.d.ts.map +1 -1
- package/dist/wgpuMeshShapeRenderer.js +9 -8
- package/dist/wgpuMeshShapeRenderer.js.map +1 -1
- package/dist/wgpuNode2D.d.ts +6 -3
- package/dist/wgpuNode2D.d.ts.map +1 -1
- package/dist/wgpuNode2D.js +20 -4
- package/dist/wgpuNode2D.js.map +1 -1
- package/dist/wgpuParticleEmitter2D.d.ts +4 -2
- package/dist/wgpuParticleEmitter2D.d.ts.map +1 -1
- package/dist/wgpuParticleEmitter2D.js +26 -14
- package/dist/wgpuParticleEmitter2D.js.map +1 -1
- package/dist/wgpuQuadBatch.d.ts +3 -3
- package/dist/wgpuQuadBatch.d.ts.map +1 -1
- package/dist/wgpuQuadBatch.js +29 -25
- package/dist/wgpuQuadBatch.js.map +1 -1
- package/dist/wgpuQuadBatchWriter.d.ts +11 -5
- package/dist/wgpuQuadBatchWriter.d.ts.map +1 -1
- package/dist/wgpuQuadBatchWriter.js +45 -19
- package/dist/wgpuQuadBatchWriter.js.map +1 -1
- package/dist/wgpuRasterShapeRenderer.d.ts +3 -2
- package/dist/wgpuRasterShapeRenderer.d.ts.map +1 -1
- package/dist/wgpuRasterShapeRenderer.js +49 -35
- package/dist/wgpuRasterShapeRenderer.js.map +1 -1
- package/dist/wgpuRenderStats.d.ts +2 -1
- package/dist/wgpuRenderStats.d.ts.map +1 -1
- package/dist/wgpuRenderStats.js.map +1 -1
- package/dist/wgpuRendererData.d.ts +2 -1
- package/dist/wgpuRendererData.d.ts.map +1 -1
- package/dist/wgpuRendererData.js +1 -1
- package/dist/wgpuRendererData.js.map +1 -1
- package/dist/wgpuRichText.d.ts +6 -3
- package/dist/wgpuRichText.d.ts.map +1 -1
- package/dist/wgpuRichText.js +67 -34
- package/dist/wgpuRichText.js.map +1 -1
- package/dist/wgpuScale9Mapper.d.ts +2 -1
- package/dist/wgpuScale9Mapper.d.ts.map +1 -1
- package/dist/wgpuScale9Mapper.js.map +1 -1
- package/dist/wgpuScale9Shape.d.ts +10 -5
- package/dist/wgpuScale9Shape.d.ts.map +1 -1
- package/dist/wgpuScale9Shape.js +54 -28
- package/dist/wgpuScale9Shape.js.map +1 -1
- package/dist/wgpuScale9Sprite.d.ts +3 -2
- package/dist/wgpuScale9Sprite.d.ts.map +1 -1
- package/dist/wgpuScale9Sprite.js +30 -36
- package/dist/wgpuScale9Sprite.js.map +1 -1
- package/dist/wgpuShape.d.ts +4 -3
- package/dist/wgpuShape.d.ts.map +1 -1
- package/dist/wgpuShape.js +7 -7
- package/dist/wgpuShape.js.map +1 -1
- package/dist/wgpuShapeData.d.ts +8 -3
- package/dist/wgpuShapeData.d.ts.map +1 -1
- package/dist/wgpuShapeData.js +12 -9
- package/dist/wgpuShapeData.js.map +1 -1
- package/dist/wgpuShapeMesh.d.ts +4 -2
- package/dist/wgpuShapeMesh.d.ts.map +1 -1
- package/dist/wgpuShapeMesh.js +9 -8
- package/dist/wgpuShapeMesh.js.map +1 -1
- package/dist/wgpuShapeRasterizer.d.ts +2 -1
- package/dist/wgpuShapeRasterizer.d.ts.map +1 -1
- package/dist/wgpuShapeRasterizer.js +3 -8
- package/dist/wgpuShapeRasterizer.js.map +1 -1
- package/dist/wgpuSprite.d.ts +3 -2
- package/dist/wgpuSprite.d.ts.map +1 -1
- package/dist/wgpuSprite.js +17 -32
- package/dist/wgpuSprite.js.map +1 -1
- package/dist/wgpuStandardMaterial.d.ts +2 -2
- package/dist/wgpuStandardMaterial.d.ts.map +1 -1
- package/dist/wgpuStandardMaterial.js +5 -5
- package/dist/wgpuStandardMaterial.js.map +1 -1
- package/dist/wgpuTextInput.d.ts +2 -1
- package/dist/wgpuTextInput.d.ts.map +1 -1
- package/dist/wgpuTextInput.js +6 -7
- package/dist/wgpuTextInput.js.map +1 -1
- package/dist/wgpuTextLabel.d.ts +3 -2
- package/dist/wgpuTextLabel.d.ts.map +1 -1
- package/dist/wgpuTextLabel.js +68 -48
- package/dist/wgpuTextLabel.js.map +1 -1
- package/dist/wgpuTilemap.d.ts +2 -2
- package/dist/wgpuTilemap.d.ts.map +1 -1
- package/dist/wgpuTilemap.js +20 -19
- package/dist/wgpuTilemap.js.map +1 -1
- package/dist/wgpuVelocity.d.ts +10 -7
- package/dist/wgpuVelocity.d.ts.map +1 -1
- package/dist/wgpuVelocity.js +95 -90
- package/dist/wgpuVelocity.js.map +1 -1
- package/package.json +31 -24
- package/src/contract.test.ts +13 -0
- package/src/enableWgpuColorAdjustmentGuards.test.ts +50 -28
- package/src/enableWgpuStrokePathTessellation.test.ts +4 -9
- package/src/scene2DWgpuPipeline.test.ts +53 -0
- package/src/wgpuBitmapText.test.ts +10 -10
- package/src/wgpuCache.test.ts +130 -168
- package/src/wgpuClip.test.ts +1 -1
- package/src/wgpuClipContours.test.ts +13 -6
- package/src/wgpuClipRectangle.test.ts +8 -8
- package/src/wgpuColorAdjustmentMaterialFeature.test.ts +20 -19
- package/src/wgpuMeshShapeRenderer.test.ts +51 -52
- package/src/wgpuNode2D.test.ts +14 -14
- package/src/wgpuParticleEmitter2D.test.ts +99 -38
- package/src/wgpuQuadBatch.test.ts +126 -32
- package/src/wgpuQuadBatchWriter.test.ts +108 -34
- package/src/wgpuRasterShapeRenderer.test.ts +95 -57
- package/src/wgpuRenderStats.test.ts +1 -1
- package/src/wgpuRendererData.test.ts +2 -2
- package/src/wgpuRichText.test.ts +109 -58
- package/src/wgpuScale9Mapper.test.ts +1 -1
- package/src/wgpuScale9Shape.test.ts +103 -62
- package/src/wgpuScale9Sprite.test.ts +38 -41
- package/src/wgpuShape.test.ts +111 -76
- package/src/wgpuShapeData.test.ts +96 -53
- package/src/wgpuShapeMesh.test.ts +39 -25
- package/src/wgpuShapeRasterizer.test.ts +11 -7
- package/src/wgpuSprite.test.ts +67 -24
- package/src/wgpuStandardMaterial.test.ts +9 -13
- package/src/wgpuTextInput.test.ts +9 -6
- package/src/wgpuTextLabel.test.ts +145 -88
- package/src/wgpuTilemap.test.ts +11 -11
- package/src/wgpuVelocity.test.ts +86 -86
- package/dist/scene2dWgpuPipeline.d.ts +0 -3
- package/dist/scene2dWgpuPipeline.d.ts.map +0 -1
- package/dist/scene2dWgpuPipeline.js +0 -40
- package/dist/scene2dWgpuPipeline.js.map +0 -1
package/dist/wgpuBitmapText.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { getWgpuRenderStateRuntime,
|
|
2
|
-
import { SCENE2D_WORKING_COLOR_SPACE } from '@flighthq/render/contract';
|
|
1
|
+
import { getWgpuRenderStateRuntime, resolveWgpuQuadMaterialRenderer, resolveWgpuTexture, } from '@flighthq/render-wgpu/contract';
|
|
2
|
+
import { SCENE2D_WORKING_COLOR_SPACE, BatchFormat } from '@flighthq/render/contract';
|
|
3
3
|
import { noopRendererData } from '@flighthq/render/contract';
|
|
4
4
|
import { getNode2DRuntime } from '@flighthq/scene2d/contract';
|
|
5
5
|
import { getTextureHeight, getTextureWidth, hasTextureSource } from '@flighthq/texture/contract';
|
|
6
|
-
import {
|
|
7
|
-
import { packWgpuQuadBatchMaterialInstance, prepareWgpuQuadBatchWrite, recordWgpuQuadBatchColorScaleBias, QUAD_BATCH_INSTANCE_FLOATS, } from './wgpuQuadBatchWriter';
|
|
6
|
+
import { TextureAtlasRotation } from '@flighthq/textureatlas/contract';
|
|
7
|
+
import { packWgpuQuadBatchMaterialInstance, prepareWgpuQuadBatchWrite, recordWgpuQuadBatchColorScaleBias, writeWgpuQuadBatchAffineInstance, QUAD_BATCH_INSTANCE_FLOATS, } from './wgpuQuadBatchWriter.js';
|
|
8
8
|
const INSTANCE_STRIDE_FLOATS = QUAD_BATCH_INSTANCE_FLOATS;
|
|
9
9
|
// Draws a BitmapText leaf on WebGPU: one batched sprite pass per glyph-atlas page. The node's resolved
|
|
10
10
|
// color adjustment folds in as a whole-node tint on every glyph (the same
|
|
@@ -17,7 +17,7 @@ function submitWgpuBitmapText(state, node) {
|
|
|
17
17
|
const source = node.source;
|
|
18
18
|
const pages = getNode2DRuntime(source).pages;
|
|
19
19
|
const material = node.material;
|
|
20
|
-
const materialRenderer =
|
|
20
|
+
const materialRenderer = resolveWgpuQuadMaterialRenderer(state, material);
|
|
21
21
|
if (materialRenderer === null)
|
|
22
22
|
return;
|
|
23
23
|
const nodeMaterialData = node.materialData;
|
|
@@ -60,19 +60,19 @@ function submitWgpuBitmapText(state, node) {
|
|
|
60
60
|
continue;
|
|
61
61
|
const dx = transforms[i * 2];
|
|
62
62
|
const dy = transforms[i * 2 + 1];
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
instanceData
|
|
63
|
+
glyphTransform.a = pa;
|
|
64
|
+
glyphTransform.b = pb;
|
|
65
|
+
glyphTransform.c = pc;
|
|
66
|
+
glyphTransform.d = pd;
|
|
67
|
+
glyphTransform.tx = pa * dx + pc * dy + ptx;
|
|
68
|
+
glyphTransform.ty = pb * dx + pd * dy + pty;
|
|
69
|
+
const u0 = region.x * iw;
|
|
70
|
+
const v0 = region.y * ih;
|
|
71
|
+
const u1 = (region.x + region.width) * iw;
|
|
72
|
+
const v1 = (region.y + region.height) * ih;
|
|
73
|
+
const rotated = region.rotation !== TextureAtlasRotation.None;
|
|
74
|
+
const counterclockwise = region.rotation === TextureAtlasRotation.Counterclockwise90;
|
|
75
|
+
writeWgpuQuadBatchAffineInstance(instanceData, writeBase, glyphTransform, rotated ? region.height : region.width, rotated ? region.width : region.height, rotated ? (counterclockwise ? u0 : u1) : u0, rotated && counterclockwise ? v1 : v0, rotated ? 0 : u1 - u0, rotated ? (counterclockwise ? v0 - v1 : v1 - v0) : 0, rotated ? (counterclockwise ? u1 - u0 : u0 - u1) : 0, rotated ? 0 : v1 - v0, alpha);
|
|
76
76
|
packWgpuQuadBatchMaterialInstance(state, nodeMaterialData, startInstance + drawCount);
|
|
77
77
|
recordWgpuQuadBatchColorScaleBias(state, nodeColorScaleBias, startInstance + drawCount);
|
|
78
78
|
writeBase += INSTANCE_STRIDE_FLOATS;
|
|
@@ -81,9 +81,10 @@ function submitWgpuBitmapText(state, node) {
|
|
|
81
81
|
runtime.quadBatchWriterCount += drawCount;
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
|
-
export const
|
|
84
|
+
export const wgpuBitmapTextRenderer = {
|
|
85
85
|
format: BatchFormat.Quad,
|
|
86
86
|
createData: noopRendererData,
|
|
87
87
|
submit: submitWgpuBitmapText,
|
|
88
88
|
};
|
|
89
|
+
const glyphTransform = { a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0 };
|
|
89
90
|
//# sourceMappingURL=wgpuBitmapText.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuBitmapText.js","sourceRoot":"","sources":["../src/wgpuBitmapText.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,
|
|
1
|
+
{"version":3,"file":"wgpuBitmapText.js","sourceRoot":"","sources":["../src/wgpuBitmapText.ts"],"names":[],"mappings":"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"}
|
package/dist/wgpuCache.d.ts
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { WgpuDeviceState, WgpuRenderState, WgpuRenderStateOptions, WgpuTextureRenderTarget } from '@flighthq/render-wgpu/contract';
|
|
2
|
+
import type { Scene2DRenderer } from '@flighthq/render/contract';
|
|
3
|
+
import type { RenderCache, RenderCacheRefreshOptions } from '@flighthq/render/contract';
|
|
4
|
+
import type { Node2D } from '@flighthq/scene2d/contract';
|
|
2
5
|
/**
|
|
3
6
|
* Creates an offscreen render state for baking render caches consumed by `screenState`.
|
|
4
7
|
*
|
|
@@ -7,15 +10,15 @@ import type { Node2D, RenderCache, RenderCacheRefreshOptions, Scene2DRenderer, W
|
|
|
7
10
|
* uniform ring, frame-local batch resources, and scene-graph bookkeeping; a bounded frame borrow
|
|
8
11
|
* supplies only the live presentation encoder/pass while a bake is being recorded.
|
|
9
12
|
*/
|
|
10
|
-
export declare function createWgpuCacheState(ownerState: WgpuRenderState, deviceState: Readonly<WgpuDeviceState>,
|
|
13
|
+
export declare function createWgpuCacheState(ownerState: WgpuRenderState, deviceState: Readonly<WgpuDeviceState>, options?: Readonly<WgpuRenderStateOptions>): WgpuRenderState;
|
|
11
14
|
export declare function enableWgpuRenderCache(state: WgpuRenderState): void;
|
|
12
15
|
/**
|
|
13
16
|
* Allocates or resizes the texture `screenState` composites for `cache`, returning it so a
|
|
14
17
|
* caller can render custom content into it directly. For engine-baked content prefer
|
|
15
18
|
* refreshWgpuRenderCache.
|
|
16
19
|
*/
|
|
17
|
-
export declare function ensureWgpuRenderCacheTarget(state: WgpuRenderState, cache: RenderCache, width: number, height: number):
|
|
18
|
-
export declare function getWgpuRenderCacheTarget(state: WgpuRenderState, cache: RenderCache):
|
|
20
|
+
export declare function ensureWgpuRenderCacheTarget(state: WgpuRenderState, cache: RenderCache, width: number, height: number): WgpuTextureRenderTarget;
|
|
21
|
+
export declare function getWgpuRenderCacheTarget(state: WgpuRenderState, cache: RenderCache): WgpuTextureRenderTarget | null;
|
|
19
22
|
/**
|
|
20
23
|
* Bakes `source`'s subtree into its cache target using the offscreen `cacheState`, then records
|
|
21
24
|
* the transform that places the result back in scene space. Returns whether a bake happened —
|
|
@@ -23,7 +26,7 @@ export declare function getWgpuRenderCacheTarget(state: WgpuRenderState, cache:
|
|
|
23
26
|
* cheap to call every frame. Because the bake runs on the shared GPU device, it can composite its
|
|
24
27
|
* owned target in the owner's frame without acquiring presentation capability itself.
|
|
25
28
|
*/
|
|
26
|
-
export declare function refreshWgpuRenderCache(ownerState:
|
|
29
|
+
export declare function refreshWgpuRenderCache(ownerState: WgpuRenderState, cacheState: WgpuRenderState, cache: RenderCache, source: Node2D, options?: Readonly<RenderCacheRefreshOptions>): boolean;
|
|
27
30
|
export declare function releaseWgpuRenderCache(state: WgpuRenderState, cache: RenderCache): void;
|
|
28
|
-
export declare const
|
|
31
|
+
export declare const wgpuRenderCacheRenderer: Scene2DRenderer;
|
|
29
32
|
//# sourceMappingURL=wgpuCache.d.ts.map
|
package/dist/wgpuCache.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuCache.d.ts","sourceRoot":"","sources":["../src/wgpuCache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuCache.d.ts","sourceRoot":"","sources":["../src/wgpuCache.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,gCAAgC,CAAC;AAUxC,OAAO,KAAK,EAAiB,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,KAAK,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAKzD;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,eAAe,EAC3B,WAAW,EAAE,QAAQ,CAAC,eAAe,CAAC,EACtC,OAAO,GAAE,QAAQ,CAAC,sBAAsB,CAAM,GAC7C,eAAe,CASjB;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,uBAAuB,CAUzB;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,GAAG,uBAAuB,GAAG,IAAI,CAEnH;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,eAAe,EAC3B,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAC5C,OAAO,CA6BT;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI,CAQvF;AAmCD,eAAO,MAAM,uBAAuB,EAAE,eAGrC,CAAC"}
|
package/dist/wgpuCache.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { createMatrix, createRectangle, multiplyMatrix } from '@flighthq/geometry/contract';
|
|
2
2
|
import { computeNodeBoundsRectangle } from '@flighthq/node/contract';
|
|
3
|
-
import { beginWgpuRenderPass, createWgpuOffscreenRenderState,
|
|
4
|
-
import { computeScene2DRenderTargetTransform, computeRenderCacheTransform, computeRenderTargetSize, getRenderProxyCache, noopRendererData, prepareScene2DRender,
|
|
5
|
-
import { renderWgpuScene2D } from './wgpuNode2D';
|
|
6
|
-
import { flushWgpuQuadBatchWriter } from './wgpuQuadBatchWriter';
|
|
3
|
+
import { beginWgpuRenderPass, createWgpuOffscreenRenderState, createWgpuTextureRenderTarget, destroyWgpuRenderState, destroyWgpuTextureRenderTarget, drawWgpuTextureRenderTargetResult, endWgpuRenderPass, resizeWgpuTextureRenderTarget, getWgpuRenderStateRuntime, registerWgpuRenderStateTeardown, withWgpuFrameBorrow, } from '@flighthq/render-wgpu/contract';
|
|
4
|
+
import { computeScene2DRenderTargetTransform, computeRenderCacheTransform, computeRenderTargetSize, getRenderProxyCache, noopRendererData, prepareScene2DRender, registerRenderCacheNodeRenderer, } from '@flighthq/render/contract';
|
|
5
|
+
import { renderWgpuScene2D } from './wgpuNode2D.js';
|
|
6
|
+
import { flushWgpuQuadBatchWriter } from './wgpuQuadBatchWriter.js';
|
|
7
7
|
/**
|
|
8
8
|
* Creates an offscreen render state for baking render caches consumed by `screenState`.
|
|
9
9
|
*
|
|
@@ -12,8 +12,8 @@ import { flushWgpuQuadBatchWriter } from './wgpuQuadBatchWriter';
|
|
|
12
12
|
* uniform ring, frame-local batch resources, and scene-graph bookkeeping; a bounded frame borrow
|
|
13
13
|
* supplies only the live presentation encoder/pass while a bake is being recorded.
|
|
14
14
|
*/
|
|
15
|
-
export function createWgpuCacheState(ownerState, deviceState,
|
|
16
|
-
const cacheState = createWgpuOffscreenRenderState(deviceState,
|
|
15
|
+
export function createWgpuCacheState(ownerState, deviceState, options = {}) {
|
|
16
|
+
const cacheState = createWgpuOffscreenRenderState(deviceState, options);
|
|
17
17
|
// The explicit owner is retained only for late blend policy. Frame/resource ownership remains local,
|
|
18
18
|
// and owner teardown closes this state exactly once.
|
|
19
19
|
cacheState.applyBlendMode = null;
|
|
@@ -23,7 +23,7 @@ export function createWgpuCacheState(ownerState, deviceState, pipeline, options
|
|
|
23
23
|
return cacheState;
|
|
24
24
|
}
|
|
25
25
|
export function enableWgpuRenderCache(state) {
|
|
26
|
-
|
|
26
|
+
registerRenderCacheNodeRenderer(state, wgpuRenderCacheRenderer);
|
|
27
27
|
}
|
|
28
28
|
/**
|
|
29
29
|
* Allocates or resizes the texture `screenState` composites for `cache`, returning it so a
|
|
@@ -34,11 +34,11 @@ export function ensureWgpuRenderCacheTarget(state, cache, width, height) {
|
|
|
34
34
|
const targets = getTargets(state);
|
|
35
35
|
let target = targets.get(cache);
|
|
36
36
|
if (target === undefined) {
|
|
37
|
-
target =
|
|
37
|
+
target = createWgpuTextureRenderTarget(state, width, height);
|
|
38
38
|
targets.set(cache, target);
|
|
39
39
|
}
|
|
40
40
|
else {
|
|
41
|
-
|
|
41
|
+
resizeWgpuTextureRenderTarget(state, target, width, height);
|
|
42
42
|
}
|
|
43
43
|
return target;
|
|
44
44
|
}
|
|
@@ -67,16 +67,15 @@ export function refreshWgpuRenderCache(ownerState, cacheState, cache, source, op
|
|
|
67
67
|
_yInvert.d = -1;
|
|
68
68
|
_yInvert.ty = target.height;
|
|
69
69
|
multiplyMatrix(_bakeTransform, _yInvert, _renderTransform);
|
|
70
|
-
beginWgpuRenderPass(cacheState, target);
|
|
70
|
+
const pass = beginWgpuRenderPass(cacheState, target, { color: [0, 0, 0, 0], depth: 1.0, stencil: 0 });
|
|
71
71
|
try {
|
|
72
|
-
setWgpuRenderTransform2D(cacheState, _bakeTransform);
|
|
73
72
|
const dirty = prepareScene2DRender(cacheState, source);
|
|
74
73
|
if (dirty || resized)
|
|
75
|
-
renderWgpuScene2D(
|
|
74
|
+
renderWgpuScene2D(pass, source, _bakeTransform);
|
|
76
75
|
return dirty || resized;
|
|
77
76
|
}
|
|
78
77
|
finally {
|
|
79
|
-
endWgpuRenderPass(
|
|
78
|
+
endWgpuRenderPass(pass);
|
|
80
79
|
}
|
|
81
80
|
});
|
|
82
81
|
}
|
|
@@ -87,8 +86,8 @@ export function releaseWgpuRenderCache(state, cache) {
|
|
|
87
86
|
const target = targets.get(cache);
|
|
88
87
|
if (target === undefined)
|
|
89
88
|
return;
|
|
90
|
-
// A
|
|
91
|
-
|
|
89
|
+
// A WgpuTextureRenderTarget owns GPU textures; GC will not free them.
|
|
90
|
+
destroyWgpuTextureRenderTarget(target);
|
|
92
91
|
targets.delete(cache);
|
|
93
92
|
}
|
|
94
93
|
function drawWgpuRenderCache(state, renderProxy) {
|
|
@@ -105,7 +104,7 @@ function drawWgpuRenderCache(state, renderProxy) {
|
|
|
105
104
|
flushWgpuQuadBatchWriter(state);
|
|
106
105
|
// renderProxy.transform2D already carries the cache placement transform (folded in by the
|
|
107
106
|
// adapter), so the target composites with an identity offset.
|
|
108
|
-
|
|
107
|
+
drawWgpuTextureRenderTargetResult(state, renderProxy, target, _identity);
|
|
109
108
|
}
|
|
110
109
|
function getTargets(state) {
|
|
111
110
|
let targets = _renderCacheTargets.get(state);
|
|
@@ -121,11 +120,11 @@ function destroyOwnedWgpuRenderCacheTargets(state) {
|
|
|
121
120
|
if (targets === undefined)
|
|
122
121
|
return;
|
|
123
122
|
for (const target of targets.values())
|
|
124
|
-
|
|
123
|
+
destroyWgpuTextureRenderTarget(target);
|
|
125
124
|
targets.clear();
|
|
126
125
|
_renderCacheTargets.delete(state);
|
|
127
126
|
}
|
|
128
|
-
export const
|
|
127
|
+
export const wgpuRenderCacheRenderer = {
|
|
129
128
|
createData: noopRendererData,
|
|
130
129
|
submit: drawWgpuRenderCache,
|
|
131
130
|
};
|
package/dist/wgpuCache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuCache.js","sourceRoot":"","sources":["../src/wgpuCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"wgpuCache.js","sourceRoot":"","sources":["../src/wgpuCache.ts"],"names":[],"mappings":"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"}
|
package/dist/wgpuClip.d.ts
CHANGED
package/dist/wgpuClip.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuClip.d.ts","sourceRoot":"","sources":["../src/wgpuClip.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"wgpuClip.d.ts","sourceRoot":"","sources":["../src/wgpuClip.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAStE,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAElE"}
|
package/dist/wgpuClip.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getWgpuRenderStateRuntime } from '@flighthq/render-wgpu/contract';
|
|
2
|
-
import { popWgpuClipContours, pushWgpuClipContours } from './wgpuClipContours';
|
|
3
|
-
import { popWgpuClipRectangle, pushWgpuClipRectangle } from './wgpuClipRectangle';
|
|
2
|
+
import { popWgpuClipContours, pushWgpuClipContours } from './wgpuClipContours.js';
|
|
3
|
+
import { popWgpuClipRectangle, pushWgpuClipRectangle } from './wgpuClipRectangle.js';
|
|
4
4
|
// Masks RETIRED — a former mask is a path ClipRegion. Clip = scissor (rect) or stencil-then-cover
|
|
5
5
|
// (contour); independent gates that AND when nested. `runtime.clipForms` records each clip's form for unwind.
|
|
6
6
|
export function enableWgpuClipSupport(state) {
|
package/dist/wgpuClip.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuClip.js","sourceRoot":"","sources":["../src/wgpuClip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"wgpuClip.js","sourceRoot":"","sources":["../src/wgpuClip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAK3E,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAErF,kGAAkG;AAClG,8GAA8G;AAC9G,MAAM,UAAU,qBAAqB,CAAC,KAAsB;IAC1D,KAAK,CAAC,sBAAsB,GAAG,eAAe,CAAC;AACjD,CAAC;AAED,SAAS,cAAc,CAAC,KAAsB;IAC5C,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;IACrC,IAAI,IAAI,KAAK,SAAS;QAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC;;QAC9C,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,yDAAyD;AAC7F,CAAC;AAED,MAAM,eAAe,GAAqB;IACxC,QAAQ,CAAC,KAAsB;QAC7B,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;QACjD,OAAO,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;YAAE,cAAc,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,CAAC,KAAsB,EAAE,IAAmB,EAAE,MAAc;QACjE,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,OAAO,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,MAAM;YAAE,cAAc,CAAC,KAAK,CAAC,CAAC;IAClE,CAAC;IACD,QAAQ,CAAC,KAAsB,EAAE,IAAmB,EAAE,MAAc;QAClE,MAAM,OAAO,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO;QAC1B,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC3B,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAC1D,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,oBAAoB,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAC3E,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;CACF,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import type { Matrix
|
|
1
|
+
import type { Matrix } from '@flighthq/geometry/contract';
|
|
2
|
+
import type { PathWinding } from '@flighthq/path/contract';
|
|
3
|
+
import type { WgpuRenderState } from '@flighthq/render-wgpu/contract';
|
|
2
4
|
export declare function popWgpuClipContours(state: WgpuRenderState): void;
|
|
3
5
|
export declare function pushWgpuClipContours(state: WgpuRenderState, contours: readonly (readonly number[])[], winding: PathWinding, worldTransform: Readonly<Matrix>): void;
|
|
4
6
|
//# sourceMappingURL=wgpuClipContours.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuClipContours.d.ts","sourceRoot":"","sources":["../src/wgpuClipContours.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuClipContours.d.ts","sourceRoot":"","sources":["../src/wgpuClipContours.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAQ3D,OAAO,KAAK,EAIV,eAAe,EAGhB,MAAM,gCAAgC,CAAC;AAsCxC,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAuBhE;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,eAAe,EACtB,QAAQ,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,EACxC,OAAO,EAAE,WAAW,EACpB,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC/B,IAAI,CA+BN"}
|
package/dist/wgpuClipContours.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { flushWgpuQuadBatchWriter } from './wgpuQuadBatchWriter';
|
|
1
|
+
import { WgpuBufferUsage, WgpuShaderStage, getWgpuRenderPassViewport, getWgpuRenderStateRuntime, retireWgpuBuffer, } from '@flighthq/render-wgpu/contract';
|
|
2
|
+
import { flushWgpuQuadBatchWriter } from './wgpuQuadBatchWriter.js';
|
|
3
3
|
// Wgpu contour clip via stencil nesting — the Wgpu counterpart to webglClipContours. A path
|
|
4
4
|
// ClipRegion is realized by stamping its covered pixels into the stencil buffer, then content draws in
|
|
5
5
|
// the existing 'masked' stencil mode (compare equal, reference = currentMaskDepth). Crisp at any zoom:
|
|
@@ -50,7 +50,7 @@ export function popWgpuClipContours(state) {
|
|
|
50
50
|
}
|
|
51
51
|
if (entry !== undefined) {
|
|
52
52
|
// The erase draw just recorded references these buffers; the frame's submit is deferred to
|
|
53
|
-
//
|
|
53
|
+
// submitWgpuFrame, so defer their destruction until after that submit.
|
|
54
54
|
retireWgpuBuffer(state, entry.vertexBuffer);
|
|
55
55
|
retireWgpuBuffer(state, entry.uniformBuffer);
|
|
56
56
|
}
|
|
@@ -86,8 +86,7 @@ export function pushWgpuClipContours(state, contours, winding, worldTransform) {
|
|
|
86
86
|
runtime.currentMaskDepth = depth + 1;
|
|
87
87
|
}
|
|
88
88
|
function createClipContourUniformBuffer(state, t) {
|
|
89
|
-
const
|
|
90
|
-
const viewport = runtime.renderTargetViewport ?? getWgpuSurfaceRenderExtent(state);
|
|
89
|
+
const viewport = getWgpuRenderPassViewport(state);
|
|
91
90
|
const iw = 2 / viewport.width;
|
|
92
91
|
const ih = 2 / viewport.height;
|
|
93
92
|
// Column-major mat3x3f = projection · worldTransform, mapping clip-local points to clip space exactly
|
|
@@ -105,7 +104,7 @@ function createClipContourUniformBuffer(state, t) {
|
|
|
105
104
|
m[10] = 1;
|
|
106
105
|
const buffer = state.device.createBuffer({
|
|
107
106
|
size: CLIP_UNIFORM_BYTES,
|
|
108
|
-
usage:
|
|
107
|
+
usage: WgpuBufferUsage.UNIFORM | WgpuBufferUsage.COPY_DST,
|
|
109
108
|
});
|
|
110
109
|
state.device.queue.writeBuffer(buffer, 0, m);
|
|
111
110
|
return buffer;
|
|
@@ -127,7 +126,7 @@ function createClipContourVertexBuffer(state, contours) {
|
|
|
127
126
|
const vertexCount = data.length >> 1;
|
|
128
127
|
const vertexBuffer = state.device.createBuffer({
|
|
129
128
|
size: Math.max(4, data.byteLength),
|
|
130
|
-
usage:
|
|
129
|
+
usage: WgpuBufferUsage.VERTEX | WgpuBufferUsage.COPY_DST,
|
|
131
130
|
});
|
|
132
131
|
if (data.byteLength > 0)
|
|
133
132
|
state.device.queue.writeBuffer(vertexBuffer, 0, data);
|
|
@@ -143,7 +142,7 @@ function ensureClipContourPipelines(state) {
|
|
|
143
142
|
const device = state.device;
|
|
144
143
|
const module = device.createShaderModule({ code: CLIP_WGSL });
|
|
145
144
|
const bindGroupLayout = device.createBindGroupLayout({
|
|
146
|
-
entries: [{ binding: 0, visibility:
|
|
145
|
+
entries: [{ binding: 0, visibility: WgpuShaderStage.VERTEX, buffer: { type: 'uniform' } }],
|
|
147
146
|
});
|
|
148
147
|
const layout = device.createPipelineLayout({ bindGroupLayouts: [bindGroupLayout] });
|
|
149
148
|
const vertexBuffers = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuClipContours.js","sourceRoot":"","sources":["../src/wgpuClipContours.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuClipContours.js","sourceRoot":"","sources":["../src/wgpuClipContours.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { MatrixLike, RectangleLike
|
|
1
|
+
import type { MatrixLike, RectangleLike } from '@flighthq/geometry/contract';
|
|
2
|
+
import type { WgpuRenderState } from '@flighthq/render-wgpu/contract';
|
|
2
3
|
export declare function popWgpuClipRectangle(state: WgpuRenderState): void;
|
|
3
4
|
export declare function pushWgpuClipRectangle(state: WgpuRenderState, rect: Readonly<RectangleLike>, transform: Readonly<MatrixLike>): void;
|
|
4
5
|
//# sourceMappingURL=wgpuClipRectangle.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuClipRectangle.d.ts","sourceRoot":"","sources":["../src/wgpuClipRectangle.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuClipRectangle.d.ts","sourceRoot":"","sources":["../src/wgpuClipRectangle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAM7E,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,gCAAgC,CAAC;AAIvF,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAoBjE;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE,QAAQ,CAAC,aAAa,CAAC,EAC7B,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,GAC9B,IAAI,CAmBN"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { getWgpuRenderStateRuntime,
|
|
2
|
-
import { flushWgpuQuadBatchWriter } from './wgpuQuadBatchWriter';
|
|
1
|
+
import { getWgpuRenderStateRuntime, getWgpuRenderPassViewport, setWgpuRenderPassScissorRect, } from '@flighthq/render-wgpu/contract';
|
|
2
|
+
import { flushWgpuQuadBatchWriter } from './wgpuQuadBatchWriter.js';
|
|
3
3
|
export function popWgpuClipRectangle(state) {
|
|
4
4
|
const runtime = getWgpuRenderStateRuntime(state);
|
|
5
5
|
flushWgpuQuadBatchWriter(state);
|
|
@@ -11,7 +11,7 @@ export function popWgpuClipRectangle(state) {
|
|
|
11
11
|
if (pass === null)
|
|
12
12
|
return;
|
|
13
13
|
if (previous === null) {
|
|
14
|
-
const viewport =
|
|
14
|
+
const viewport = getWgpuRenderPassViewport(state);
|
|
15
15
|
setWgpuRenderPassScissorRect(state, pass, 0, 0, viewport.width, viewport.height);
|
|
16
16
|
}
|
|
17
17
|
else if (previous.width <= 0 || previous.height <= 0) {
|
|
@@ -41,7 +41,6 @@ export function pushWgpuClipRectangle(state, rect, transform) {
|
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
function computeWgpuScissorRect(state, rect, transform) {
|
|
44
|
-
const runtime = getWgpuRenderStateRuntime(state);
|
|
45
44
|
const x0 = transform.a * rect.x + transform.c * rect.y + transform.tx;
|
|
46
45
|
const y0 = transform.b * rect.x + transform.d * rect.y + transform.ty;
|
|
47
46
|
const x1 = transform.a * (rect.x + rect.width) + transform.c * rect.y + transform.tx;
|
|
@@ -50,7 +49,7 @@ function computeWgpuScissorRect(state, rect, transform) {
|
|
|
50
49
|
const y2 = transform.b * rect.x + transform.d * (rect.y + rect.height) + transform.ty;
|
|
51
50
|
const x3 = transform.a * (rect.x + rect.width) + transform.c * (rect.y + rect.height) + transform.tx;
|
|
52
51
|
const y3 = transform.b * (rect.x + rect.width) + transform.d * (rect.y + rect.height) + transform.ty;
|
|
53
|
-
const viewport =
|
|
52
|
+
const viewport = getWgpuRenderPassViewport(state);
|
|
54
53
|
const minX = Math.max(0, Math.floor(Math.min(x0, x1, x2, x3)));
|
|
55
54
|
const maxX = Math.min(viewport.width, Math.ceil(Math.max(x0, x1, x2, x3)));
|
|
56
55
|
const minY = Math.max(0, Math.floor(Math.min(y0, y1, y2, y3)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuClipRectangle.js","sourceRoot":"","sources":["../src/wgpuClipRectangle.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wgpuClipRectangle.js","sourceRoot":"","sources":["../src/wgpuClipRectangle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { WgpuRenderState } from '@flighthq/
|
|
1
|
+
import type { WgpuRenderState } from '@flighthq/render-wgpu/contract';
|
|
2
2
|
export declare function registerWgpuColorAdjustmentMaterialFeature(state: WgpuRenderState): void;
|
|
3
3
|
//# sourceMappingURL=wgpuColorAdjustmentMaterialFeature.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wgpuColorAdjustmentMaterialFeature.d.ts","sourceRoot":"","sources":["../src/wgpuColorAdjustmentMaterialFeature.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"wgpuColorAdjustmentMaterialFeature.d.ts","sourceRoot":"","sources":["../src/wgpuColorAdjustmentMaterialFeature.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,eAAe,EAKhB,MAAM,gCAAgC,CAAC;AAexC,wBAAgB,0CAA0C,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAOvF"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { getWgpuBlendState, getWgpuRenderStateRuntime } from '@flighthq/render-wgpu/contract';
|
|
1
|
+
import { WgpuShaderStage, getWgpuBlendState, getWgpuRenderStateRuntime } from '@flighthq/render-wgpu/contract';
|
|
3
2
|
import { enableColorAdjustments } from '@flighthq/render/contract';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import { drawWgpuShapeMeshBatch } from './wgpuShapeMesh';
|
|
3
|
+
import { getWgpuQuadBatchPreludeWGSL } from './wgpuQuadBatchWriter.js';
|
|
4
|
+
import { drawWgpuShapeMeshBatch } from './wgpuShapeMesh.js';
|
|
7
5
|
// Enables the opt-in color-adjustment accumulator and inline fold on a WebGPU render state: the fused-color-matrix
|
|
8
6
|
// scene2d the sprite/quad batch draws through so a color adjustment (and, later, other pointwise
|
|
9
7
|
// adjustments) folds into the batch as per-instance storage data at @group(3) — replicated across the
|
|
@@ -14,12 +12,8 @@ import { drawWgpuShapeMeshBatch } from './wgpuShapeMesh';
|
|
|
14
12
|
export function registerWgpuColorAdjustmentMaterialFeature(state) {
|
|
15
13
|
enableColorAdjustments(state);
|
|
16
14
|
const runtime = getWgpuRenderStateRuntime(state);
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
runtime.registries.colorAdjustmentFeature = {
|
|
20
|
-
...table,
|
|
21
|
-
entry: { state: RegistryEntryState.Bound, value: wgpuColorAdjustmentMaterialFeature },
|
|
22
|
-
};
|
|
15
|
+
if (runtime.registries.colorAdjustmentFeature !== wgpuColorAdjustmentMaterialFeature) {
|
|
16
|
+
runtime.registries.colorAdjustmentFeature = wgpuColorAdjustmentMaterialFeature;
|
|
23
17
|
}
|
|
24
18
|
if (runtime.quadBatchWriterColorScaleBiasMode === undefined)
|
|
25
19
|
runtime.quadBatchWriterColorScaleBiasMode = CT_MODE_NONE;
|
|
@@ -434,7 +428,7 @@ function getPackedTint(value) {
|
|
|
434
428
|
0);
|
|
435
429
|
}
|
|
436
430
|
function isColorMatrixData(value) {
|
|
437
|
-
return
|
|
431
|
+
return value instanceof Float32Array;
|
|
438
432
|
}
|
|
439
433
|
function rgbaToNativeByteWord(rgba) {
|
|
440
434
|
return ((((rgba >>> 24) & 0xff) | (((rgba >>> 16) & 0xff) << 8) | (((rgba >>> 8) & 0xff) << 16) | ((rgba & 0xff) << 24)) >>>
|
|
@@ -497,7 +491,9 @@ function ensureWgpuShapeMeshColorScaleBiasPipeline(state, blendMode) {
|
|
|
497
491
|
const device = state.device;
|
|
498
492
|
const module = device.createShaderModule({ code: SHAPE_MESH_COLOR_SCALE_BIAS_WGSL });
|
|
499
493
|
const bindGroupLayout = device.createBindGroupLayout({
|
|
500
|
-
entries: [
|
|
494
|
+
entries: [
|
|
495
|
+
{ binding: 0, visibility: WgpuShaderStage.VERTEX | WgpuShaderStage.FRAGMENT, buffer: { type: 'uniform' } },
|
|
496
|
+
],
|
|
501
497
|
});
|
|
502
498
|
const layout = device.createPipelineLayout({ bindGroupLayouts: [bindGroupLayout] });
|
|
503
499
|
const pipeline = device.createRenderPipeline({
|