@lightningjs/renderer 3.0.0-beta20 → 3.0.0-beta22
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/exports/index.d.ts +1 -0
- package/dist/exports/index.js +1 -0
- package/dist/exports/index.js.map +1 -1
- package/dist/src/common/CommonTypes.d.ts +2 -1
- package/dist/src/core/CoreNode.d.ts +53 -7
- package/dist/src/core/CoreNode.js +175 -65
- package/dist/src/core/CoreNode.js.map +1 -1
- package/dist/src/core/CoreTextNode.d.ts +1 -1
- package/dist/src/core/CoreTextNode.js +3 -5
- package/dist/src/core/CoreTextNode.js.map +1 -1
- package/dist/src/core/CoreTextureManager.js +1 -1
- package/dist/src/core/CoreTextureManager.js.map +1 -1
- package/dist/src/core/Stage.d.ts +2 -1
- package/dist/src/core/Stage.js +9 -7
- package/dist/src/core/Stage.js.map +1 -1
- package/dist/src/core/TextureMemoryManager.d.ts +1 -1
- package/dist/src/core/TextureMemoryManager.js +3 -3
- package/dist/src/core/TextureMemoryManager.js.map +1 -1
- package/dist/src/core/lib/ImageWorker.d.ts +2 -2
- package/dist/src/core/lib/ImageWorker.js +30 -11
- package/dist/src/core/lib/ImageWorker.js.map +1 -1
- package/dist/src/core/lib/WebGlContextWrapper.js +1 -1
- package/dist/src/core/lib/WebGlContextWrapper.js.map +1 -1
- package/dist/src/core/lib/utils.d.ts +6 -2
- package/dist/src/core/lib/utils.js +21 -21
- package/dist/src/core/lib/utils.js.map +1 -1
- package/dist/src/core/renderers/CoreRenderer.d.ts +1 -31
- package/dist/src/core/renderers/CoreRenderer.js.map +1 -1
- package/dist/src/core/renderers/CoreShaderNode.d.ts +4 -0
- package/dist/src/core/renderers/CoreShaderNode.js +15 -0
- package/dist/src/core/renderers/CoreShaderNode.js.map +1 -1
- package/dist/src/core/renderers/canvas/CanvasRenderer.d.ts +3 -3
- package/dist/src/core/renderers/canvas/CanvasRenderer.js +38 -33
- package/dist/src/core/renderers/canvas/CanvasRenderer.js.map +1 -1
- package/dist/src/core/renderers/canvas/CanvasShaderNode.d.ts +1 -2
- package/dist/src/core/renderers/canvas/CanvasShaderNode.js.map +1 -1
- package/dist/src/core/renderers/webgl/SdfRenderOp.d.ts +33 -0
- package/dist/src/core/renderers/webgl/SdfRenderOp.js +97 -0
- package/dist/src/core/renderers/webgl/SdfRenderOp.js.map +1 -0
- package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.js +1 -1
- package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.js.map +1 -1
- package/dist/src/core/renderers/webgl/WebGlCtxTexture.js +12 -8
- package/dist/src/core/renderers/webgl/WebGlCtxTexture.js.map +1 -1
- package/dist/src/core/renderers/webgl/WebGlRenderer.d.ts +6 -18
- package/dist/src/core/renderers/webgl/WebGlRenderer.js +48 -61
- package/dist/src/core/renderers/webgl/WebGlRenderer.js.map +1 -1
- package/dist/src/core/renderers/webgl/WebGlShaderNode.d.ts +2 -4
- package/dist/src/core/renderers/webgl/WebGlShaderNode.js.map +1 -1
- package/dist/src/core/renderers/webgl/WebGlShaderProgram.d.ts +3 -4
- package/dist/src/core/renderers/webgl/WebGlShaderProgram.js +40 -29
- package/dist/src/core/renderers/webgl/WebGlShaderProgram.js.map +1 -1
- package/dist/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.js +8 -24
- package/dist/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.js.map +1 -1
- package/dist/src/core/renderers/webgl/shaders/effects/RadialGradientEffect.js +8 -25
- package/dist/src/core/renderers/webgl/shaders/effects/RadialGradientEffect.js.map +1 -1
- package/dist/src/core/shaders/canvas/Border.d.ts +8 -2
- package/dist/src/core/shaders/canvas/Border.js +62 -23
- package/dist/src/core/shaders/canvas/Border.js.map +1 -1
- package/dist/src/core/shaders/canvas/HolePunch.js +2 -1
- package/dist/src/core/shaders/canvas/HolePunch.js.map +1 -1
- package/dist/src/core/shaders/canvas/LinearGradient.js +5 -3
- package/dist/src/core/shaders/canvas/LinearGradient.js.map +1 -1
- package/dist/src/core/shaders/canvas/RadialGradient.js +7 -5
- package/dist/src/core/shaders/canvas/RadialGradient.js.map +1 -1
- package/dist/src/core/shaders/canvas/Rounded.js +2 -2
- package/dist/src/core/shaders/canvas/Rounded.js.map +1 -1
- package/dist/src/core/shaders/canvas/RoundedWithBorder.d.ts +6 -3
- package/dist/src/core/shaders/canvas/RoundedWithBorder.js +39 -9
- package/dist/src/core/shaders/canvas/RoundedWithBorder.js.map +1 -1
- package/dist/src/core/shaders/canvas/RoundedWithBorderAndShadow.d.ts +2 -3
- package/dist/src/core/shaders/canvas/RoundedWithBorderAndShadow.js +44 -7
- package/dist/src/core/shaders/canvas/RoundedWithBorderAndShadow.js.map +1 -1
- package/dist/src/core/shaders/canvas/RoundedWithShadow.js +5 -4
- package/dist/src/core/shaders/canvas/RoundedWithShadow.js.map +1 -1
- package/dist/src/core/shaders/canvas/Shadow.js +4 -2
- package/dist/src/core/shaders/canvas/Shadow.js.map +1 -1
- package/dist/src/core/shaders/canvas/utils/render.d.ts +1 -1
- package/dist/src/core/shaders/canvas/utils/render.js +31 -18
- package/dist/src/core/shaders/canvas/utils/render.js.map +1 -1
- package/dist/src/core/shaders/templates/BorderTemplate.d.ts +10 -0
- package/dist/src/core/shaders/templates/BorderTemplate.js +20 -0
- package/dist/src/core/shaders/templates/BorderTemplate.js.map +1 -1
- package/dist/src/core/shaders/webgl/Border.js +66 -14
- package/dist/src/core/shaders/webgl/Border.js.map +1 -1
- package/dist/src/core/shaders/webgl/RoundedWithBorder.js +90 -31
- package/dist/src/core/shaders/webgl/RoundedWithBorder.js.map +1 -1
- package/dist/src/core/shaders/webgl/RoundedWithBorderAndShadow.js +98 -38
- package/dist/src/core/shaders/webgl/RoundedWithBorderAndShadow.js.map +1 -1
- package/dist/src/core/shaders/webgl/RoundedWithShadow.js +5 -4
- package/dist/src/core/shaders/webgl/RoundedWithShadow.js.map +1 -1
- package/dist/src/core/shaders/webgl/Shadow.js +12 -6
- package/dist/src/core/shaders/webgl/Shadow.js.map +1 -1
- package/dist/src/core/text-rendering/CanvasFont.d.ts +14 -0
- package/dist/src/core/text-rendering/CanvasFont.js +115 -0
- package/dist/src/core/text-rendering/CanvasFont.js.map +1 -0
- package/dist/src/core/text-rendering/CoreFont.d.ts +33 -0
- package/dist/src/core/text-rendering/CoreFont.js +48 -0
- package/dist/src/core/text-rendering/CoreFont.js.map +1 -0
- package/dist/src/core/text-rendering/FontManager.d.ts +11 -0
- package/dist/src/core/text-rendering/FontManager.js +41 -0
- package/dist/src/core/text-rendering/FontManager.js.map +1 -0
- package/dist/src/core/text-rendering/SdfFont.d.ts +29 -0
- package/dist/src/core/text-rendering/SdfFont.js +142 -0
- package/dist/src/core/text-rendering/SdfFont.js.map +1 -0
- package/dist/src/core/text-rendering/SdfTextRenderer.js +12 -20
- package/dist/src/core/text-rendering/SdfTextRenderer.js.map +1 -1
- package/dist/src/core/textures/Texture.d.ts +4 -3
- package/dist/src/core/textures/Texture.js.map +1 -1
- package/dist/src/main-api/Inspector.d.ts +5 -1
- package/dist/src/main-api/Inspector.js +164 -1
- package/dist/src/main-api/Inspector.js.map +1 -1
- package/dist/src/main-api/Renderer.d.ts +10 -0
- package/dist/src/main-api/Renderer.js +2 -0
- package/dist/src/main-api/Renderer.js.map +1 -1
- package/dist/tsconfig.dist.tsbuildinfo +1 -1
- package/exports/index.ts +5 -0
- package/package.json +1 -1
- package/src/common/CommonTypes.ts +2 -1
- package/src/core/Autosizer.ts +224 -0
- package/src/core/CoreNode.test.ts +116 -2
- package/src/core/CoreNode.ts +247 -78
- package/src/core/CoreTextNode.ts +3 -5
- package/src/core/CoreTextureManager.ts +1 -1
- package/src/core/Stage.ts +10 -7
- package/src/core/TextureMemoryManager.ts +3 -3
- package/src/core/lib/ImageWorker.ts +36 -11
- package/src/core/lib/WebGlContextWrapper.ts +1 -1
- package/src/core/lib/utils.ts +28 -25
- package/src/core/renderers/CoreRenderer.ts +1 -32
- package/src/core/renderers/CoreShaderNode.ts +20 -0
- package/src/core/renderers/canvas/CanvasRenderer.ts +43 -51
- package/src/core/renderers/canvas/CanvasShaderNode.ts +1 -2
- package/src/core/renderers/webgl/SdfRenderOp.ts +105 -0
- package/src/core/renderers/webgl/WebGlCtxTexture.ts +16 -9
- package/src/core/renderers/webgl/WebGlRenderer.ts +56 -78
- package/src/core/renderers/webgl/WebGlShaderNode.ts +2 -7
- package/src/core/renderers/webgl/WebGlShaderProgram.ts +48 -38
- package/src/core/shaders/canvas/Border.ts +86 -29
- package/src/core/shaders/canvas/HolePunch.ts +2 -1
- package/src/core/shaders/canvas/LinearGradient.ts +8 -6
- package/src/core/shaders/canvas/RadialGradient.ts +7 -10
- package/src/core/shaders/canvas/Rounded.ts +5 -5
- package/src/core/shaders/canvas/RoundedWithBorder.ts +68 -18
- package/src/core/shaders/canvas/RoundedWithBorderAndShadow.ts +71 -23
- package/src/core/shaders/canvas/RoundedWithShadow.ts +6 -5
- package/src/core/shaders/canvas/Shadow.ts +7 -5
- package/src/core/shaders/canvas/utils/render.ts +45 -36
- package/src/core/shaders/templates/BorderTemplate.ts +30 -0
- package/src/core/shaders/webgl/Border.ts +66 -15
- package/src/core/shaders/webgl/RoundedWithBorder.ts +90 -31
- package/src/core/shaders/webgl/RoundedWithBorderAndShadow.ts +98 -38
- package/src/core/shaders/webgl/RoundedWithShadow.ts +5 -4
- package/src/core/shaders/webgl/Shadow.ts +12 -6
- package/src/core/text-rendering/SdfTextRenderer.ts +18 -21
- package/src/core/textures/Texture.ts +10 -6
- package/src/main-api/Inspector.ts +221 -3
- package/src/main-api/Renderer.ts +13 -0
- package/dist/tsconfig.tsbuildinfo +0 -1
- package/src/core/renderers/webgl/WebGlRenderOp.ts +0 -170
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* If not stated otherwise in this file or this component's LICENSE file the
|
|
3
|
+
* following copyright and licenses apply:
|
|
4
|
+
*
|
|
5
|
+
* Copyright 2025 Comcast Cable Communications Management, LLC.
|
|
6
|
+
*
|
|
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
|
|
10
|
+
*
|
|
11
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
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
|
+
import { CoreFont, FontState } from './CoreFont.js';
|
|
20
|
+
import { buildGlyphMap, buildKerningTable, } from './SdfFontHandler.js';
|
|
21
|
+
import { normalizeFontMetrics } from './TextLayoutEngine.js';
|
|
22
|
+
import { hasZeroWidthSpace } from './Utils.js';
|
|
23
|
+
export class SdfFont extends CoreFont {
|
|
24
|
+
stage;
|
|
25
|
+
type = 'sdf';
|
|
26
|
+
atlasUrl;
|
|
27
|
+
atlasDataUrl;
|
|
28
|
+
atlasTexture;
|
|
29
|
+
glyphMap;
|
|
30
|
+
kerningTable;
|
|
31
|
+
data;
|
|
32
|
+
constructor(textRenderer, props, stage) {
|
|
33
|
+
super(textRenderer, props);
|
|
34
|
+
this.stage = stage;
|
|
35
|
+
this.atlasUrl = props.atlasUrl;
|
|
36
|
+
this.atlasDataUrl = props.atlasDataUrl;
|
|
37
|
+
}
|
|
38
|
+
load() {
|
|
39
|
+
new Promise(async () => {
|
|
40
|
+
const atlasData = await fetch(this.atlasDataUrl);
|
|
41
|
+
if (atlasData.ok === false) {
|
|
42
|
+
this.hardFail(`Failed to load font data: ${atlasData.statusText}`);
|
|
43
|
+
}
|
|
44
|
+
const fontData = (await atlasData.json());
|
|
45
|
+
if (fontData.chars === undefined) {
|
|
46
|
+
this.hardFail('Invalid SDF font data format');
|
|
47
|
+
}
|
|
48
|
+
const atlasTexture = this.stage.txManager.createTexture('ImageTexture', {
|
|
49
|
+
src: this.atlasUrl,
|
|
50
|
+
premultiplyAlpha: false,
|
|
51
|
+
});
|
|
52
|
+
atlasTexture.setRenderableOwner(this.family, true);
|
|
53
|
+
atlasTexture.preventCleanup = true;
|
|
54
|
+
atlasTexture.on('loaded', () => {
|
|
55
|
+
this.onLoaded();
|
|
56
|
+
});
|
|
57
|
+
atlasTexture.on('failed', (error) => {
|
|
58
|
+
console.error(`Failed to load SDF font: ${this.family}`, error);
|
|
59
|
+
this.emit('failed');
|
|
60
|
+
});
|
|
61
|
+
this.atlasTexture = atlasTexture;
|
|
62
|
+
this.processFontData(fontData);
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
hardFail(message) {
|
|
66
|
+
this.state = FontState.Failed;
|
|
67
|
+
throw new Error(message);
|
|
68
|
+
}
|
|
69
|
+
processFontData(fontData) {
|
|
70
|
+
this.glyphMap = buildGlyphMap(fontData.chars);
|
|
71
|
+
this.kerningTable = buildKerningTable(fontData.kernings);
|
|
72
|
+
this.metrics = this.metrics ||
|
|
73
|
+
fontData.lightningMetrics || {
|
|
74
|
+
ascender: 800,
|
|
75
|
+
descender: -200,
|
|
76
|
+
lineGap: 200,
|
|
77
|
+
unitsPerEm: 1000,
|
|
78
|
+
};
|
|
79
|
+
this.data = fontData;
|
|
80
|
+
}
|
|
81
|
+
measureText(text, letterSpacing) {
|
|
82
|
+
if (text.length === 1) {
|
|
83
|
+
const char = text.charAt(0);
|
|
84
|
+
const codepoint = text.codePointAt(0);
|
|
85
|
+
if (codepoint === undefined)
|
|
86
|
+
return 0;
|
|
87
|
+
if (hasZeroWidthSpace(char) === true)
|
|
88
|
+
return 0;
|
|
89
|
+
const glyph = this.getGlyph(codepoint);
|
|
90
|
+
if (glyph === null)
|
|
91
|
+
return 0;
|
|
92
|
+
return glyph.xadvance + letterSpacing;
|
|
93
|
+
}
|
|
94
|
+
let width = 0;
|
|
95
|
+
let prevCodepoint = 0;
|
|
96
|
+
for (let i = 0; i < text.length; i++) {
|
|
97
|
+
const char = text.charAt(i);
|
|
98
|
+
const codepoint = text.codePointAt(i);
|
|
99
|
+
if (codepoint === undefined)
|
|
100
|
+
continue;
|
|
101
|
+
// Skip zero-width spaces in width calculations
|
|
102
|
+
if (hasZeroWidthSpace(char)) {
|
|
103
|
+
continue;
|
|
104
|
+
}
|
|
105
|
+
const glyph = this.getGlyph(codepoint);
|
|
106
|
+
if (glyph === null)
|
|
107
|
+
continue;
|
|
108
|
+
let advance = glyph.xadvance;
|
|
109
|
+
// Add kerning if there's a previous character
|
|
110
|
+
if (prevCodepoint !== 0) {
|
|
111
|
+
const kerning = this.getKerning(prevCodepoint, codepoint);
|
|
112
|
+
advance += kerning;
|
|
113
|
+
}
|
|
114
|
+
width += advance + letterSpacing;
|
|
115
|
+
prevCodepoint = codepoint;
|
|
116
|
+
}
|
|
117
|
+
return width;
|
|
118
|
+
}
|
|
119
|
+
getMetrics(fontSize) {
|
|
120
|
+
let m = this.normalizedMetrics[fontSize];
|
|
121
|
+
if (m !== undefined) {
|
|
122
|
+
return m;
|
|
123
|
+
}
|
|
124
|
+
m = this.normalizedMetrics[fontSize] = normalizeFontMetrics(this.metrics, fontSize);
|
|
125
|
+
return m;
|
|
126
|
+
}
|
|
127
|
+
getGlyph(codepoint) {
|
|
128
|
+
const gm = this.glyphMap;
|
|
129
|
+
return gm[codepoint] || gm[63] || null;
|
|
130
|
+
}
|
|
131
|
+
getKerning(firstGlyph, secondGlyph) {
|
|
132
|
+
const seconds = this.kerningTable[secondGlyph];
|
|
133
|
+
return (seconds !== undefined && seconds[firstGlyph]) || 0;
|
|
134
|
+
}
|
|
135
|
+
getAtlas() {
|
|
136
|
+
return this.atlasTexture;
|
|
137
|
+
}
|
|
138
|
+
getData() {
|
|
139
|
+
return this.data;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
//# sourceMappingURL=SdfFont.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SdfFont.js","sourceRoot":"","sources":["../../../../src/core/text-rendering/SdfFont.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
import { hasZeroWidthSpace } from './Utils.js';
|
|
20
20
|
import * as SdfFontHandler from './SdfFontHandler.js';
|
|
21
21
|
import { WebGlRenderer } from '../renderers/webgl/WebGlRenderer.js';
|
|
22
|
-
import {
|
|
22
|
+
import { SdfRenderOp } from '../renderers/webgl/SdfRenderOp.js';
|
|
23
23
|
import { Sdf } from '../shaders/webgl/SdfShader.js';
|
|
24
24
|
import { BufferCollection } from '../renderers/webgl/internal/BufferCollection.js';
|
|
25
25
|
import { mergeColorAlpha } from '../../utils.js';
|
|
@@ -186,25 +186,17 @@ const renderQuads = (renderer, layout, vertexBuffer, renderProps) => {
|
|
|
186
186
|
if (buffer !== undefined) {
|
|
187
187
|
glw.arrayBufferData(buffer, vertexBuffer, glw.STATIC_DRAW);
|
|
188
188
|
}
|
|
189
|
-
const renderOp = new
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
clippingRect: renderProps.clippingRect,
|
|
201
|
-
height: layout.height,
|
|
202
|
-
width: layout.width,
|
|
203
|
-
rtt: false,
|
|
204
|
-
parentHasRenderTexture: renderProps.parentHasRenderTexture,
|
|
205
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment
|
|
206
|
-
framebufferDimensions: renderProps.framebufferDimensions,
|
|
207
|
-
}, 0);
|
|
189
|
+
const renderOp = new SdfRenderOp(renderer, sdfShader, // Ensure sdfShader is not null
|
|
190
|
+
{
|
|
191
|
+
transform: globalTransform,
|
|
192
|
+
color: mergeColorAlpha(color, worldAlpha),
|
|
193
|
+
size: layout.fontScale, // Use proper font scaling in shader
|
|
194
|
+
distanceRange: layout.distanceRange,
|
|
195
|
+
}, webGlBuffers, worldAlpha,
|
|
196
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
197
|
+
renderProps.clippingRect, layout.width, layout.height, false, renderProps.parentHasRenderTexture,
|
|
198
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
199
|
+
renderProps.framebufferDimensions);
|
|
208
200
|
// Add atlas texture and set quad count
|
|
209
201
|
renderOp.addTexture(atlasTexture.ctxTexture);
|
|
210
202
|
renderOp.numQuads = layout.glyphs.length;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdfTextRenderer.js","sourceRoot":"","sources":["../../../../src/core/text-rendering/SdfTextRenderer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAUH,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"SdfTextRenderer.js","sourceRoot":"","sources":["../../../../src/core/text-rendering/SdfTextRenderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import type { Dimensions } from '../../common/CommonTypes.js';
|
|
|
4
4
|
import { EventEmitter } from '../../common/EventEmitter.js';
|
|
5
5
|
import type { CoreContextTexture } from '../renderers/CoreContextTexture.js';
|
|
6
6
|
import type { Bound } from '../lib/utils.js';
|
|
7
|
+
import type { TextureError } from '../TextureError.js';
|
|
7
8
|
/**
|
|
8
9
|
* Event handler for when a Texture is freed
|
|
9
10
|
*/
|
|
@@ -54,7 +55,7 @@ export interface CompressedData {
|
|
|
54
55
|
/**
|
|
55
56
|
* Event handler for when a Texture fails to load
|
|
56
57
|
*/
|
|
57
|
-
export type TextureFailedEventHandler = (target: any, error:
|
|
58
|
+
export type TextureFailedEventHandler = (target: any, error: TextureError) => void;
|
|
58
59
|
/**
|
|
59
60
|
* TextureData that is used to populate a CoreContextTexture
|
|
60
61
|
*/
|
|
@@ -135,7 +136,7 @@ export declare abstract class Texture extends EventEmitter {
|
|
|
135
136
|
private static readonly STARTUP_GRACE_PERIOD;
|
|
136
137
|
constructor(txManager: CoreTextureManager);
|
|
137
138
|
get dimensions(): Dimensions | null;
|
|
138
|
-
get error():
|
|
139
|
+
get error(): TextureError | null;
|
|
139
140
|
/**
|
|
140
141
|
* Checks if the texture is within the startup grace period.
|
|
141
142
|
* During this period, textures are protected from cleanup to prevent
|
|
@@ -210,7 +211,7 @@ export declare abstract class Texture extends EventEmitter {
|
|
|
210
211
|
* e.g. ImageData that is downloaded from a URL.
|
|
211
212
|
*/
|
|
212
213
|
freeTextureData(): void;
|
|
213
|
-
setState(state: TextureState, errorOrDimensions?:
|
|
214
|
+
setState(state: TextureState, errorOrDimensions?: TextureError | Dimensions): void;
|
|
214
215
|
/**
|
|
215
216
|
* Get the texture data for this texture.
|
|
216
217
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Texture.js","sourceRoot":"","sources":["../../../../src/core/textures/Texture.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAKH,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"Texture.js","sourceRoot":"","sources":["../../../../src/core/textures/Texture.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { type RendererMainSettings } from './Renderer.js';
|
|
|
3
3
|
import type { AnimationSettings } from '../core/animations/CoreAnimation.js';
|
|
4
4
|
import type { AnimationControllerState } from '../common/IAnimationController.js';
|
|
5
5
|
import { CoreTextNode, type CoreTextNodeProps } from '../core/CoreTextNode.js';
|
|
6
|
+
import type { Texture } from '../core/textures/Texture.js';
|
|
6
7
|
/**
|
|
7
8
|
* Inspector Options
|
|
8
9
|
*
|
|
@@ -55,6 +56,7 @@ export declare class Inspector {
|
|
|
55
56
|
private width;
|
|
56
57
|
private scaleX;
|
|
57
58
|
private scaleY;
|
|
59
|
+
private textureMetrics;
|
|
58
60
|
private static setterCallCount;
|
|
59
61
|
private static activeAnimations;
|
|
60
62
|
private static animationHistory;
|
|
@@ -140,8 +142,10 @@ export declare class Inspector {
|
|
|
140
142
|
createDiv(id: number, properties: CoreNodeProps | CoreTextNodeProps): HTMLElement;
|
|
141
143
|
createNodes(node: CoreNode): boolean;
|
|
142
144
|
createNode(node: CoreNode): CoreNode;
|
|
143
|
-
createTextNode(node:
|
|
145
|
+
createTextNode(node: CoreTextNode): CoreTextNode;
|
|
144
146
|
createProxy(node: CoreNode | CoreTextNode, div: HTMLElement): CoreNode | CoreTextNode;
|
|
147
|
+
updateTextNodeDimensions(div: HTMLElement, node: CoreTextNode): void;
|
|
148
|
+
updateTextureAttributes(div: HTMLElement, texture: Texture): void;
|
|
145
149
|
destroy(): void;
|
|
146
150
|
destroyNode(id: number): void;
|
|
147
151
|
updateNodeProperty(div: HTMLElement, property: keyof CoreNodeProps | keyof CoreTextNodeProps, value: any, props: CoreNodeProps | CoreTextNodeProps): void;
|
|
@@ -2,6 +2,7 @@ import { CoreNode, } from '../core/CoreNode.js';
|
|
|
2
2
|
import {} from './Renderer.js';
|
|
3
3
|
import { isProductionEnvironment } from '../utils.js';
|
|
4
4
|
import { CoreTextNode } from '../core/CoreTextNode.js';
|
|
5
|
+
import { TextureType } from '../core/textures/Texture.js';
|
|
5
6
|
const stylePropertyMap = {
|
|
6
7
|
alpha: (v) => {
|
|
7
8
|
if (v === 1) {
|
|
@@ -105,6 +106,14 @@ const gradientColorPropertyMap = [
|
|
|
105
106
|
'colorBl',
|
|
106
107
|
'colorBr',
|
|
107
108
|
];
|
|
109
|
+
const textureTypeNames = {
|
|
110
|
+
[TextureType.generic]: 'generic',
|
|
111
|
+
[TextureType.color]: 'color',
|
|
112
|
+
[TextureType.image]: 'image',
|
|
113
|
+
[TextureType.noise]: 'noise',
|
|
114
|
+
[TextureType.renderToTexture]: 'renderToTexture',
|
|
115
|
+
[TextureType.subTexture]: 'subTexture',
|
|
116
|
+
};
|
|
108
117
|
const knownProperties = new Set([
|
|
109
118
|
...Object.keys(stylePropertyMap),
|
|
110
119
|
...Object.keys(domPropertyMap),
|
|
@@ -123,6 +132,7 @@ export class Inspector {
|
|
|
123
132
|
width = 1920;
|
|
124
133
|
scaleX = 1;
|
|
125
134
|
scaleY = 1;
|
|
135
|
+
textureMetrics = new Map();
|
|
126
136
|
// Performance monitoring for frequent setter calls
|
|
127
137
|
static setterCallCount = new Map();
|
|
128
138
|
// Animation monitoring structures
|
|
@@ -483,12 +493,84 @@ export class Inspector {
|
|
|
483
493
|
return this.createProxy(node, div);
|
|
484
494
|
}
|
|
485
495
|
createTextNode(node) {
|
|
486
|
-
|
|
496
|
+
// eslint-disable-next-line
|
|
497
|
+
// @ts-ignore - textProps is a private property and keeping it that way
|
|
498
|
+
// but we need it from the inspector to set the initial properties on the div element
|
|
499
|
+
const div = this.createDiv(node.id, node.textProps);
|
|
487
500
|
div.node = node;
|
|
488
501
|
node.div = div;
|
|
489
502
|
return this.createProxy(node, div);
|
|
490
503
|
}
|
|
491
504
|
createProxy(node, div) {
|
|
505
|
+
// Store texture event listeners for cleanup
|
|
506
|
+
const textureListeners = new Map();
|
|
507
|
+
const coreNodeListeners = new Map();
|
|
508
|
+
const setupCoreNodeListeners = (coreNode) => {
|
|
509
|
+
const onLoaded = () => {
|
|
510
|
+
this.updateTextNodeDimensions(div, coreNode);
|
|
511
|
+
};
|
|
512
|
+
coreNode.on('loaded', onLoaded);
|
|
513
|
+
coreNodeListeners.set(coreNode, { onLoaded });
|
|
514
|
+
};
|
|
515
|
+
// Helper function to setup texture event listeners
|
|
516
|
+
const setupTextureListeners = (texture) => {
|
|
517
|
+
// Clean up existing listeners first
|
|
518
|
+
textureListeners.forEach((listeners, oldTexture) => {
|
|
519
|
+
oldTexture.off('loaded', listeners.onLoaded);
|
|
520
|
+
oldTexture.off('failed', listeners.onFailed);
|
|
521
|
+
oldTexture.off('freed', listeners.onFreed);
|
|
522
|
+
});
|
|
523
|
+
textureListeners.clear();
|
|
524
|
+
// Setup new listeners if texture exists
|
|
525
|
+
if (texture) {
|
|
526
|
+
// Initialize metrics if not exists
|
|
527
|
+
if (!this.textureMetrics.has(texture)) {
|
|
528
|
+
this.textureMetrics.set(texture, {
|
|
529
|
+
previousState: texture.state,
|
|
530
|
+
loadedCount: 0,
|
|
531
|
+
failedCount: 0,
|
|
532
|
+
freedCount: 0,
|
|
533
|
+
});
|
|
534
|
+
}
|
|
535
|
+
const onLoaded = () => {
|
|
536
|
+
const metrics = this.textureMetrics.get(texture);
|
|
537
|
+
if (metrics) {
|
|
538
|
+
metrics.previousState =
|
|
539
|
+
metrics.previousState !== texture.state
|
|
540
|
+
? metrics.previousState
|
|
541
|
+
: 'loading';
|
|
542
|
+
metrics.loadedCount++;
|
|
543
|
+
}
|
|
544
|
+
this.updateTextureAttributes(div, texture);
|
|
545
|
+
};
|
|
546
|
+
const onFailed = () => {
|
|
547
|
+
const metrics = this.textureMetrics.get(texture);
|
|
548
|
+
if (metrics) {
|
|
549
|
+
metrics.previousState =
|
|
550
|
+
metrics.previousState !== texture.state
|
|
551
|
+
? metrics.previousState
|
|
552
|
+
: 'loading';
|
|
553
|
+
metrics.failedCount++;
|
|
554
|
+
}
|
|
555
|
+
this.updateTextureAttributes(div, texture);
|
|
556
|
+
};
|
|
557
|
+
const onFreed = () => {
|
|
558
|
+
const metrics = this.textureMetrics.get(texture);
|
|
559
|
+
if (metrics) {
|
|
560
|
+
metrics.previousState =
|
|
561
|
+
metrics.previousState !== texture.state
|
|
562
|
+
? metrics.previousState
|
|
563
|
+
: texture.state;
|
|
564
|
+
metrics.freedCount++;
|
|
565
|
+
}
|
|
566
|
+
this.updateTextureAttributes(div, texture);
|
|
567
|
+
};
|
|
568
|
+
texture.on('loaded', onLoaded);
|
|
569
|
+
texture.on('failed', onFailed);
|
|
570
|
+
texture.on('freed', onFreed);
|
|
571
|
+
textureListeners.set(texture, { onLoaded, onFailed, onFreed });
|
|
572
|
+
}
|
|
573
|
+
};
|
|
492
574
|
// Define traps for each property in knownProperties
|
|
493
575
|
knownProperties.forEach((property) => {
|
|
494
576
|
let originalProp = Object.getOwnPropertyDescriptor(node, property);
|
|
@@ -500,6 +582,9 @@ export class Inspector {
|
|
|
500
582
|
if (originalProp === undefined) {
|
|
501
583
|
return;
|
|
502
584
|
}
|
|
585
|
+
if (property === 'text') {
|
|
586
|
+
setupCoreNodeListeners(node);
|
|
587
|
+
}
|
|
503
588
|
Object.defineProperty(node, property, {
|
|
504
589
|
get() {
|
|
505
590
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
|
|
@@ -510,6 +595,13 @@ export class Inspector {
|
|
|
510
595
|
this.trackSetterCall(node.id, property);
|
|
511
596
|
originalProp?.set?.call(node, value);
|
|
512
597
|
this.updateNodeProperty(div, property, value, node.props);
|
|
598
|
+
// Setup texture event listeners if this is a texture property
|
|
599
|
+
if (property === 'texture') {
|
|
600
|
+
const textureValue = value && typeof value === 'object' && 'state' in value
|
|
601
|
+
? value
|
|
602
|
+
: null;
|
|
603
|
+
setupTextureListeners(textureValue);
|
|
604
|
+
}
|
|
513
605
|
},
|
|
514
606
|
configurable: true,
|
|
515
607
|
enumerable: true,
|
|
@@ -518,6 +610,19 @@ export class Inspector {
|
|
|
518
610
|
const originalDestroy = node.destroy;
|
|
519
611
|
Object.defineProperty(node, 'destroy', {
|
|
520
612
|
value: () => {
|
|
613
|
+
// Clean up texture event listeners and metrics
|
|
614
|
+
textureListeners.forEach((listeners, texture) => {
|
|
615
|
+
texture.off('loaded', listeners.onLoaded);
|
|
616
|
+
texture.off('failed', listeners.onFailed);
|
|
617
|
+
texture.off('freed', listeners.onFreed);
|
|
618
|
+
// Clean up metrics for this texture
|
|
619
|
+
this.textureMetrics.delete(texture);
|
|
620
|
+
});
|
|
621
|
+
textureListeners.clear();
|
|
622
|
+
coreNodeListeners.forEach((listeners, coreNode) => {
|
|
623
|
+
coreNode.off('loaded', listeners.onLoaded);
|
|
624
|
+
});
|
|
625
|
+
coreNodeListeners.clear();
|
|
521
626
|
this.destroyNode(node.id);
|
|
522
627
|
originalDestroy.call(node);
|
|
523
628
|
},
|
|
@@ -534,6 +639,64 @@ export class Inspector {
|
|
|
534
639
|
});
|
|
535
640
|
return node;
|
|
536
641
|
}
|
|
642
|
+
updateTextNodeDimensions(div, node) {
|
|
643
|
+
const textMetrics = node.renderInfo;
|
|
644
|
+
if (textMetrics) {
|
|
645
|
+
div.style.width = `${textMetrics.width}px`;
|
|
646
|
+
div.style.height = `${textMetrics.height}px`;
|
|
647
|
+
}
|
|
648
|
+
else {
|
|
649
|
+
div.style.removeProperty('width');
|
|
650
|
+
div.style.removeProperty('height');
|
|
651
|
+
}
|
|
652
|
+
}
|
|
653
|
+
updateTextureAttributes(div, texture) {
|
|
654
|
+
// Update texture state
|
|
655
|
+
div.setAttribute('data-texture-state', texture.state);
|
|
656
|
+
// Update texture type
|
|
657
|
+
div.setAttribute('data-texture-type', textureTypeNames[texture.type] || 'unknown');
|
|
658
|
+
// Update texture dimensions if available
|
|
659
|
+
if (texture.dimensions) {
|
|
660
|
+
div.setAttribute('data-texture-width', String(texture.dimensions.w));
|
|
661
|
+
div.setAttribute('data-texture-height', String(texture.dimensions.h));
|
|
662
|
+
}
|
|
663
|
+
else {
|
|
664
|
+
div.removeAttribute('data-texture-width');
|
|
665
|
+
div.removeAttribute('data-texture-height');
|
|
666
|
+
}
|
|
667
|
+
// Update renderable owners count
|
|
668
|
+
div.setAttribute('data-texture-owners', String(texture.renderableOwners.length));
|
|
669
|
+
// Update retry count
|
|
670
|
+
div.setAttribute('data-texture-retry-count', String(texture.retryCount));
|
|
671
|
+
// Update max retry count if available
|
|
672
|
+
if (texture.maxRetryCount !== null) {
|
|
673
|
+
div.setAttribute('data-texture-max-retry-count', String(texture.maxRetryCount));
|
|
674
|
+
}
|
|
675
|
+
else {
|
|
676
|
+
div.removeAttribute('data-texture-max-retry-count');
|
|
677
|
+
}
|
|
678
|
+
// Update metrics if available
|
|
679
|
+
const metrics = this.textureMetrics.get(texture);
|
|
680
|
+
if (metrics) {
|
|
681
|
+
div.setAttribute('data-texture-previous-state', metrics.previousState);
|
|
682
|
+
div.setAttribute('data-texture-loaded-count', String(metrics.loadedCount));
|
|
683
|
+
div.setAttribute('data-texture-failed-count', String(metrics.failedCount));
|
|
684
|
+
div.setAttribute('data-texture-freed-count', String(metrics.freedCount));
|
|
685
|
+
}
|
|
686
|
+
else {
|
|
687
|
+
div.removeAttribute('data-texture-previous-state');
|
|
688
|
+
div.removeAttribute('data-texture-loaded-count');
|
|
689
|
+
div.removeAttribute('data-texture-failed-count');
|
|
690
|
+
div.removeAttribute('data-texture-freed-count');
|
|
691
|
+
}
|
|
692
|
+
// Update error information if present
|
|
693
|
+
if (texture.error) {
|
|
694
|
+
div.setAttribute('data-texture-error', texture.error.code || texture.error.message);
|
|
695
|
+
}
|
|
696
|
+
else {
|
|
697
|
+
div.removeAttribute('data-texture-error');
|
|
698
|
+
}
|
|
699
|
+
}
|
|
537
700
|
destroy() {
|
|
538
701
|
// Stop animation stats timer
|
|
539
702
|
this.stopAnimationStatsTimer();
|