@codexo/exojs 0.4.0 → 0.6.2
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/CHANGELOG.md +499 -163
- package/README.md +156 -141
- package/dist/esm/audio/AudioAnalyser.d.ts +0 -1
- package/dist/esm/audio/AudioAnalyser.js +0 -2
- package/dist/esm/audio/AudioAnalyser.js.map +1 -1
- package/dist/esm/core/Application.d.ts +4 -4
- package/dist/esm/core/Application.js +19 -19
- package/dist/esm/core/Application.js.map +1 -1
- package/dist/esm/core/Scene.d.ts +59 -24
- package/dist/esm/core/Scene.js +60 -18
- package/dist/esm/core/Scene.js.map +1 -1
- package/dist/esm/core/SceneManager.js +15 -9
- package/dist/esm/core/SceneManager.js.map +1 -1
- package/dist/esm/core/SceneNode.d.ts +45 -5
- package/dist/esm/core/SceneNode.js +136 -7
- package/dist/esm/core/SceneNode.js.map +1 -1
- package/dist/esm/index.js +6 -4
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/math/index.d.ts +0 -1
- package/dist/esm/rendering/CallbackRenderPass.d.ts +3 -3
- package/dist/esm/rendering/CallbackRenderPass.js +2 -2
- package/dist/esm/rendering/CallbackRenderPass.js.map +1 -1
- package/dist/esm/rendering/Container.d.ts +10 -11
- package/dist/esm/rendering/Container.js +5 -5
- package/dist/esm/rendering/Container.js.map +1 -1
- package/dist/esm/rendering/Drawable.d.ts +2 -2
- package/dist/esm/rendering/Drawable.js +5 -5
- package/dist/esm/rendering/Drawable.js.map +1 -1
- package/dist/esm/rendering/{SceneRenderRuntime.d.ts → RenderBackend.d.ts} +21 -3
- package/dist/esm/rendering/RenderNode.d.ts +41 -5
- package/dist/esm/rendering/RenderNode.js +89 -24
- package/dist/esm/rendering/RenderNode.js.map +1 -1
- package/dist/esm/rendering/RenderPass.d.ts +2 -2
- package/dist/esm/rendering/RenderTargetPass.d.ts +3 -3
- package/dist/esm/rendering/RenderTargetPass.js +9 -9
- package/dist/esm/rendering/RenderTargetPass.js.map +1 -1
- package/dist/esm/rendering/Renderer.d.ts +3 -3
- package/dist/esm/rendering/RendererRegistry.d.ts +13 -7
- package/dist/esm/rendering/RendererRegistry.js +18 -10
- package/dist/esm/rendering/RendererRegistry.js.map +1 -1
- package/dist/esm/rendering/filters/BlurFilter.d.ts +2 -2
- package/dist/esm/rendering/filters/BlurFilter.js +5 -5
- package/dist/esm/rendering/filters/BlurFilter.js.map +1 -1
- package/dist/esm/rendering/filters/ColorFilter.d.ts +2 -2
- package/dist/esm/rendering/filters/ColorFilter.js +3 -3
- package/dist/esm/rendering/filters/ColorFilter.js.map +1 -1
- package/dist/esm/rendering/filters/Filter.d.ts +2 -2
- package/dist/esm/rendering/index.d.ts +9 -6
- package/dist/esm/rendering/mesh/Mesh.d.ts +69 -0
- package/dist/esm/rendering/mesh/Mesh.js +114 -0
- package/dist/esm/rendering/mesh/Mesh.js.map +1 -0
- package/dist/esm/rendering/primitives/Graphics.d.ts +3 -3
- package/dist/esm/rendering/primitives/Graphics.js.map +1 -1
- package/dist/esm/rendering/shader/Shader.d.ts +3 -3
- package/dist/esm/rendering/shader/Shader.js +10 -10
- package/dist/esm/rendering/text/Text.d.ts +2 -2
- package/dist/esm/rendering/text/Text.js +2 -2
- package/dist/esm/rendering/text/Text.js.map +1 -1
- package/dist/esm/rendering/texture/Sampler.d.ts +0 -3
- package/dist/esm/rendering/texture/Sampler.js +5 -7
- package/dist/esm/rendering/texture/Sampler.js.map +1 -1
- package/dist/esm/rendering/types.d.ts +4 -0
- package/dist/esm/rendering/types.js +4 -0
- package/dist/esm/rendering/types.js.map +1 -1
- package/dist/esm/rendering/video/Video.d.ts +2 -2
- package/dist/esm/rendering/video/Video.js +2 -2
- package/dist/esm/rendering/video/Video.js.map +1 -1
- package/dist/esm/rendering/webgl2/AbstractWebGl2BatchedRenderer.d.ts +2 -2
- package/dist/esm/rendering/webgl2/AbstractWebGl2BatchedRenderer.js +35 -11
- package/dist/esm/rendering/webgl2/AbstractWebGl2BatchedRenderer.js.map +1 -1
- package/dist/esm/rendering/webgl2/AbstractWebGl2Renderer.d.ts +13 -13
- package/dist/esm/rendering/webgl2/AbstractWebGl2Renderer.js +20 -20
- package/dist/esm/rendering/webgl2/AbstractWebGl2Renderer.js.map +1 -1
- package/dist/esm/rendering/webgl2/{WebGl2RenderManager.d.ts → WebGl2Backend.d.ts} +15 -12
- package/dist/esm/rendering/webgl2/{WebGl2RenderManager.js → WebGl2Backend.js} +63 -38
- package/dist/esm/rendering/webgl2/WebGl2Backend.js.map +1 -0
- package/dist/esm/rendering/webgl2/WebGl2MaskCompositor.d.ts +31 -0
- package/dist/esm/rendering/webgl2/WebGl2MaskCompositor.js +186 -0
- package/dist/esm/rendering/webgl2/WebGl2MaskCompositor.js.map +1 -0
- package/dist/esm/rendering/webgl2/WebGl2MeshRenderer.d.ts +27 -0
- package/dist/esm/rendering/webgl2/WebGl2MeshRenderer.js +242 -0
- package/dist/esm/rendering/webgl2/WebGl2MeshRenderer.js.map +1 -0
- package/dist/esm/rendering/webgl2/WebGl2ParticleRenderer.d.ts +38 -7
- package/dist/esm/rendering/webgl2/WebGl2ParticleRenderer.js +281 -90
- package/dist/esm/rendering/webgl2/WebGl2ParticleRenderer.js.map +1 -1
- package/dist/esm/rendering/webgl2/WebGl2PrimitiveRenderer.d.ts +2 -2
- package/dist/esm/rendering/webgl2/WebGl2PrimitiveRenderer.js +15 -10
- package/dist/esm/rendering/webgl2/WebGl2PrimitiveRenderer.js.map +1 -1
- package/dist/esm/rendering/webgl2/WebGl2ShaderMappings.js +12 -0
- package/dist/esm/rendering/webgl2/WebGl2ShaderMappings.js.map +1 -1
- package/dist/esm/rendering/webgl2/WebGl2ShaderProgram.d.ts +2 -0
- package/dist/esm/rendering/webgl2/{WebGl2ShaderRuntime.js → WebGl2ShaderProgram.js} +58 -18
- package/dist/esm/rendering/webgl2/WebGl2ShaderProgram.js.map +1 -0
- package/dist/esm/rendering/webgl2/WebGl2SpriteRenderer.d.ts +26 -7
- package/dist/esm/rendering/webgl2/WebGl2SpriteRenderer.js +260 -62
- package/dist/esm/rendering/webgl2/WebGl2SpriteRenderer.js.map +1 -1
- package/dist/esm/rendering/webgl2/WebGl2VertexArrayObject.d.ts +24 -1
- package/dist/esm/rendering/webgl2/WebGl2VertexArrayObject.js +6 -2
- package/dist/esm/rendering/webgl2/WebGl2VertexArrayObject.js.map +1 -1
- package/dist/esm/rendering/webgl2/glsl/mask-compose.frag.js +4 -0
- package/dist/esm/rendering/webgl2/glsl/mask-compose.frag.js.map +1 -0
- package/dist/esm/rendering/webgl2/glsl/mask-compose.vert.js +4 -0
- package/dist/esm/rendering/webgl2/glsl/mask-compose.vert.js.map +1 -0
- package/dist/esm/rendering/webgl2/glsl/mesh.frag.js +4 -0
- package/dist/esm/rendering/webgl2/glsl/mesh.frag.js.map +1 -0
- package/dist/esm/rendering/webgl2/glsl/mesh.vert.js +4 -0
- package/dist/esm/rendering/webgl2/glsl/mesh.vert.js.map +1 -0
- package/dist/esm/rendering/webgl2/glsl/particle.vert.js +1 -1
- package/dist/esm/rendering/webgl2/glsl/sprite.frag.js +1 -1
- package/dist/esm/rendering/webgl2/glsl/sprite.vert.js +1 -1
- package/dist/esm/rendering/webgpu/AbstractWebGpuRenderer.d.ts +9 -9
- package/dist/esm/rendering/webgpu/AbstractWebGpuRenderer.js +18 -18
- package/dist/esm/rendering/webgpu/AbstractWebGpuRenderer.js.map +1 -1
- package/dist/esm/rendering/webgpu/{WebGpuRenderManager.d.ts → WebGpuBackend.d.ts} +17 -14
- package/dist/esm/rendering/webgpu/{WebGpuRenderManager.js → WebGpuBackend.js} +77 -40
- package/dist/esm/rendering/webgpu/WebGpuBackend.js.map +1 -0
- package/dist/esm/rendering/webgpu/WebGpuMaskCompositor.d.ts +37 -0
- package/dist/esm/rendering/webgpu/WebGpuMaskCompositor.js +279 -0
- package/dist/esm/rendering/webgpu/WebGpuMaskCompositor.js.map +1 -0
- package/dist/esm/rendering/webgpu/WebGpuMeshRenderer.d.ts +40 -0
- package/dist/esm/rendering/webgpu/WebGpuMeshRenderer.js +439 -0
- package/dist/esm/rendering/webgpu/WebGpuMeshRenderer.js.map +1 -0
- package/dist/esm/rendering/webgpu/WebGpuParticleRenderer.d.ts +2 -3
- package/dist/esm/rendering/webgpu/WebGpuParticleRenderer.js +65 -82
- package/dist/esm/rendering/webgpu/WebGpuParticleRenderer.js.map +1 -1
- package/dist/esm/rendering/webgpu/WebGpuPrimitiveRenderer.d.ts +2 -3
- package/dist/esm/rendering/webgpu/WebGpuPrimitiveRenderer.js +24 -25
- package/dist/esm/rendering/webgpu/WebGpuPrimitiveRenderer.js.map +1 -1
- package/dist/esm/rendering/webgpu/WebGpuSpriteRenderer.d.ts +28 -13
- package/dist/esm/rendering/webgpu/WebGpuSpriteRenderer.js +410 -382
- package/dist/esm/rendering/webgpu/WebGpuSpriteRenderer.js.map +1 -1
- package/dist/esm/resources/Loader.js +5 -3
- package/dist/esm/resources/Loader.js.map +1 -1
- package/dist/exo.esm.js +3574 -1696
- package/dist/exo.esm.js.map +1 -1
- package/package.json +20 -11
- package/dist/esm/math/Transformable.d.ts +0 -47
- package/dist/esm/math/Transformable.js +0 -140
- package/dist/esm/math/Transformable.js.map +0 -1
- package/dist/esm/rendering/webgl2/WebGl2RenderManager.js.map +0 -1
- package/dist/esm/rendering/webgl2/WebGl2RendererRuntime.d.ts +0 -15
- package/dist/esm/rendering/webgl2/WebGl2ShaderRuntime.d.ts +0 -2
- package/dist/esm/rendering/webgl2/WebGl2ShaderRuntime.js.map +0 -1
- package/dist/esm/rendering/webgpu/WebGpuRenderManager.js.map +0 -1
- package/dist/esm/rendering/webgpu/WebGpuRendererRuntime.d.ts +0 -8
- package/dist/exo.esm.min.js +0 -2
- package/dist/exo.esm.min.js.map +0 -1
- package/dist/exo.global.js +0 -17328
- package/dist/exo.global.js.map +0 -1
- package/dist/exo.global.min.js +0 -2
- package/dist/exo.global.min.js.map +0 -1
|
@@ -0,0 +1,279 @@
|
|
|
1
|
+
import { Matrix } from '../../math/Matrix.js';
|
|
2
|
+
import { getWebGpuBlendState } from './WebGpuBlendState.js';
|
|
3
|
+
|
|
4
|
+
/// <reference types="@webgpu/types" />
|
|
5
|
+
const compositorShaderSource = `
|
|
6
|
+
struct ProjectionUniforms {
|
|
7
|
+
matrix: mat4x4<f32>,
|
|
8
|
+
};
|
|
9
|
+
|
|
10
|
+
@group(0) @binding(0)
|
|
11
|
+
var<uniform> projection: ProjectionUniforms;
|
|
12
|
+
|
|
13
|
+
@group(1) @binding(0)
|
|
14
|
+
var contentTexture: texture_2d<f32>;
|
|
15
|
+
@group(1) @binding(1)
|
|
16
|
+
var contentSampler: sampler;
|
|
17
|
+
@group(1) @binding(2)
|
|
18
|
+
var maskTexture: texture_2d<f32>;
|
|
19
|
+
@group(1) @binding(3)
|
|
20
|
+
var maskSampler: sampler;
|
|
21
|
+
|
|
22
|
+
struct VertexInput {
|
|
23
|
+
@location(0) position: vec2<f32>,
|
|
24
|
+
@location(1) texcoord: vec2<f32>,
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
struct VertexOutput {
|
|
28
|
+
@builtin(position) position: vec4<f32>,
|
|
29
|
+
@location(0) texcoord: vec2<f32>,
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
@vertex
|
|
33
|
+
fn vertexMain(input: VertexInput) -> VertexOutput {
|
|
34
|
+
var output: VertexOutput;
|
|
35
|
+
|
|
36
|
+
output.position = projection.matrix * vec4<f32>(input.position, 0.0, 1.0);
|
|
37
|
+
output.texcoord = input.texcoord;
|
|
38
|
+
|
|
39
|
+
return output;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
@fragment
|
|
43
|
+
fn fragmentMain(input: VertexOutput) -> @location(0) vec4<f32> {
|
|
44
|
+
let contentColor = textureSample(contentTexture, contentSampler, input.texcoord);
|
|
45
|
+
let maskAlpha = textureSample(maskTexture, maskSampler, input.texcoord).a;
|
|
46
|
+
|
|
47
|
+
return vec4<f32>(contentColor.rgb * maskAlpha, contentColor.a * maskAlpha);
|
|
48
|
+
}
|
|
49
|
+
`;
|
|
50
|
+
// 4 floats per vertex: position(x, y) + texcoord(u, v).
|
|
51
|
+
const vertexStrideBytes = 16;
|
|
52
|
+
// 16 floats per mat4x4 projection uniform.
|
|
53
|
+
const projectionUniformBytes = 64;
|
|
54
|
+
/**
|
|
55
|
+
* Single-quad two-texture compositor used by
|
|
56
|
+
* `WebGpuBackend.composeWithAlphaMask`. Renders the content texture
|
|
57
|
+
* onto the active render target with each output texel's alpha multiplied
|
|
58
|
+
* by the mask texture's alpha. Both textures are sampled with stretched-fit
|
|
59
|
+
* UVs over the destination rectangle.
|
|
60
|
+
*
|
|
61
|
+
* Pipelines are cached per (target format, blend mode). The compositor is
|
|
62
|
+
* not a {@link AbstractWebGpuRenderer} and never participates in renderer
|
|
63
|
+
* registry dispatch — the manager invokes it directly.
|
|
64
|
+
*/
|
|
65
|
+
class WebGpuMaskCompositor {
|
|
66
|
+
_projectionData = new Float32Array(16);
|
|
67
|
+
_vertexData = new Float32Array(16); // 4 verts * 4 floats
|
|
68
|
+
_indexData = new Uint16Array([0, 1, 2, 0, 2, 3]);
|
|
69
|
+
_projectionMatrix = new Matrix();
|
|
70
|
+
_pipelines = new Map();
|
|
71
|
+
_device = null;
|
|
72
|
+
_shaderModule = null;
|
|
73
|
+
_projectionBindGroupLayout = null;
|
|
74
|
+
_textureBindGroupLayout = null;
|
|
75
|
+
_pipelineLayout = null;
|
|
76
|
+
_vertexBuffer = null;
|
|
77
|
+
_indexBuffer = null;
|
|
78
|
+
_projectionBuffer = null;
|
|
79
|
+
_projectionBindGroup = null;
|
|
80
|
+
connect(device) {
|
|
81
|
+
if (this._device !== null) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
this._device = device;
|
|
85
|
+
this._shaderModule = device.createShaderModule({ code: compositorShaderSource });
|
|
86
|
+
this._projectionBindGroupLayout = device.createBindGroupLayout({
|
|
87
|
+
entries: [
|
|
88
|
+
{
|
|
89
|
+
binding: 0,
|
|
90
|
+
visibility: GPUShaderStage.VERTEX,
|
|
91
|
+
buffer: { type: 'uniform' },
|
|
92
|
+
},
|
|
93
|
+
],
|
|
94
|
+
});
|
|
95
|
+
this._textureBindGroupLayout = device.createBindGroupLayout({
|
|
96
|
+
entries: [
|
|
97
|
+
{ binding: 0, visibility: GPUShaderStage.FRAGMENT, texture: {} },
|
|
98
|
+
{ binding: 1, visibility: GPUShaderStage.FRAGMENT, sampler: {} },
|
|
99
|
+
{ binding: 2, visibility: GPUShaderStage.FRAGMENT, texture: {} },
|
|
100
|
+
{ binding: 3, visibility: GPUShaderStage.FRAGMENT, sampler: {} },
|
|
101
|
+
],
|
|
102
|
+
});
|
|
103
|
+
this._pipelineLayout = device.createPipelineLayout({
|
|
104
|
+
bindGroupLayouts: [this._projectionBindGroupLayout, this._textureBindGroupLayout],
|
|
105
|
+
});
|
|
106
|
+
this._vertexBuffer = device.createBuffer({
|
|
107
|
+
size: 4 * vertexStrideBytes,
|
|
108
|
+
usage: GPUBufferUsage.VERTEX | GPUBufferUsage.COPY_DST,
|
|
109
|
+
});
|
|
110
|
+
this._indexBuffer = device.createBuffer({
|
|
111
|
+
size: 6 * Uint16Array.BYTES_PER_ELEMENT,
|
|
112
|
+
usage: GPUBufferUsage.INDEX | GPUBufferUsage.COPY_DST,
|
|
113
|
+
});
|
|
114
|
+
device.queue.writeBuffer(this._indexBuffer, 0, this._indexData);
|
|
115
|
+
this._projectionBuffer = device.createBuffer({
|
|
116
|
+
size: projectionUniformBytes,
|
|
117
|
+
usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
|
|
118
|
+
});
|
|
119
|
+
this._projectionBindGroup = device.createBindGroup({
|
|
120
|
+
layout: this._projectionBindGroupLayout,
|
|
121
|
+
entries: [
|
|
122
|
+
{ binding: 0, resource: { buffer: this._projectionBuffer } },
|
|
123
|
+
],
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
disconnect() {
|
|
127
|
+
if (this._device === null) {
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
this._vertexBuffer?.destroy();
|
|
131
|
+
this._indexBuffer?.destroy();
|
|
132
|
+
this._projectionBuffer?.destroy();
|
|
133
|
+
this._vertexBuffer = null;
|
|
134
|
+
this._indexBuffer = null;
|
|
135
|
+
this._projectionBuffer = null;
|
|
136
|
+
this._projectionBindGroup = null;
|
|
137
|
+
this._pipelineLayout = null;
|
|
138
|
+
this._textureBindGroupLayout = null;
|
|
139
|
+
this._projectionBindGroupLayout = null;
|
|
140
|
+
this._shaderModule = null;
|
|
141
|
+
this._pipelines.clear();
|
|
142
|
+
this._device = null;
|
|
143
|
+
}
|
|
144
|
+
compose(manager, content, mask, x, y, width, height, blendMode) {
|
|
145
|
+
if (this._device === null) {
|
|
146
|
+
throw new Error('WebGpuMaskCompositor: not connected.');
|
|
147
|
+
}
|
|
148
|
+
if (width <= 0 || height <= 0) {
|
|
149
|
+
return;
|
|
150
|
+
}
|
|
151
|
+
const device = this._device;
|
|
152
|
+
this._writeQuadVertices(x, y, x + width, y + height);
|
|
153
|
+
device.queue.writeBuffer(this._vertexBuffer, 0, this._vertexData);
|
|
154
|
+
this._writeProjectionMatrix(manager.view.getTransform());
|
|
155
|
+
device.queue.writeBuffer(this._projectionBuffer, 0, this._projectionData);
|
|
156
|
+
const contentBinding = manager.getTextureBinding(content);
|
|
157
|
+
const maskBinding = manager.getTextureBinding(mask);
|
|
158
|
+
const textureBindGroup = device.createBindGroup({
|
|
159
|
+
layout: this._textureBindGroupLayout,
|
|
160
|
+
entries: [
|
|
161
|
+
{ binding: 0, resource: contentBinding.view },
|
|
162
|
+
{ binding: 1, resource: contentBinding.sampler },
|
|
163
|
+
{ binding: 2, resource: maskBinding.view },
|
|
164
|
+
{ binding: 3, resource: maskBinding.sampler },
|
|
165
|
+
],
|
|
166
|
+
});
|
|
167
|
+
const targetFormat = manager.renderTargetFormat;
|
|
168
|
+
const pipeline = this._getOrCreatePipeline(targetFormat, blendMode);
|
|
169
|
+
const encoder = device.createCommandEncoder();
|
|
170
|
+
const pass = encoder.beginRenderPass({
|
|
171
|
+
colorAttachments: [manager.createColorAttachment()],
|
|
172
|
+
});
|
|
173
|
+
manager.stats.renderPasses++;
|
|
174
|
+
const scissor = manager.getScissorRect();
|
|
175
|
+
if (scissor !== null) {
|
|
176
|
+
pass.setScissorRect(scissor.x, scissor.y, scissor.width, scissor.height);
|
|
177
|
+
}
|
|
178
|
+
pass.setPipeline(pipeline);
|
|
179
|
+
pass.setBindGroup(0, this._projectionBindGroup);
|
|
180
|
+
pass.setBindGroup(1, textureBindGroup);
|
|
181
|
+
pass.setVertexBuffer(0, this._vertexBuffer);
|
|
182
|
+
pass.setIndexBuffer(this._indexBuffer, 'uint16');
|
|
183
|
+
pass.drawIndexed(6);
|
|
184
|
+
manager.stats.batches++;
|
|
185
|
+
manager.stats.drawCalls++;
|
|
186
|
+
pass.end();
|
|
187
|
+
manager.submit(encoder.finish());
|
|
188
|
+
}
|
|
189
|
+
_getOrCreatePipeline(format, blendMode) {
|
|
190
|
+
const key = `${format}|${blendMode}`;
|
|
191
|
+
const cached = this._pipelines.get(key);
|
|
192
|
+
if (cached !== undefined) {
|
|
193
|
+
return cached;
|
|
194
|
+
}
|
|
195
|
+
const device = this._device;
|
|
196
|
+
const pipeline = device.createRenderPipeline({
|
|
197
|
+
layout: this._pipelineLayout,
|
|
198
|
+
vertex: {
|
|
199
|
+
module: this._shaderModule,
|
|
200
|
+
entryPoint: 'vertexMain',
|
|
201
|
+
buffers: [
|
|
202
|
+
{
|
|
203
|
+
arrayStride: vertexStrideBytes,
|
|
204
|
+
attributes: [
|
|
205
|
+
{ shaderLocation: 0, offset: 0, format: 'float32x2' },
|
|
206
|
+
{ shaderLocation: 1, offset: 8, format: 'float32x2' },
|
|
207
|
+
],
|
|
208
|
+
},
|
|
209
|
+
],
|
|
210
|
+
},
|
|
211
|
+
fragment: {
|
|
212
|
+
module: this._shaderModule,
|
|
213
|
+
entryPoint: 'fragmentMain',
|
|
214
|
+
targets: [
|
|
215
|
+
{
|
|
216
|
+
format,
|
|
217
|
+
blend: getWebGpuBlendState(blendMode),
|
|
218
|
+
},
|
|
219
|
+
],
|
|
220
|
+
},
|
|
221
|
+
primitive: { topology: 'triangle-list' },
|
|
222
|
+
});
|
|
223
|
+
this._pipelines.set(key, pipeline);
|
|
224
|
+
return pipeline;
|
|
225
|
+
}
|
|
226
|
+
_writeQuadVertices(left, top, right, bottom) {
|
|
227
|
+
const view = this._vertexData;
|
|
228
|
+
// Vertex 0: top-left (UV 0, 0)
|
|
229
|
+
view[0] = left;
|
|
230
|
+
view[1] = top;
|
|
231
|
+
view[2] = 0;
|
|
232
|
+
view[3] = 0;
|
|
233
|
+
// Vertex 1: top-right (UV 1, 0)
|
|
234
|
+
view[4] = right;
|
|
235
|
+
view[5] = top;
|
|
236
|
+
view[6] = 1;
|
|
237
|
+
view[7] = 0;
|
|
238
|
+
// Vertex 2: bottom-right (UV 1, 1)
|
|
239
|
+
view[8] = right;
|
|
240
|
+
view[9] = bottom;
|
|
241
|
+
view[10] = 1;
|
|
242
|
+
view[11] = 1;
|
|
243
|
+
// Vertex 3: bottom-left (UV 0, 1)
|
|
244
|
+
view[12] = left;
|
|
245
|
+
view[13] = bottom;
|
|
246
|
+
view[14] = 0;
|
|
247
|
+
view[15] = 1;
|
|
248
|
+
}
|
|
249
|
+
_writeProjectionMatrix(viewMatrix) {
|
|
250
|
+
// Pack the 3x3 affine view matrix into a 4x4 column-major mat4x4
|
|
251
|
+
// for WGSL, mirroring the layout used by WebGpuPrimitiveRenderer
|
|
252
|
+
// (see `_writeShapeVertices` in that file for the rationale).
|
|
253
|
+
const m = this._projectionMatrix.copy(viewMatrix);
|
|
254
|
+
const data = this._projectionData;
|
|
255
|
+
// col 0
|
|
256
|
+
data[0] = m.a;
|
|
257
|
+
data[1] = m.c;
|
|
258
|
+
data[2] = 0;
|
|
259
|
+
data[3] = 0;
|
|
260
|
+
// col 1
|
|
261
|
+
data[4] = m.b;
|
|
262
|
+
data[5] = m.d;
|
|
263
|
+
data[6] = 0;
|
|
264
|
+
data[7] = 0;
|
|
265
|
+
// col 2
|
|
266
|
+
data[8] = 0;
|
|
267
|
+
data[9] = 0;
|
|
268
|
+
data[10] = 1;
|
|
269
|
+
data[11] = 0;
|
|
270
|
+
// col 3
|
|
271
|
+
data[12] = m.x;
|
|
272
|
+
data[13] = m.y;
|
|
273
|
+
data[14] = 0;
|
|
274
|
+
data[15] = 1;
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
|
|
278
|
+
export { WebGpuMaskCompositor };
|
|
279
|
+
//# sourceMappingURL=WebGpuMaskCompositor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WebGpuMaskCompositor.js","sources":["../../../../../src/rendering/webgpu/WebGpuMaskCompositor.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { AbstractWebGpuRenderer } from '@/rendering/webgpu/AbstractWebGpuRenderer';
|
|
2
|
+
import type { Mesh } from '@/rendering/mesh/Mesh';
|
|
3
|
+
import type { WebGpuBackend } from '@/rendering/webgpu/WebGpuBackend';
|
|
4
|
+
export declare class WebGpuMeshRenderer extends AbstractWebGpuRenderer<Mesh> {
|
|
5
|
+
private readonly _combinedTransform;
|
|
6
|
+
private readonly _drawCalls;
|
|
7
|
+
private readonly _pipelines;
|
|
8
|
+
private readonly _textureBindGroups;
|
|
9
|
+
private _device;
|
|
10
|
+
private _shaderModule;
|
|
11
|
+
private _uniformBindGroupLayout;
|
|
12
|
+
private _textureBindGroupLayout;
|
|
13
|
+
private _pipelineLayout;
|
|
14
|
+
private _vertexBuffer;
|
|
15
|
+
private _indexBuffer;
|
|
16
|
+
private _uniformBuffer;
|
|
17
|
+
private _uniformBindGroup;
|
|
18
|
+
private _uniformAlignment;
|
|
19
|
+
private _vertexBufferCapacity;
|
|
20
|
+
private _indexBufferCapacity;
|
|
21
|
+
private _uniformBufferCapacity;
|
|
22
|
+
private _vertexData;
|
|
23
|
+
private _float32View;
|
|
24
|
+
private _uint32View;
|
|
25
|
+
private _packedIndexData;
|
|
26
|
+
private _drawCallCount;
|
|
27
|
+
render(mesh: Mesh): void;
|
|
28
|
+
flush(): void;
|
|
29
|
+
destroy(): void;
|
|
30
|
+
prewarmPipelines(formats: ReadonlyArray<GPUTextureFormat>): Promise<void>;
|
|
31
|
+
protected onConnect(backend: WebGpuBackend): void;
|
|
32
|
+
protected onDisconnect(): void;
|
|
33
|
+
private _writeMeshVertices;
|
|
34
|
+
private _getPipeline;
|
|
35
|
+
private _buildPipelineDescriptor;
|
|
36
|
+
private _getTextureBindGroup;
|
|
37
|
+
private _ensureVertexCapacity;
|
|
38
|
+
private _ensureIndexCapacity;
|
|
39
|
+
private _ensureUniformCapacity;
|
|
40
|
+
}
|