@lightningjs/renderer 0.8.3 → 0.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/core/CoreNode.d.ts +27 -1
- package/dist/src/core/CoreNode.js +130 -5
- package/dist/src/core/CoreNode.js.map +1 -1
- package/dist/src/core/CoreShaderManager.js +3 -2
- package/dist/src/core/CoreShaderManager.js.map +1 -1
- package/dist/src/core/CoreTextNode.js +20 -1
- package/dist/src/core/CoreTextNode.js.map +1 -1
- package/dist/src/core/CoreTextureManager.d.ts +2 -0
- package/dist/src/core/CoreTextureManager.js +2 -0
- package/dist/src/core/CoreTextureManager.js.map +1 -1
- package/dist/src/core/Stage.js +25 -9
- package/dist/src/core/Stage.js.map +1 -1
- package/dist/src/core/TextureMemoryManager.d.ts +1 -0
- package/dist/src/core/TextureMemoryManager.js +3 -1
- package/dist/src/core/TextureMemoryManager.js.map +1 -1
- package/dist/src/core/lib/ImageWorker.d.ts +2 -1
- package/dist/src/core/lib/ImageWorker.js +10 -6
- package/dist/src/core/lib/ImageWorker.js.map +1 -1
- package/dist/src/core/lib/Matrix3d.d.ts +38 -24
- package/dist/src/core/lib/Matrix3d.js +143 -166
- package/dist/src/core/lib/Matrix3d.js.map +1 -1
- package/dist/src/core/lib/WebGlContextWrapper.d.ts +26 -1
- package/dist/src/core/lib/WebGlContextWrapper.js +37 -1
- package/dist/src/core/lib/WebGlContextWrapper.js.map +1 -1
- package/dist/src/core/renderers/CoreRenderer.d.ts +11 -0
- package/dist/src/core/renderers/CoreRenderer.js +1 -0
- package/dist/src/core/renderers/CoreRenderer.js.map +1 -1
- package/dist/src/core/renderers/canvas/CanvasCoreRenderer.d.ts +10 -4
- package/dist/src/core/renderers/canvas/CanvasCoreRenderer.js +18 -7
- package/dist/src/core/renderers/canvas/CanvasCoreRenderer.js.map +1 -1
- package/dist/src/core/renderers/canvas/CanvasCoreTexture.d.ts +2 -2
- package/dist/src/core/renderers/canvas/CanvasCoreTexture.js +8 -6
- package/dist/src/core/renderers/canvas/CanvasCoreTexture.js.map +1 -1
- package/dist/src/core/renderers/canvas/internal/C2DShaderUtils.d.ts +1 -1
- package/dist/src/core/renderers/canvas/internal/C2DShaderUtils.js +1 -1
- package/dist/src/core/renderers/canvas/internal/C2DShaderUtils.js.map +1 -1
- package/dist/src/core/renderers/canvas/internal/ColorUtils.js +4 -4
- package/dist/src/core/renderers/canvas/internal/ColorUtils.js.map +1 -1
- package/dist/src/core/renderers/canvas/shaders/UnsupportedShader.d.ts +1 -1
- package/dist/src/core/renderers/canvas/shaders/UnsupportedShader.js +2 -2
- package/dist/src/core/renderers/canvas/shaders/UnsupportedShader.js.map +1 -1
- package/dist/src/core/renderers/webgl/WebGlCoreCtxRenderTexture.d.ts +11 -0
- package/dist/src/core/renderers/webgl/WebGlCoreCtxRenderTexture.js +51 -0
- package/dist/src/core/renderers/webgl/WebGlCoreCtxRenderTexture.js.map +1 -0
- package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.d.ts +11 -1
- package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.js +22 -11
- package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.js.map +1 -1
- package/dist/src/core/renderers/webgl/WebGlCoreRenderOp.d.ts +4 -1
- package/dist/src/core/renderers/webgl/WebGlCoreRenderOp.js +7 -2
- package/dist/src/core/renderers/webgl/WebGlCoreRenderOp.js.map +1 -1
- package/dist/src/core/renderers/webgl/WebGlCoreRenderer.d.ts +16 -1
- package/dist/src/core/renderers/webgl/WebGlCoreRenderer.js +119 -27
- package/dist/src/core/renderers/webgl/WebGlCoreRenderer.js.map +1 -1
- package/dist/src/core/renderers/webgl/WebGlCoreShader.js +19 -4
- package/dist/src/core/renderers/webgl/WebGlCoreShader.js.map +1 -1
- package/dist/src/core/renderers/webgl/shaders/DefaultShader.js +4 -6
- package/dist/src/core/renderers/webgl/shaders/DefaultShader.js.map +1 -1
- package/dist/src/core/renderers/webgl/shaders/SdfShader.js +6 -1
- package/dist/src/core/renderers/webgl/shaders/SdfShader.js.map +1 -1
- package/dist/src/core/text-rendering/TextRenderingUtils.d.ts +12 -0
- package/dist/src/core/text-rendering/TextRenderingUtils.js +14 -0
- package/dist/src/core/text-rendering/TextRenderingUtils.js.map +1 -0
- package/dist/src/core/text-rendering/TextTextureRendererUtils.d.ts +19 -0
- package/dist/src/core/text-rendering/TextTextureRendererUtils.js +61 -0
- package/dist/src/core/text-rendering/TextTextureRendererUtils.js.map +1 -1
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.d.ts +8 -2
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.js +24 -3
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.js.map +1 -1
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.d.ts +2 -0
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.js.map +1 -1
- package/dist/src/core/text-rendering/font-face-types/TrFontFace.d.ts +72 -1
- package/dist/src/core/text-rendering/font-face-types/TrFontFace.js +11 -1
- package/dist/src/core/text-rendering/font-face-types/TrFontFace.js.map +1 -1
- package/dist/src/core/text-rendering/font-face-types/WebTrFontFace.d.ts +5 -2
- package/dist/src/core/text-rendering/font-face-types/WebTrFontFace.js +4 -3
- package/dist/src/core/text-rendering/font-face-types/WebTrFontFace.js.map +1 -1
- package/dist/src/core/text-rendering/renderers/CanvasTextRenderer.d.ts +8 -0
- package/dist/src/core/text-rendering/renderers/CanvasTextRenderer.js +42 -16
- package/dist/src/core/text-rendering/renderers/CanvasTextRenderer.js.map +1 -1
- package/dist/src/core/text-rendering/renderers/LightningTextTextureRenderer.d.ts +7 -1
- package/dist/src/core/text-rendering/renderers/LightningTextTextureRenderer.js +42 -11
- package/dist/src/core/text-rendering/renderers/LightningTextTextureRenderer.js.map +1 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/SdfTextRenderer.d.ts +6 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/SdfTextRenderer.js +27 -9
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/SdfTextRenderer.js.map +1 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/getStartConditions.d.ts +2 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/getStartConditions.js +32 -5
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/getStartConditions.js.map +1 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/layoutText.d.ts +2 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/layoutText.js +2 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/layoutText.js.map +1 -1
- package/dist/src/core/text-rendering/renderers/TextRenderer.d.ts +10 -5
- package/dist/src/core/text-rendering/renderers/TextRenderer.js +6 -5
- package/dist/src/core/text-rendering/renderers/TextRenderer.js.map +1 -1
- package/dist/src/core/textures/RenderTexture.d.ts +28 -0
- package/dist/src/core/textures/RenderTexture.js +52 -0
- package/dist/src/core/textures/RenderTexture.js.map +1 -0
- package/dist/src/core/utils.d.ts +6 -1
- package/dist/src/core/utils.js +74 -82
- package/dist/src/core/utils.js.map +1 -1
- package/dist/src/main-api/INode.d.ts +9 -0
- package/dist/src/main-api/RendererMain.js +4 -3
- package/dist/src/main-api/RendererMain.js.map +1 -1
- package/dist/src/render-drivers/main/MainOnlyNode.d.ts +3 -0
- package/dist/src/render-drivers/main/MainOnlyNode.js +29 -0
- package/dist/src/render-drivers/main/MainOnlyNode.js.map +1 -1
- package/dist/src/render-drivers/main/MainOnlyTextNode.js +2 -3
- package/dist/src/render-drivers/main/MainOnlyTextNode.js.map +1 -1
- package/dist/src/render-drivers/threadx/NodeStruct.d.ts +3 -0
- package/dist/src/render-drivers/threadx/NodeStruct.js +9 -0
- package/dist/src/render-drivers/threadx/NodeStruct.js.map +1 -1
- package/dist/src/render-drivers/threadx/SharedNode.d.ts +1 -0
- package/dist/src/render-drivers/threadx/SharedNode.js +1 -0
- package/dist/src/render-drivers/threadx/SharedNode.js.map +1 -1
- package/dist/src/render-drivers/threadx/TextNodeStruct.js +3 -1
- package/dist/src/render-drivers/threadx/TextNodeStruct.js.map +1 -1
- package/dist/src/render-drivers/threadx/ThreadXCoreDriver.js +2 -0
- package/dist/src/render-drivers/threadx/ThreadXCoreDriver.js.map +1 -1
- package/dist/src/render-drivers/threadx/ThreadXMainNode.d.ts +3 -0
- package/dist/src/render-drivers/threadx/ThreadXMainNode.js +7 -0
- package/dist/src/render-drivers/threadx/ThreadXMainNode.js.map +1 -1
- package/dist/src/render-drivers/threadx/worker/ThreadXRendererNode.js +1 -0
- package/dist/src/render-drivers/threadx/worker/ThreadXRendererNode.js.map +1 -1
- package/dist/src/render-drivers/threadx/worker/ThreadXRendererTextNode.js +1 -0
- package/dist/src/render-drivers/threadx/worker/ThreadXRendererTextNode.js.map +1 -1
- package/dist/src/render-drivers/threadx/worker/renderer.js +1 -0
- package/dist/src/render-drivers/threadx/worker/renderer.js.map +1 -1
- package/dist/tsconfig.dist.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/core/CoreNode.ts +164 -8
- package/src/core/CoreShaderManager.ts +6 -3
- package/src/core/CoreTextNode.ts +25 -0
- package/src/core/CoreTextureManager.ts +3 -0
- package/src/core/Stage.ts +32 -11
- package/src/core/TextureMemoryManager.ts +3 -1
- package/src/core/lib/ImageWorker.ts +12 -7
- package/src/core/lib/Matrix3d.ts +144 -190
- package/src/core/lib/WebGlContextWrapper.ts +51 -1
- package/src/core/renderers/CoreRenderer.ts +15 -1
- package/src/core/renderers/canvas/CanvasCoreRenderer.ts +59 -14
- package/src/core/renderers/canvas/CanvasCoreTexture.ts +24 -18
- package/src/core/renderers/canvas/internal/C2DShaderUtils.ts +6 -3
- package/src/core/renderers/canvas/internal/ColorUtils.ts +6 -6
- package/src/core/renderers/canvas/shaders/UnsupportedShader.ts +2 -3
- package/src/core/renderers/webgl/WebGlCoreCtxRenderTexture.ts +79 -0
- package/src/core/renderers/webgl/WebGlCoreCtxTexture.ts +26 -24
- package/src/core/renderers/webgl/WebGlCoreRenderOp.ts +4 -2
- package/src/core/renderers/webgl/WebGlCoreRenderer.ts +166 -33
- package/src/core/renderers/webgl/WebGlCoreShader.ts +29 -4
- package/src/core/renderers/webgl/shaders/DefaultShader.ts +4 -6
- package/src/core/renderers/webgl/shaders/SdfShader.ts +6 -1
- package/src/core/text-rendering/TextRenderingUtils.ts +36 -0
- package/src/core/text-rendering/TextTextureRendererUtils.ts +74 -0
- package/src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.ts +41 -12
- package/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.ts +2 -0
- package/src/core/text-rendering/font-face-types/TrFontFace.ts +86 -1
- package/src/core/text-rendering/font-face-types/WebTrFontFace.ts +13 -7
- package/src/core/text-rendering/renderers/CanvasTextRenderer.ts +52 -20
- package/src/core/text-rendering/renderers/LightningTextTextureRenderer.ts +59 -13
- package/src/core/text-rendering/renderers/SdfTextRenderer/SdfTextRenderer.ts +36 -8
- package/src/core/text-rendering/renderers/SdfTextRenderer/internal/getStartConditions.ts +38 -5
- package/src/core/text-rendering/renderers/SdfTextRenderer/internal/layoutText.ts +5 -2
- package/src/core/text-rendering/renderers/TextRenderer.ts +17 -10
- package/src/core/textures/RenderTexture.ts +81 -0
- package/src/core/utils.ts +101 -93
- package/src/main-api/INode.ts +11 -0
- package/src/main-api/RendererMain.ts +4 -3
- package/src/render-drivers/main/MainOnlyNode.ts +44 -0
- package/src/render-drivers/main/MainOnlyTextNode.ts +2 -3
- package/src/render-drivers/threadx/NodeStruct.ts +10 -0
- package/src/render-drivers/threadx/SharedNode.ts +2 -0
- package/src/render-drivers/threadx/TextNodeStruct.ts +3 -1
- package/src/render-drivers/threadx/ThreadXCoreDriver.ts +2 -0
- package/src/render-drivers/threadx/ThreadXMainNode.ts +9 -0
- package/src/render-drivers/threadx/worker/ThreadXRendererNode.ts +1 -0
- package/src/render-drivers/threadx/worker/ThreadXRendererTextNode.ts +1 -0
- package/src/render-drivers/threadx/worker/renderer.ts +1 -0
package/src/core/CoreTextNode.ts
CHANGED
|
@@ -34,6 +34,7 @@ import type {
|
|
|
34
34
|
} from '../common/CommonTypes.js';
|
|
35
35
|
import type { Rect, RectWithValid } from './lib/utils.js';
|
|
36
36
|
import { assertTruthy } from '../utils.js';
|
|
37
|
+
import { Matrix3d } from './lib/Matrix3d.js';
|
|
37
38
|
|
|
38
39
|
export interface CoreTextNodeProps extends CoreNodeProps, TrProps {
|
|
39
40
|
text: string;
|
|
@@ -354,11 +355,35 @@ export class CoreTextNode extends CoreNode implements ICoreTextNode {
|
|
|
354
355
|
|
|
355
356
|
override renderQuads(renderer: CoreRenderer) {
|
|
356
357
|
assertTruthy(this.globalTransform);
|
|
358
|
+
|
|
359
|
+
// Prevent quad rendering if parent has a render texture
|
|
360
|
+
// and this node is not the render texture
|
|
361
|
+
if (this.parentHasRenderTexture) {
|
|
362
|
+
if (!renderer.renderToTextureActive) {
|
|
363
|
+
return;
|
|
364
|
+
}
|
|
365
|
+
// Prevent quad rendering if parent render texture is not the active render texture
|
|
366
|
+
if (this.parentRenderTexture !== renderer.activeRttNode) {
|
|
367
|
+
return;
|
|
368
|
+
}
|
|
369
|
+
}
|
|
370
|
+
|
|
371
|
+
if (this.parentHasRenderTexture && this.props.parent?.rtt) {
|
|
372
|
+
this.globalTransform = Matrix3d.identity();
|
|
373
|
+
if (this.localTransform) {
|
|
374
|
+
this.globalTransform.multiply(this.localTransform);
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
|
|
378
|
+
assertTruthy(this.globalTransform);
|
|
379
|
+
|
|
357
380
|
this.textRenderer.renderQuads(
|
|
358
381
|
this.trState,
|
|
359
382
|
this.globalTransform,
|
|
360
383
|
this.clippingRect,
|
|
361
384
|
this.worldAlpha,
|
|
385
|
+
this.parentHasRenderTexture,
|
|
386
|
+
this.framebufferDimensions,
|
|
362
387
|
);
|
|
363
388
|
}
|
|
364
389
|
|
|
@@ -25,6 +25,7 @@ import { ColorTexture } from './textures/ColorTexture.js';
|
|
|
25
25
|
import { ImageTexture } from './textures/ImageTexture.js';
|
|
26
26
|
import { NoiseTexture } from './textures/NoiseTexture.js';
|
|
27
27
|
import { SubTexture } from './textures/SubTexture.js';
|
|
28
|
+
import { RenderTexture } from './textures/RenderTexture.js';
|
|
28
29
|
import type { Texture } from './textures/Texture.js';
|
|
29
30
|
|
|
30
31
|
/**
|
|
@@ -40,6 +41,7 @@ export interface TextureMap {
|
|
|
40
41
|
ImageTexture: typeof ImageTexture;
|
|
41
42
|
NoiseTexture: typeof NoiseTexture;
|
|
42
43
|
SubTexture: typeof SubTexture;
|
|
44
|
+
RenderTexture: typeof RenderTexture;
|
|
43
45
|
}
|
|
44
46
|
|
|
45
47
|
export type ExtractProps<Type> = Type extends { z$__type__Props: infer Props }
|
|
@@ -173,6 +175,7 @@ export class CoreTextureManager {
|
|
|
173
175
|
this.registerTextureType('ColorTexture', ColorTexture);
|
|
174
176
|
this.registerTextureType('NoiseTexture', NoiseTexture);
|
|
175
177
|
this.registerTextureType('SubTexture', SubTexture);
|
|
178
|
+
this.registerTextureType('RenderTexture', RenderTexture);
|
|
176
179
|
}
|
|
177
180
|
|
|
178
181
|
registerTextureType<Type extends keyof TextureMap>(
|
package/src/core/Stage.ts
CHANGED
|
@@ -38,7 +38,10 @@ import type {
|
|
|
38
38
|
FrameTickPayload,
|
|
39
39
|
} from '../common/CommonTypes.js';
|
|
40
40
|
import { TextureMemoryManager } from './TextureMemoryManager.js';
|
|
41
|
-
import type {
|
|
41
|
+
import type {
|
|
42
|
+
CoreRenderer,
|
|
43
|
+
CoreRendererOptions,
|
|
44
|
+
} from './renderers/CoreRenderer.js';
|
|
42
45
|
import { CanvasCoreRenderer } from './renderers/canvas/CanvasCoreRenderer.js';
|
|
43
46
|
|
|
44
47
|
export interface StageOptions {
|
|
@@ -113,7 +116,7 @@ export class Stage extends EventEmitter {
|
|
|
113
116
|
enableContextSpy,
|
|
114
117
|
numImageWorkers,
|
|
115
118
|
txMemByteThreshold,
|
|
116
|
-
renderMode
|
|
119
|
+
renderMode,
|
|
117
120
|
} = options;
|
|
118
121
|
|
|
119
122
|
this.txManager = new CoreTextureManager(numImageWorkers);
|
|
@@ -150,7 +153,7 @@ export class Stage extends EventEmitter {
|
|
|
150
153
|
txMemManager: this.txMemManager,
|
|
151
154
|
shManager: this.shManager,
|
|
152
155
|
contextSpy: this.contextSpy,
|
|
153
|
-
}
|
|
156
|
+
};
|
|
154
157
|
|
|
155
158
|
if (renderMode === 'canvas') {
|
|
156
159
|
this.renderer = new CanvasCoreRenderer(rendererOptions);
|
|
@@ -162,12 +165,15 @@ export class Stage extends EventEmitter {
|
|
|
162
165
|
// Must do this after renderer is created
|
|
163
166
|
this.txManager.renderer = this.renderer;
|
|
164
167
|
|
|
165
|
-
this.textRenderers =
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
168
|
+
this.textRenderers =
|
|
169
|
+
renderMode === 'webgl'
|
|
170
|
+
? {
|
|
171
|
+
canvas: new CanvasTextRenderer(this),
|
|
172
|
+
sdf: new SdfTextRenderer(this),
|
|
173
|
+
}
|
|
174
|
+
: {
|
|
175
|
+
canvas: new CanvasTextRenderer(this),
|
|
176
|
+
};
|
|
171
177
|
this.fontManager = new TrFontManager(this.textRenderers);
|
|
172
178
|
|
|
173
179
|
// create root node
|
|
@@ -205,6 +211,7 @@ export class Stage extends EventEmitter {
|
|
|
205
211
|
textureOptions: null,
|
|
206
212
|
shader: null,
|
|
207
213
|
shaderProps: null,
|
|
214
|
+
rtt: false,
|
|
208
215
|
});
|
|
209
216
|
|
|
210
217
|
this.root = rootNode;
|
|
@@ -250,17 +257,31 @@ export class Stage extends EventEmitter {
|
|
|
250
257
|
*/
|
|
251
258
|
drawFrame() {
|
|
252
259
|
const { renderer, renderRequested } = this;
|
|
260
|
+
assertTruthy(renderer);
|
|
253
261
|
|
|
254
262
|
// Update tree if needed
|
|
255
263
|
if (this.root.updateType !== 0) {
|
|
256
264
|
this.root.update(this.deltaTime, this.root.clippingRect);
|
|
257
265
|
}
|
|
258
266
|
|
|
259
|
-
//
|
|
260
|
-
renderer
|
|
267
|
+
// Reset render operations and clear the canvas
|
|
268
|
+
renderer.reset();
|
|
269
|
+
|
|
270
|
+
// Check if we need to garbage collect
|
|
271
|
+
if (renderer.txMemManager.gcRequested) {
|
|
272
|
+
renderer.txMemManager.gc();
|
|
273
|
+
}
|
|
274
|
+
|
|
275
|
+
// If we have RTT nodes draw them first
|
|
276
|
+
// So we can use them as textures in the main scene
|
|
277
|
+
if (renderer.rttNodes.length > 0) {
|
|
278
|
+
renderer.renderRTTNodes();
|
|
279
|
+
}
|
|
261
280
|
|
|
281
|
+
// Fill quads buffer
|
|
262
282
|
this.addQuads(this.root);
|
|
263
283
|
|
|
284
|
+
// Perform render pass
|
|
264
285
|
renderer?.render();
|
|
265
286
|
|
|
266
287
|
this.calculateFps();
|
|
@@ -22,6 +22,7 @@ export class TextureMemoryManager {
|
|
|
22
22
|
private memUsed = 0;
|
|
23
23
|
private textures: Map<CoreContextTexture, number> = new Map();
|
|
24
24
|
private threshold: number;
|
|
25
|
+
public gcRequested = false;
|
|
25
26
|
|
|
26
27
|
/**
|
|
27
28
|
* @param byteThreshold Number of texture bytes to trigger garbage collection
|
|
@@ -52,11 +53,12 @@ export class TextureMemoryManager {
|
|
|
52
53
|
}
|
|
53
54
|
|
|
54
55
|
if (this.memUsed > this.threshold) {
|
|
55
|
-
this.
|
|
56
|
+
this.gcRequested = true;
|
|
56
57
|
}
|
|
57
58
|
}
|
|
58
59
|
|
|
59
60
|
gc() {
|
|
61
|
+
this.gcRequested = false;
|
|
60
62
|
this.textures.forEach((byteSize, ctxTexture) => {
|
|
61
63
|
if (!ctxTexture.renderable) {
|
|
62
64
|
ctxTexture.free();
|
|
@@ -23,9 +23,10 @@ type MessageCallback = [(value: any) => void, (reason: any) => void];
|
|
|
23
23
|
|
|
24
24
|
export class ImageWorkerManager {
|
|
25
25
|
imageWorkersEnabled = true;
|
|
26
|
-
messageManager: Record<
|
|
26
|
+
messageManager: Record<number, MessageCallback> = {};
|
|
27
27
|
workers: Worker[] = [];
|
|
28
28
|
workerIndex = 0;
|
|
29
|
+
nextId = 0;
|
|
29
30
|
|
|
30
31
|
constructor(numImageWorkers: number) {
|
|
31
32
|
this.workers = this.createWorkers(numImageWorkers);
|
|
@@ -35,15 +36,16 @@ export class ImageWorkerManager {
|
|
|
35
36
|
}
|
|
36
37
|
|
|
37
38
|
private handleMessage(event: MessageEvent) {
|
|
38
|
-
const {
|
|
39
|
+
const { id, data, error } = event.data as {
|
|
40
|
+
id: number;
|
|
39
41
|
src: string;
|
|
40
42
|
data?: any;
|
|
41
43
|
error?: string;
|
|
42
44
|
};
|
|
43
|
-
const msg = this.messageManager[
|
|
45
|
+
const msg = this.messageManager[id];
|
|
44
46
|
if (msg) {
|
|
45
47
|
const [resolve, reject] = msg;
|
|
46
|
-
delete this.messageManager[
|
|
48
|
+
delete this.messageManager[id];
|
|
47
49
|
if (error) {
|
|
48
50
|
reject(new Error(error));
|
|
49
51
|
} else {
|
|
@@ -92,15 +94,16 @@ export class ImageWorkerManager {
|
|
|
92
94
|
}
|
|
93
95
|
|
|
94
96
|
self.onmessage = (event) => {
|
|
97
|
+
var id = event.data.id;
|
|
95
98
|
var src = event.data.src;
|
|
96
99
|
var premultiplyAlpha = event.data.premultiplyAlpha;
|
|
97
100
|
|
|
98
101
|
getImage(src, premultiplyAlpha)
|
|
99
102
|
.then(function(data) {
|
|
100
|
-
self.postMessage({
|
|
103
|
+
self.postMessage({ id: id, data: data }, [data.data]);
|
|
101
104
|
})
|
|
102
105
|
.catch(function(error) {
|
|
103
|
-
self.postMessage({
|
|
106
|
+
self.postMessage({ id: id, error: error.message });
|
|
104
107
|
});
|
|
105
108
|
};
|
|
106
109
|
`;
|
|
@@ -135,8 +138,10 @@ export class ImageWorkerManager {
|
|
|
135
138
|
try {
|
|
136
139
|
if (this.workers) {
|
|
137
140
|
const absoluteSrcUrl = this.convertUrlToAbsolute(src);
|
|
138
|
-
|
|
141
|
+
const id = this.nextId++;
|
|
142
|
+
this.messageManager[id] = [resolve, reject];
|
|
139
143
|
this.getNextWorker().postMessage({
|
|
144
|
+
id,
|
|
140
145
|
src: absoluteSrcUrl,
|
|
141
146
|
premultiplyAlpha,
|
|
142
147
|
});
|
package/src/core/lib/Matrix3d.ts
CHANGED
|
@@ -1,71 +1,69 @@
|
|
|
1
|
-
/*
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
// The matrix is stored in a Float32Array in the following order:
|
|
5
|
-
// | 0 3 6 |
|
|
6
|
-
// | 1 4 7 |
|
|
7
|
-
// | 2 5 8 |
|
|
8
|
-
// The following constants are used to index into the array in a row-major way.
|
|
9
|
-
const m0 = 0;
|
|
10
|
-
const m1 = 3;
|
|
11
|
-
const m2 = 6;
|
|
12
|
-
const m3 = 1;
|
|
13
|
-
const m4 = 4;
|
|
14
|
-
const m5 = 7;
|
|
15
|
-
const m6 = 2;
|
|
16
|
-
const m7 = 5;
|
|
17
|
-
const m8 = 8;
|
|
18
|
-
|
|
19
|
-
/**
|
|
20
|
-
* A 3x3 matrix representing a 2D transformation.
|
|
1
|
+
/*
|
|
2
|
+
* If not stated otherwise in this file or this component's LICENSE file the
|
|
3
|
+
* following copyright and licenses apply:
|
|
21
4
|
*
|
|
22
|
-
*
|
|
23
|
-
* The matrix is stored in column-major order in the `data` property which can
|
|
24
|
-
* be passed directly to a WebGL shader uniform.
|
|
5
|
+
* Copyright 2023 Comcast Cable Communications Management, LLC.
|
|
25
6
|
*
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
*
|
|
29
|
-
* | 2 5 8 |
|
|
7
|
+
* Licensed under the Apache License, Version 2.0 (the License);
|
|
8
|
+
* you may not use this file except in compliance with the License.
|
|
9
|
+
* You may obtain a copy of the License at
|
|
30
10
|
*
|
|
31
|
-
*
|
|
32
|
-
* generally always `[0, 0, 1]` if you only use the 2D transformation methods
|
|
33
|
-
* provided by this class.
|
|
11
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
34
12
|
*
|
|
13
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
14
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
15
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
16
|
+
* See the License for the specific language governing permissions and
|
|
17
|
+
* limitations under the License.
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* A 3D matrix representing a 2D graphics transformation
|
|
22
|
+
*
|
|
23
|
+
* @remarks
|
|
35
24
|
* For convenience, entries in the first two rows can be accessed by the following
|
|
36
|
-
*
|
|
25
|
+
* properties:
|
|
37
26
|
* | ta tb tx |
|
|
38
27
|
* | tc td ty |
|
|
39
28
|
* | 0 0 1 |
|
|
29
|
+
*
|
|
30
|
+
* This matrix is optimized for 2D transformations and hence the last row will
|
|
31
|
+
* always be considered [0, 0 ,1].
|
|
32
|
+
*
|
|
33
|
+
* To access a column major array for WebGL, use the {@link getFloatArr} method.
|
|
40
34
|
*/
|
|
41
35
|
export class Matrix3d {
|
|
42
|
-
public
|
|
36
|
+
public ta: number;
|
|
37
|
+
public tb: number;
|
|
38
|
+
public tx: number;
|
|
39
|
+
public tc: number;
|
|
40
|
+
public td: number;
|
|
41
|
+
public ty: number;
|
|
42
|
+
private _floatArr: Float32Array | null = null;
|
|
43
|
+
/**
|
|
44
|
+
* Potential Mutation Flag
|
|
45
|
+
*
|
|
46
|
+
* @remarks
|
|
47
|
+
* This flag is set to true whenever the matrix is potentially modified.
|
|
48
|
+
* We don't waste CPU trying to identify if each operation actually modifies
|
|
49
|
+
* the matrix. Instead, we set this flag to true whenever we think the matrix
|
|
50
|
+
* is modified. This signals that the `floatArr` should to be updated.
|
|
51
|
+
*/
|
|
52
|
+
private mutation: boolean;
|
|
43
53
|
|
|
44
54
|
/**
|
|
45
55
|
* Creates a new 3x3 matrix.
|
|
46
56
|
*
|
|
47
57
|
* @param entries Row-major 3x3 matrix
|
|
48
58
|
*/
|
|
49
|
-
public constructor(
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
this.data[m0] = entries[0]!;
|
|
58
|
-
this.data[m1] = entries[3]!;
|
|
59
|
-
this.data[m2] = entries[6]!;
|
|
60
|
-
this.data[m3] = entries[1]!;
|
|
61
|
-
this.data[m4] = entries[4]!;
|
|
62
|
-
this.data[m5] = entries[7]!;
|
|
63
|
-
this.data[m6] = entries[2]!;
|
|
64
|
-
this.data[m7] = entries[5]!;
|
|
65
|
-
this.data[m8] = entries[8]!;
|
|
66
|
-
} else {
|
|
67
|
-
this.data = new Float32Array(9);
|
|
68
|
-
}
|
|
59
|
+
public constructor() {
|
|
60
|
+
this.ta = 0;
|
|
61
|
+
this.tb = 0;
|
|
62
|
+
this.tx = 0;
|
|
63
|
+
this.tc = 0;
|
|
64
|
+
this.td = 0;
|
|
65
|
+
this.ty = 0;
|
|
66
|
+
this.mutation = true;
|
|
69
67
|
}
|
|
70
68
|
|
|
71
69
|
/**
|
|
@@ -83,54 +81,22 @@ export class Matrix3d {
|
|
|
83
81
|
}
|
|
84
82
|
|
|
85
83
|
public static multiply(a: Matrix3d, b: Matrix3d, out?: Matrix3d): Matrix3d {
|
|
86
|
-
const e0 =
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
const
|
|
91
|
-
|
|
92
|
-
a.data[m1]! * b.data[m4]! +
|
|
93
|
-
a.data[m2]! * b.data[m7]!;
|
|
94
|
-
const e2 =
|
|
95
|
-
a.data[m0]! * b.data[m2]! +
|
|
96
|
-
a.data[m1]! * b.data[m5]! +
|
|
97
|
-
a.data[m2]! * b.data[m8]!;
|
|
98
|
-
const e3 =
|
|
99
|
-
a.data[m3]! * b.data[m0]! +
|
|
100
|
-
a.data[m4]! * b.data[m3]! +
|
|
101
|
-
a.data[m5]! * b.data[m6]!;
|
|
102
|
-
const e4 =
|
|
103
|
-
a.data[m3]! * b.data[m1]! +
|
|
104
|
-
a.data[m4]! * b.data[m4]! +
|
|
105
|
-
a.data[m5]! * b.data[m7]!;
|
|
106
|
-
const e5 =
|
|
107
|
-
a.data[m3]! * b.data[m2]! +
|
|
108
|
-
a.data[m4]! * b.data[m5]! +
|
|
109
|
-
a.data[m5]! * b.data[m8]!;
|
|
110
|
-
const e6 =
|
|
111
|
-
a.data[m6]! * b.data[m0]! +
|
|
112
|
-
a.data[m7]! * b.data[m3]! +
|
|
113
|
-
a.data[m8]! * b.data[m6]!;
|
|
114
|
-
const e7 =
|
|
115
|
-
a.data[m6]! * b.data[m1]! +
|
|
116
|
-
a.data[m7]! * b.data[m4]! +
|
|
117
|
-
a.data[m8]! * b.data[m7]!;
|
|
118
|
-
const e8 =
|
|
119
|
-
a.data[m6]! * b.data[m2]! +
|
|
120
|
-
a.data[m7]! * b.data[m5]! +
|
|
121
|
-
a.data[m8]! * b.data[m8]!;
|
|
84
|
+
const e0 = a.ta * b.ta + a.tb * b.tc;
|
|
85
|
+
const e1 = a.ta * b.tb + a.tb * b.td;
|
|
86
|
+
const e2 = a.ta * b.tx + a.tb * b.ty + a.tx;
|
|
87
|
+
const e3 = a.tc * b.ta + a.td * b.tc;
|
|
88
|
+
const e4 = a.tc * b.tb + a.td * b.td;
|
|
89
|
+
const e5 = a.tc * b.tx + a.td * b.ty + a.ty;
|
|
122
90
|
if (!out) {
|
|
123
91
|
out = new Matrix3d();
|
|
124
92
|
}
|
|
125
|
-
out.
|
|
126
|
-
out.
|
|
127
|
-
out.
|
|
128
|
-
out.
|
|
129
|
-
out.
|
|
130
|
-
out.
|
|
131
|
-
out.
|
|
132
|
-
out.data[m7] = e7;
|
|
133
|
-
out.data[m8] = e8;
|
|
93
|
+
out.ta = e0;
|
|
94
|
+
out.tb = e1;
|
|
95
|
+
out.tx = e2;
|
|
96
|
+
out.tc = e3;
|
|
97
|
+
out.td = e4;
|
|
98
|
+
out.ty = e5;
|
|
99
|
+
out.mutation = true;
|
|
134
100
|
return out;
|
|
135
101
|
}
|
|
136
102
|
|
|
@@ -138,15 +104,13 @@ export class Matrix3d {
|
|
|
138
104
|
if (!out) {
|
|
139
105
|
out = new Matrix3d();
|
|
140
106
|
}
|
|
141
|
-
out.
|
|
142
|
-
out.
|
|
143
|
-
out.
|
|
144
|
-
out.
|
|
145
|
-
out.
|
|
146
|
-
out.
|
|
147
|
-
out.
|
|
148
|
-
out.data[m7] = 0;
|
|
149
|
-
out.data[m8] = 1;
|
|
107
|
+
out.ta = 1;
|
|
108
|
+
out.tb = 0;
|
|
109
|
+
out.tx = 0;
|
|
110
|
+
out.tc = 0;
|
|
111
|
+
out.td = 1;
|
|
112
|
+
out.ty = 0;
|
|
113
|
+
out.mutation = true;
|
|
150
114
|
return out;
|
|
151
115
|
}
|
|
152
116
|
|
|
@@ -154,15 +118,13 @@ export class Matrix3d {
|
|
|
154
118
|
if (!out) {
|
|
155
119
|
out = new Matrix3d();
|
|
156
120
|
}
|
|
157
|
-
out.
|
|
158
|
-
out.
|
|
159
|
-
out.
|
|
160
|
-
out.
|
|
161
|
-
out.
|
|
162
|
-
out.
|
|
163
|
-
out.
|
|
164
|
-
out.data[m7] = 0;
|
|
165
|
-
out.data[m8] = 1;
|
|
121
|
+
out.ta = 1;
|
|
122
|
+
out.tb = 0;
|
|
123
|
+
out.tx = x;
|
|
124
|
+
out.tc = 0;
|
|
125
|
+
out.td = 1;
|
|
126
|
+
out.ty = y;
|
|
127
|
+
out.mutation = true;
|
|
166
128
|
return out;
|
|
167
129
|
}
|
|
168
130
|
|
|
@@ -170,15 +132,13 @@ export class Matrix3d {
|
|
|
170
132
|
if (!out) {
|
|
171
133
|
out = new Matrix3d();
|
|
172
134
|
}
|
|
173
|
-
out.
|
|
174
|
-
out.
|
|
175
|
-
out.
|
|
176
|
-
out.
|
|
177
|
-
out.
|
|
178
|
-
out.
|
|
179
|
-
out.
|
|
180
|
-
out.data[m7] = 0;
|
|
181
|
-
out.data[m8] = 1;
|
|
135
|
+
out.ta = sx;
|
|
136
|
+
out.tb = 0;
|
|
137
|
+
out.tx = 0;
|
|
138
|
+
out.tc = 0;
|
|
139
|
+
out.td = sy;
|
|
140
|
+
out.ty = 0;
|
|
141
|
+
out.mutation = true;
|
|
182
142
|
return out;
|
|
183
143
|
}
|
|
184
144
|
|
|
@@ -188,49 +148,43 @@ export class Matrix3d {
|
|
|
188
148
|
if (!out) {
|
|
189
149
|
out = new Matrix3d();
|
|
190
150
|
}
|
|
191
|
-
out.
|
|
192
|
-
out.
|
|
193
|
-
out.
|
|
194
|
-
out.
|
|
195
|
-
out.
|
|
196
|
-
out.
|
|
197
|
-
out.
|
|
198
|
-
out.data[m7] = 0;
|
|
199
|
-
out.data[m8] = 1;
|
|
151
|
+
out.ta = cos;
|
|
152
|
+
out.tb = -sin;
|
|
153
|
+
out.tx = 0;
|
|
154
|
+
out.tc = sin;
|
|
155
|
+
out.td = cos;
|
|
156
|
+
out.ty = 0;
|
|
157
|
+
out.mutation = true;
|
|
200
158
|
return out;
|
|
201
159
|
}
|
|
202
160
|
|
|
203
|
-
public static copy(
|
|
204
|
-
src: Matrix3d,
|
|
205
|
-
dst?: Matrix3d,
|
|
206
|
-
transpose?: boolean,
|
|
207
|
-
): Matrix3d {
|
|
161
|
+
public static copy(src: Matrix3d, dst?: Matrix3d): Matrix3d {
|
|
208
162
|
if (!dst) {
|
|
209
163
|
dst = new Matrix3d();
|
|
210
164
|
}
|
|
211
|
-
dst.
|
|
212
|
-
dst.
|
|
213
|
-
dst.
|
|
214
|
-
dst.
|
|
215
|
-
dst.
|
|
216
|
-
dst.
|
|
217
|
-
dst.
|
|
218
|
-
dst.data[7] = src.data[7]!;
|
|
219
|
-
dst.data[8] = src.data[8]!;
|
|
165
|
+
dst.ta = src.ta;
|
|
166
|
+
dst.tc = src.tc;
|
|
167
|
+
dst.tb = src.tb;
|
|
168
|
+
dst.td = src.td;
|
|
169
|
+
dst.tx = src.tx;
|
|
170
|
+
dst.ty = src.ty;
|
|
171
|
+
dst.mutation = true;
|
|
220
172
|
return dst;
|
|
221
173
|
}
|
|
222
174
|
|
|
223
175
|
public translate(x: number, y: number): Matrix3d {
|
|
224
|
-
this.
|
|
225
|
-
this.
|
|
176
|
+
this.tx = this.ta * x + this.tb * y + this.tx;
|
|
177
|
+
this.ty = this.tc * x + this.td * y + this.ty;
|
|
178
|
+
this.mutation = true;
|
|
226
179
|
return this;
|
|
227
180
|
}
|
|
228
181
|
|
|
229
182
|
public scale(sx: number, sy: number): Matrix3d {
|
|
230
|
-
this.
|
|
231
|
-
this.
|
|
232
|
-
this.
|
|
233
|
-
this.
|
|
183
|
+
this.ta = this.ta * sx;
|
|
184
|
+
this.tb = this.tb * sy;
|
|
185
|
+
this.tc = this.tc * sx;
|
|
186
|
+
this.td = this.td * sy;
|
|
187
|
+
this.mutation = true;
|
|
234
188
|
return this;
|
|
235
189
|
}
|
|
236
190
|
|
|
@@ -240,14 +194,15 @@ export class Matrix3d {
|
|
|
240
194
|
}
|
|
241
195
|
const cos = Math.cos(angle);
|
|
242
196
|
const sin = Math.sin(angle);
|
|
243
|
-
const e0 = this.
|
|
244
|
-
const e1 = this.
|
|
245
|
-
const e3 = this.
|
|
246
|
-
const e4 = this.
|
|
247
|
-
this.
|
|
248
|
-
this.
|
|
249
|
-
this.
|
|
250
|
-
this.
|
|
197
|
+
const e0 = this.ta * cos + this.tb * sin;
|
|
198
|
+
const e1 = this.tb * cos - this.ta * sin;
|
|
199
|
+
const e3 = this.tc * cos + this.td * sin;
|
|
200
|
+
const e4 = this.td * cos - this.tc * sin;
|
|
201
|
+
this.ta = e0;
|
|
202
|
+
this.tb = e1;
|
|
203
|
+
this.tc = e3;
|
|
204
|
+
this.td = e4;
|
|
205
|
+
this.mutation = true;
|
|
251
206
|
return this;
|
|
252
207
|
}
|
|
253
208
|
|
|
@@ -255,35 +210,34 @@ export class Matrix3d {
|
|
|
255
210
|
return Matrix3d.multiply(this, other, this);
|
|
256
211
|
}
|
|
257
212
|
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
];
|
|
213
|
+
/**
|
|
214
|
+
* Returns the matrix as a Float32Array in column-major order.
|
|
215
|
+
*
|
|
216
|
+
* @remarks
|
|
217
|
+
* This method is optimized to avoid unnecessary allocations. The same array
|
|
218
|
+
* is returned every time this method is called, and is updated in place.
|
|
219
|
+
*
|
|
220
|
+
* WARNING: Use the array only for passing directly to a WebGL shader uniform
|
|
221
|
+
* during a frame render. Do not modify or hold onto the array for longer than
|
|
222
|
+
* a frame.
|
|
223
|
+
*/
|
|
224
|
+
getFloatArr(): Float32Array {
|
|
225
|
+
if (!this._floatArr) {
|
|
226
|
+
this._floatArr = new Float32Array(9);
|
|
227
|
+
}
|
|
228
|
+
if (this.mutation) {
|
|
229
|
+
this._floatArr[0] = this.ta;
|
|
230
|
+
this._floatArr[1] = this.tc;
|
|
231
|
+
this._floatArr[2] = 0;
|
|
232
|
+
this._floatArr[3] = this.tb;
|
|
233
|
+
this._floatArr[4] = this.td;
|
|
234
|
+
this._floatArr[5] = 0;
|
|
235
|
+
this._floatArr[6] = this.tx;
|
|
236
|
+
this._floatArr[7] = this.ty;
|
|
237
|
+
this._floatArr[8] = 1;
|
|
238
|
+
this.mutation = false;
|
|
239
|
+
}
|
|
240
|
+
return this._floatArr;
|
|
287
241
|
}
|
|
288
242
|
}
|
|
289
243
|
|