@lightningjs/renderer 3.0.0-beta15 → 3.0.0-beta17
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/common/CommonTypes.d.ts +11 -0
- package/dist/src/core/CoreNode.js +8 -0
- package/dist/src/core/CoreNode.js.map +1 -1
- package/dist/src/core/CoreTextNode.d.ts +14 -0
- package/dist/src/core/CoreTextNode.js +90 -5
- package/dist/src/core/CoreTextNode.js.map +1 -1
- package/dist/src/core/Stage.js +2 -1
- package/dist/src/core/Stage.js.map +1 -1
- package/dist/src/core/animations/Animation.d.ts +16 -0
- package/dist/src/core/animations/Animation.js +111 -0
- package/dist/src/core/animations/Animation.js.map +1 -0
- package/dist/src/core/animations/CoreAnimation.d.ts +0 -1
- package/dist/src/core/animations/CoreAnimation.js +0 -1
- package/dist/src/core/animations/CoreAnimation.js.map +1 -1
- package/dist/src/core/animations/CoreTransition.d.ts +24 -0
- package/dist/src/core/animations/CoreTransition.js +63 -0
- package/dist/src/core/animations/CoreTransition.js.map +1 -0
- package/dist/src/core/animations/Playback.d.ts +62 -0
- package/dist/src/core/animations/Playback.js +155 -0
- package/dist/src/core/animations/Playback.js.map +1 -0
- package/dist/src/core/animations/Transition.d.ts +25 -0
- package/dist/src/core/animations/Transition.js +63 -0
- package/dist/src/core/animations/Transition.js.map +1 -0
- package/dist/src/core/animations/utils.d.ts +2 -0
- package/dist/src/core/animations/utils.js +137 -0
- package/dist/src/core/animations/utils.js.map +1 -0
- package/dist/src/core/lib/collectionUtils.d.ts +5 -0
- package/dist/src/core/lib/collectionUtils.js +100 -0
- package/dist/src/core/lib/collectionUtils.js.map +1 -0
- package/dist/src/core/platforms/Platform.d.ts +5 -0
- package/dist/src/core/platforms/Platform.js.map +1 -1
- package/dist/src/core/platforms/web/WebPlatform.d.ts +1 -0
- package/dist/src/core/platforms/web/WebPlatform.js +3 -0
- package/dist/src/core/platforms/web/WebPlatform.js.map +1 -1
- package/dist/src/core/text-rendering/CanvasFontHandler.js +4 -1
- package/dist/src/core/text-rendering/CanvasFontHandler.js.map +1 -1
- package/dist/src/core/text-rendering/CanvasTextRenderer.js +7 -7
- package/dist/src/core/text-rendering/CanvasTextRenderer.js.map +1 -1
- package/dist/src/core/text-rendering/SdfFontHandler.js +3 -0
- package/dist/src/core/text-rendering/SdfFontHandler.js.map +1 -1
- package/dist/src/core/text-rendering/SdfTextRenderer.js +5 -5
- package/dist/src/core/text-rendering/SdfTextRenderer.js.map +1 -1
- package/dist/src/core/text-rendering/TextLayoutEngine.d.ts +12 -13
- package/dist/src/core/text-rendering/TextLayoutEngine.js +242 -186
- package/dist/src/core/text-rendering/TextLayoutEngine.js.map +1 -1
- package/dist/src/core/text-rendering/TextRenderer.d.ts +22 -7
- package/dist/src/core/utils.d.ts +1 -1
- package/dist/src/main-api/Inspector.js +9 -5
- package/dist/src/main-api/Inspector.js.map +1 -1
- package/dist/src/main-api/Renderer.js +3 -2
- package/dist/src/main-api/Renderer.js.map +1 -1
- package/dist/tsconfig.dist.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/common/CommonTypes.ts +16 -0
- package/src/core/CoreNode.test.ts +50 -1
- package/src/core/CoreNode.ts +11 -0
- package/src/core/CoreTextNode.ts +112 -5
- package/src/core/Stage.ts +2 -1
- package/src/core/animations/CoreAnimation.ts +0 -2
- package/src/core/platforms/Platform.ts +6 -0
- package/src/core/platforms/web/WebPlatform.ts +11 -0
- package/src/core/text-rendering/CanvasFontHandler.ts +4 -7
- package/src/core/text-rendering/CanvasTextRenderer.ts +6 -8
- package/src/core/text-rendering/SdfFontHandler.ts +3 -0
- package/src/core/text-rendering/SdfTextRenderer.ts +4 -5
- package/src/core/text-rendering/TextLayoutEngine.ts +396 -226
- package/src/core/text-rendering/TextRenderer.ts +22 -7
- package/src/core/text-rendering/tests/{SdfTests.test.ts → TextLayoutEngine.test.ts} +103 -64
- package/src/main-api/Inspector.ts +9 -5
- package/src/main-api/Renderer.ts +3 -2
- package/dist/src/core/TextureError.d.ts +0 -11
- package/dist/src/core/TextureError.js +0 -37
- package/dist/src/core/TextureError.js.map +0 -1
- package/dist/src/core/platform.d.ts +0 -10
- package/dist/src/core/platform.js +0 -81
- package/dist/src/core/platform.js.map +0 -1
- package/dist/src/core/renderers/CoreShader.d.ts +0 -9
- package/dist/src/core/renderers/CoreShader.js +0 -28
- package/dist/src/core/renderers/CoreShader.js.map +0 -1
- package/dist/src/core/renderers/canvas/CanvasCoreRenderer.d.ts +0 -33
- package/dist/src/core/renderers/canvas/CanvasCoreRenderer.js +0 -250
- package/dist/src/core/renderers/canvas/CanvasCoreRenderer.js.map +0 -1
- package/dist/src/core/renderers/canvas/CanvasCoreTexture.d.ts +0 -17
- package/dist/src/core/renderers/canvas/CanvasCoreTexture.js +0 -125
- package/dist/src/core/renderers/canvas/CanvasCoreTexture.js.map +0 -1
- package/dist/src/core/renderers/canvas/internal/C2DShaderUtils.d.ts +0 -14
- package/dist/src/core/renderers/canvas/internal/C2DShaderUtils.js +0 -138
- package/dist/src/core/renderers/canvas/internal/C2DShaderUtils.js.map +0 -1
- package/dist/src/core/renderers/canvas/internal/ColorUtils.d.ts +0 -19
- package/dist/src/core/renderers/canvas/internal/ColorUtils.js +0 -58
- package/dist/src/core/renderers/canvas/internal/ColorUtils.js.map +0 -1
- package/dist/src/core/renderers/canvas/shaders/UnsupportedShader.d.ts +0 -10
- package/dist/src/core/renderers/canvas/shaders/UnsupportedShader.js +0 -43
- package/dist/src/core/renderers/canvas/shaders/UnsupportedShader.js.map +0 -1
- package/dist/src/core/renderers/webgl/WebGlCoreCtxRenderTexture.d.ts +0 -12
- package/dist/src/core/renderers/webgl/WebGlCoreCtxRenderTexture.js +0 -58
- package/dist/src/core/renderers/webgl/WebGlCoreCtxRenderTexture.js.map +0 -1
- package/dist/src/core/renderers/webgl/WebGlCoreCtxSubTexture.d.ts +0 -9
- package/dist/src/core/renderers/webgl/WebGlCoreCtxSubTexture.js +0 -38
- package/dist/src/core/renderers/webgl/WebGlCoreCtxSubTexture.js.map +0 -1
- package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.d.ts +0 -65
- package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.js +0 -269
- package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.js.map +0 -1
- package/dist/src/core/renderers/webgl/WebGlCoreRenderOp.d.ts +0 -34
- package/dist/src/core/renderers/webgl/WebGlCoreRenderOp.js +0 -114
- package/dist/src/core/renderers/webgl/WebGlCoreRenderOp.js.map +0 -1
- package/dist/src/core/renderers/webgl/WebGlCoreRenderer.d.ts +0 -133
- package/dist/src/core/renderers/webgl/WebGlCoreRenderer.js +0 -616
- package/dist/src/core/renderers/webgl/WebGlCoreRenderer.js.map +0 -1
- package/dist/src/core/renderers/webgl/WebGlCoreShader.d.ts +0 -83
- package/dist/src/core/renderers/webgl/WebGlCoreShader.js +0 -233
- package/dist/src/core/renderers/webgl/WebGlCoreShader.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/DefaultShader.d.ts +0 -9
- package/dist/src/core/renderers/webgl/shaders/DefaultShader.js +0 -87
- package/dist/src/core/renderers/webgl/shaders/DefaultShader.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/DefaultShaderBatched.d.ts +0 -10
- package/dist/src/core/renderers/webgl/shaders/DefaultShaderBatched.js +0 -119
- package/dist/src/core/renderers/webgl/shaders/DefaultShaderBatched.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/DynamicShader.d.ts +0 -29
- package/dist/src/core/renderers/webgl/shaders/DynamicShader.js +0 -413
- package/dist/src/core/renderers/webgl/shaders/DynamicShader.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/RoundedRectangle.d.ts +0 -28
- package/dist/src/core/renderers/webgl/shaders/RoundedRectangle.js +0 -131
- package/dist/src/core/renderers/webgl/shaders/RoundedRectangle.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/SdfShader.d.ts +0 -47
- package/dist/src/core/renderers/webgl/shaders/SdfShader.js +0 -160
- package/dist/src/core/renderers/webgl/shaders/SdfShader.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/BorderBottomEffect.d.ts +0 -31
- package/dist/src/core/renderers/webgl/shaders/effects/BorderBottomEffect.js +0 -71
- package/dist/src/core/renderers/webgl/shaders/effects/BorderBottomEffect.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/BorderEffect.d.ts +0 -30
- package/dist/src/core/renderers/webgl/shaders/effects/BorderEffect.js +0 -58
- package/dist/src/core/renderers/webgl/shaders/effects/BorderEffect.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/BorderLeftEffect.d.ts +0 -31
- package/dist/src/core/renderers/webgl/shaders/effects/BorderLeftEffect.js +0 -71
- package/dist/src/core/renderers/webgl/shaders/effects/BorderLeftEffect.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/BorderRightEffect.d.ts +0 -31
- package/dist/src/core/renderers/webgl/shaders/effects/BorderRightEffect.js +0 -71
- package/dist/src/core/renderers/webgl/shaders/effects/BorderRightEffect.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/BorderTopEffect.d.ts +0 -31
- package/dist/src/core/renderers/webgl/shaders/effects/BorderTopEffect.js +0 -71
- package/dist/src/core/renderers/webgl/shaders/effects/BorderTopEffect.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/EffectUtils.d.ts +0 -9
- package/dist/src/core/renderers/webgl/shaders/effects/EffectUtils.js +0 -136
- package/dist/src/core/renderers/webgl/shaders/effects/EffectUtils.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/FadeOutEffect.d.ts +0 -36
- package/dist/src/core/renderers/webgl/shaders/effects/FadeOutEffect.js +0 -85
- package/dist/src/core/renderers/webgl/shaders/effects/FadeOutEffect.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/GlitchEffect.d.ts +0 -45
- package/dist/src/core/renderers/webgl/shaders/effects/GlitchEffect.js +0 -104
- package/dist/src/core/renderers/webgl/shaders/effects/GlitchEffect.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/GrayscaleEffect.d.ts +0 -22
- package/dist/src/core/renderers/webgl/shaders/effects/GrayscaleEffect.js +0 -45
- package/dist/src/core/renderers/webgl/shaders/effects/GrayscaleEffect.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/HolePunchEffect.d.ts +0 -58
- package/dist/src/core/renderers/webgl/shaders/effects/HolePunchEffect.js +0 -80
- package/dist/src/core/renderers/webgl/shaders/effects/HolePunchEffect.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.d.ts +0 -35
- package/dist/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.js +0 -129
- package/dist/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/RadialGradientEffect.d.ts +0 -39
- package/dist/src/core/renderers/webgl/shaders/effects/RadialGradientEffect.js +0 -116
- package/dist/src/core/renderers/webgl/shaders/effects/RadialGradientEffect.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/RadialProgressEffect.d.ts +0 -61
- package/dist/src/core/renderers/webgl/shaders/effects/RadialProgressEffect.js +0 -127
- package/dist/src/core/renderers/webgl/shaders/effects/RadialProgressEffect.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/RadiusEffect.d.ts +0 -40
- package/dist/src/core/renderers/webgl/shaders/effects/RadiusEffect.js +0 -71
- package/dist/src/core/renderers/webgl/shaders/effects/RadiusEffect.js.map +0 -1
- package/dist/src/core/renderers/webgl/shaders/effects/ShaderEffect.d.ts +0 -115
- package/dist/src/core/renderers/webgl/shaders/effects/ShaderEffect.js +0 -61
- package/dist/src/core/renderers/webgl/shaders/effects/ShaderEffect.js.map +0 -1
- package/dist/src/core/text-rendering/TextRenderingUtils.d.ts +0 -12
- package/dist/src/core/text-rendering/TextRenderingUtils.js +0 -14
- package/dist/src/core/text-rendering/TextRenderingUtils.js.map +0 -1
- package/dist/src/core/text-rendering/TextTextureRendererUtils.d.ts +0 -72
- package/dist/src/core/text-rendering/TextTextureRendererUtils.js +0 -217
- package/dist/src/core/text-rendering/TextTextureRendererUtils.js.map +0 -1
- package/dist/src/core/text-rendering/TrFontManager.d.ts +0 -26
- package/dist/src/core/text-rendering/TrFontManager.js +0 -131
- package/dist/src/core/text-rendering/TrFontManager.js.map +0 -1
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.d.ts +0 -39
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.js +0 -125
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.js.map +0 -1
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/FontShaper.d.ts +0 -103
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/FontShaper.js +0 -21
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/FontShaper.js.map +0 -1
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.d.ts +0 -62
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.js +0 -88
- package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.js.map +0 -1
- package/dist/src/core/text-rendering/font-face-types/TrFontFace.d.ts +0 -118
- package/dist/src/core/text-rendering/font-face-types/TrFontFace.js +0 -63
- package/dist/src/core/text-rendering/font-face-types/TrFontFace.js.map +0 -1
- package/dist/src/core/text-rendering/font-face-types/WebTrFontFace.d.ts +0 -14
- package/dist/src/core/text-rendering/font-face-types/WebTrFontFace.js +0 -66
- package/dist/src/core/text-rendering/font-face-types/WebTrFontFace.js.map +0 -1
- package/dist/src/core/text-rendering/font-face-types/utils.d.ts +0 -1
- package/dist/src/core/text-rendering/font-face-types/utils.js +0 -38
- package/dist/src/core/text-rendering/font-face-types/utils.js.map +0 -1
- package/dist/src/core/text-rendering/renderers/CanvasTextRenderer.d.ts +0 -59
- package/dist/src/core/text-rendering/renderers/CanvasTextRenderer.js +0 -397
- package/dist/src/core/text-rendering/renderers/CanvasTextRenderer.js.map +0 -1
- package/dist/src/core/text-rendering/renderers/LightningTextTextureRenderer.d.ts +0 -120
- package/dist/src/core/text-rendering/renderers/LightningTextTextureRenderer.js +0 -551
- package/dist/src/core/text-rendering/renderers/LightningTextTextureRenderer.js.map +0 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/SdfTextRenderer.d.ts +0 -92
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/SdfTextRenderer.js +0 -607
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/SdfTextRenderer.js.map +0 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/PeekableGenerator.d.ts +0 -12
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/PeekableGenerator.js +0 -61
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/PeekableGenerator.js.map +0 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/SpecialCodepoints.d.ts +0 -33
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/SpecialCodepoints.js +0 -52
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/SpecialCodepoints.js.map +0 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/constants.d.ts +0 -13
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/constants.js +0 -32
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/constants.js.map +0 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/getStartConditions.d.ts +0 -23
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/getStartConditions.js +0 -84
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/getStartConditions.js.map +0 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/getUnicodeCodepoints.d.ts +0 -4
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/getUnicodeCodepoints.js +0 -34
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/getUnicodeCodepoints.js.map +0 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/layoutText.d.ts +0 -20
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/layoutText.js +0 -308
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/layoutText.js.map +0 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/measureText.d.ts +0 -10
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/measureText.js +0 -40
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/measureText.js.map +0 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/setRenderWindow.d.ts +0 -26
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/setRenderWindow.js +0 -70
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/setRenderWindow.js.map +0 -1
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/util.d.ts +0 -16
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/util.js +0 -39
- package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/util.js.map +0 -1
- package/dist/src/core/text-rendering/renderers/TextRenderer.d.ts +0 -373
- package/dist/src/core/text-rendering/renderers/TextRenderer.js +0 -178
- package/dist/src/core/text-rendering/renderers/TextRenderer.js.map +0 -1
- package/dist/src/main-api/DynamicShaderController.d.ts +0 -29
- package/dist/src/main-api/DynamicShaderController.js +0 -58
- package/dist/src/main-api/DynamicShaderController.js.map +0 -1
- package/dist/src/main-api/ShaderController.d.ts +0 -31
- package/dist/src/main-api/ShaderController.js +0 -37
- package/dist/src/main-api/ShaderController.js.map +0 -1
- package/src/core/text-rendering/tests/Canvas.test.ts +0 -378
|
@@ -1,131 +0,0 @@
|
|
|
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 2023 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
|
-
const weightConversions = {
|
|
20
|
-
normal: 400,
|
|
21
|
-
bold: 700,
|
|
22
|
-
bolder: 900,
|
|
23
|
-
lighter: 100,
|
|
24
|
-
};
|
|
25
|
-
const fontWeightToNumber = (weight) => {
|
|
26
|
-
if (typeof weight === 'number') {
|
|
27
|
-
return weight;
|
|
28
|
-
}
|
|
29
|
-
return weightConversions[weight] || 400;
|
|
30
|
-
};
|
|
31
|
-
function resolveFontToUse(familyMapsByPriority, family, weightIn, style, stretch) {
|
|
32
|
-
let weight = fontWeightToNumber(weightIn);
|
|
33
|
-
for (const fontFamiles of familyMapsByPriority) {
|
|
34
|
-
const fontFaces = fontFamiles[family];
|
|
35
|
-
if (!fontFaces) {
|
|
36
|
-
continue;
|
|
37
|
-
}
|
|
38
|
-
if (fontFaces.size === 1) {
|
|
39
|
-
// No Exact match found, find nearest weight match
|
|
40
|
-
console.warn(`TrFontManager: Only one font face found for family: '${family}' - will be used for all weights and styles`);
|
|
41
|
-
return fontFaces.values().next().value;
|
|
42
|
-
}
|
|
43
|
-
const weightMap = new Map();
|
|
44
|
-
for (const fontFace of fontFaces) {
|
|
45
|
-
const fontFamilyWeight = fontWeightToNumber(fontFace.descriptors.weight);
|
|
46
|
-
if (fontFamilyWeight === weight &&
|
|
47
|
-
fontFace.descriptors.style === style &&
|
|
48
|
-
fontFace.descriptors.stretch === stretch) {
|
|
49
|
-
return fontFace;
|
|
50
|
-
}
|
|
51
|
-
weightMap.set(fontFamilyWeight, fontFace);
|
|
52
|
-
}
|
|
53
|
-
// No Exact match found, find nearest weight match
|
|
54
|
-
const msg = `TrFontManager: No exact match: '${family} Weight: ${weight} Style: ${style} Stretch: ${stretch}'`;
|
|
55
|
-
console.error(msg);
|
|
56
|
-
// Follow the CSS font-weight algorithm to find the nearest weight match
|
|
57
|
-
// https://www.w3.org/TR/2018/REC-css-fonts-3-20180920/#font-matching-algorithm
|
|
58
|
-
if (weight === 400 && weightMap.has(500)) {
|
|
59
|
-
return weightMap.get(500);
|
|
60
|
-
}
|
|
61
|
-
if (weight === 500 && weightMap.has(400)) {
|
|
62
|
-
return weightMap.get(400);
|
|
63
|
-
}
|
|
64
|
-
if (weight < 400) {
|
|
65
|
-
while (weight > 0) {
|
|
66
|
-
if (weightMap.has(weight)) {
|
|
67
|
-
return weightMap.get(weight);
|
|
68
|
-
}
|
|
69
|
-
weight -= 100;
|
|
70
|
-
}
|
|
71
|
-
// reset back for the next loop
|
|
72
|
-
weight = 600;
|
|
73
|
-
}
|
|
74
|
-
while (weight < 1000) {
|
|
75
|
-
if (weightMap.has(weight)) {
|
|
76
|
-
return weightMap.get(weight);
|
|
77
|
-
}
|
|
78
|
-
weight += 100;
|
|
79
|
-
}
|
|
80
|
-
// finally check lower again
|
|
81
|
-
weight = 500;
|
|
82
|
-
while (weight > 0) {
|
|
83
|
-
if (weightMap.has(weight)) {
|
|
84
|
-
return weightMap.get(weight);
|
|
85
|
-
}
|
|
86
|
-
weight -= 100;
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
return;
|
|
90
|
-
}
|
|
91
|
-
export class TrFontManager {
|
|
92
|
-
textRenderers;
|
|
93
|
-
fontCache = new Map();
|
|
94
|
-
constructor(textRenderers) {
|
|
95
|
-
this.textRenderers = textRenderers;
|
|
96
|
-
// Intentionally left blank
|
|
97
|
-
}
|
|
98
|
-
addFontFace(font) {
|
|
99
|
-
// All the font face to all of the text renderers that support it
|
|
100
|
-
for (const trId in this.textRenderers) {
|
|
101
|
-
const tr = this.textRenderers[trId];
|
|
102
|
-
if (tr && tr.isFontFaceSupported(font)) {
|
|
103
|
-
tr.addFontFace(font);
|
|
104
|
-
}
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
/**
|
|
108
|
-
* Utility method to resolve a single font face from a list of prioritized family maps based on
|
|
109
|
-
* a set of font properties.
|
|
110
|
-
*
|
|
111
|
-
* @remarks
|
|
112
|
-
* These are to be used by a text renderer to resolve a font face if needed.
|
|
113
|
-
*
|
|
114
|
-
* @param familyMapsByPriority
|
|
115
|
-
* @param props
|
|
116
|
-
* @returns
|
|
117
|
-
*/
|
|
118
|
-
resolveFontFace(familyMapsByPriority, props, rendererType) {
|
|
119
|
-
const { fontFamily, fontWeight, fontStyle, fontStretch } = props;
|
|
120
|
-
const fontCacheString = `${rendererType}_${fontFamily}_${fontStyle}_${fontWeight}_${fontStretch}`;
|
|
121
|
-
if (this.fontCache.has(fontCacheString) === true) {
|
|
122
|
-
return this.fontCache.get(fontCacheString);
|
|
123
|
-
}
|
|
124
|
-
const resolvedFont = resolveFontToUse(familyMapsByPriority, fontFamily, fontWeight, fontStyle, fontStretch);
|
|
125
|
-
if (resolvedFont !== undefined) {
|
|
126
|
-
this.fontCache.set(fontCacheString, resolvedFont);
|
|
127
|
-
}
|
|
128
|
-
return resolvedFont;
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
//# sourceMappingURL=TrFontManager.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"TrFontManager.js","sourceRoot":"","sources":["../../../../src/core/text-rendering/TrFontManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
import type { Stage } from '../../../Stage.js';
|
|
2
|
-
import { ImageTexture } from '../../../textures/ImageTexture.js';
|
|
3
|
-
import { TrFontFace, type TrFontFaceOptions } from '../TrFontFace.js';
|
|
4
|
-
import type { FontShaper } from './internal/FontShaper.js';
|
|
5
|
-
import { type SdfFontData } from './internal/SdfFontShaper.js';
|
|
6
|
-
type SdfFontType = 'ssdf' | 'msdf';
|
|
7
|
-
declare module '../TrFontFace.js' {
|
|
8
|
-
interface TrFontFaceMap {
|
|
9
|
-
ssdf: SdfTrFontFace<'ssdf'>;
|
|
10
|
-
msdf: SdfTrFontFace<'msdf'>;
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
|
-
interface GlyphAtlasEntry {
|
|
14
|
-
x: number;
|
|
15
|
-
y: number;
|
|
16
|
-
width: number;
|
|
17
|
-
height: number;
|
|
18
|
-
}
|
|
19
|
-
export interface SdfTrFontFaceOptions extends TrFontFaceOptions {
|
|
20
|
-
atlasUrl: string;
|
|
21
|
-
atlasDataUrl: string;
|
|
22
|
-
stage: Stage;
|
|
23
|
-
}
|
|
24
|
-
export declare class SdfTrFontFace<FontTypeT extends SdfFontType = SdfFontType> extends TrFontFace {
|
|
25
|
-
readonly type: FontTypeT;
|
|
26
|
-
readonly texture: ImageTexture;
|
|
27
|
-
/**
|
|
28
|
-
* Height of the tallest character in the font including the whitespace above it
|
|
29
|
-
* in SDF/vertex units.
|
|
30
|
-
*/
|
|
31
|
-
readonly maxCharHeight: number;
|
|
32
|
-
readonly shaper: FontShaper | undefined;
|
|
33
|
-
readonly glyphMap: Map<number, SdfFontData['chars'][0]>;
|
|
34
|
-
data: SdfFontData | undefined;
|
|
35
|
-
constructor(type: FontTypeT, options: SdfTrFontFaceOptions);
|
|
36
|
-
getAtlasEntry(glyphId: number): GlyphAtlasEntry;
|
|
37
|
-
private checkLoaded;
|
|
38
|
-
}
|
|
39
|
-
export {};
|
|
@@ -1,125 +0,0 @@
|
|
|
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 2023 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 type { Renderer } from '../../../Renderer';
|
|
20
|
-
import { assertTruthy } from '../../../../utils.js';
|
|
21
|
-
import { WebGlCoreRenderer } from '../../../renderers/webgl/WebGlCoreRenderer.js';
|
|
22
|
-
import { ImageTexture } from '../../../textures/ImageTexture.js';
|
|
23
|
-
import { TrFontFace, } from '../TrFontFace.js';
|
|
24
|
-
import { fetchJson } from '../utils.js';
|
|
25
|
-
import { SdfFontShaper } from './internal/SdfFontShaper.js';
|
|
26
|
-
export class SdfTrFontFace extends TrFontFace {
|
|
27
|
-
type;
|
|
28
|
-
texture;
|
|
29
|
-
/**
|
|
30
|
-
* Height of the tallest character in the font including the whitespace above it
|
|
31
|
-
* in SDF/vertex units.
|
|
32
|
-
*/
|
|
33
|
-
maxCharHeight = 0;
|
|
34
|
-
shaper;
|
|
35
|
-
glyphMap = new Map();
|
|
36
|
-
data;
|
|
37
|
-
constructor(type, options) {
|
|
38
|
-
super(options);
|
|
39
|
-
const { atlasUrl, atlasDataUrl, stage } = options;
|
|
40
|
-
this.type = type;
|
|
41
|
-
const renderer = stage.renderer;
|
|
42
|
-
assertTruthy(renderer instanceof WebGlCoreRenderer, 'SDF Font Faces can only be used with the WebGL Renderer');
|
|
43
|
-
// Load image
|
|
44
|
-
this.texture = stage.txManager.createTexture('ImageTexture', {
|
|
45
|
-
src: atlasUrl,
|
|
46
|
-
// IMPORTANT: The SDF shader requires the alpha channel to NOT be
|
|
47
|
-
// premultiplied on the atlas texture. If it is premultiplied, the
|
|
48
|
-
// rendering of SDF glyphs (especially single-channel SDF fonts) will
|
|
49
|
-
// be very jagged.
|
|
50
|
-
premultiplyAlpha: false,
|
|
51
|
-
});
|
|
52
|
-
// Load the texture
|
|
53
|
-
stage.txManager.loadTexture(this.texture, true);
|
|
54
|
-
// FIXME This is a stop-gap solution to avoid Font Face textures to be cleaned up
|
|
55
|
-
// Ideally we do want to clean up the textures if they're not being used to save as much memory as possible
|
|
56
|
-
// However, we need to make sure that the font face is reloaded if the texture is cleaned up and needed again
|
|
57
|
-
// and make sure the SdfFontRenderer is properly guarded against textures being reloaded
|
|
58
|
-
// for now this will do the trick and the increase on memory is not that big
|
|
59
|
-
this.texture.preventCleanup = true;
|
|
60
|
-
this.texture.on('loaded', () => {
|
|
61
|
-
this.checkLoaded();
|
|
62
|
-
// Make sure we mark the stage for a re-render (in case the font's texture was freed and reloaded)
|
|
63
|
-
stage.requestRender();
|
|
64
|
-
});
|
|
65
|
-
// Set this.data to the fetched data from dataUrl
|
|
66
|
-
fetchJson(atlasDataUrl)
|
|
67
|
-
.then((response) => {
|
|
68
|
-
this.data = JSON.parse(response);
|
|
69
|
-
assertTruthy(this.data);
|
|
70
|
-
// Add all the glyphs to the glyph map
|
|
71
|
-
let maxCharHeight = 0;
|
|
72
|
-
this.data.chars.forEach((glyph) => {
|
|
73
|
-
this.glyphMap.set(glyph.id, glyph);
|
|
74
|
-
const charHeight = glyph.yoffset + glyph.height;
|
|
75
|
-
if (charHeight > maxCharHeight) {
|
|
76
|
-
maxCharHeight = charHeight;
|
|
77
|
-
}
|
|
78
|
-
});
|
|
79
|
-
this.maxCharHeight = maxCharHeight;
|
|
80
|
-
// We know `data` is defined here, because we just set it
|
|
81
|
-
this.shaper = new SdfFontShaper(this.data, this.glyphMap);
|
|
82
|
-
// If the metrics aren't provided explicitly in the font face options,
|
|
83
|
-
// Gather them from the metrics added by the msdf-generator tool ()
|
|
84
|
-
// If they are missing then we throw an error.
|
|
85
|
-
if (!this.metrics) {
|
|
86
|
-
if (this.data?.lightningMetrics) {
|
|
87
|
-
const { ascender, descender, lineGap, unitsPerEm } = this.data.lightningMetrics;
|
|
88
|
-
this.metrics = {
|
|
89
|
-
ascender: ascender / unitsPerEm,
|
|
90
|
-
descender: descender / unitsPerEm,
|
|
91
|
-
lineGap: lineGap / unitsPerEm,
|
|
92
|
-
};
|
|
93
|
-
}
|
|
94
|
-
else {
|
|
95
|
-
throw new Error(`Font metrics not found in ${this.type} font ${this.fontFamily}. ` +
|
|
96
|
-
'Make sure you are using the latest version of the Lightning ' +
|
|
97
|
-
'3 `msdf-generator` tool to generate your SDF fonts.');
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
this.checkLoaded();
|
|
101
|
-
})
|
|
102
|
-
.catch(console.error);
|
|
103
|
-
}
|
|
104
|
-
getAtlasEntry(glyphId) {
|
|
105
|
-
const glyph = this.glyphMap.get(glyphId);
|
|
106
|
-
if (glyph === undefined) {
|
|
107
|
-
throw new Error(`Glyph ${glyphId} not found in font ${this.fontFamily}`);
|
|
108
|
-
}
|
|
109
|
-
return {
|
|
110
|
-
x: glyph.x,
|
|
111
|
-
y: glyph.y,
|
|
112
|
-
width: glyph.width,
|
|
113
|
-
height: glyph.height,
|
|
114
|
-
};
|
|
115
|
-
}
|
|
116
|
-
checkLoaded() {
|
|
117
|
-
if (this.loaded)
|
|
118
|
-
return;
|
|
119
|
-
if (this.texture.state === 'loaded' && this.data) {
|
|
120
|
-
this.loaded = true;
|
|
121
|
-
this.emit('loaded');
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
//# sourceMappingURL=SdfTrFontFace.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"SdfTrFontFace.js","sourceRoot":"","sources":["../../../../../../src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,103 +0,0 @@
|
|
|
1
|
-
import type { PeekableIterator } from '../../../renderers/SdfTextRenderer/internal/PeekableGenerator.js';
|
|
2
|
-
/**
|
|
3
|
-
* HarfBuzz compatible glyph position info
|
|
4
|
-
*/
|
|
5
|
-
export interface GlyphPosition {
|
|
6
|
-
/**
|
|
7
|
-
* how much the line advances after drawing this glyph when setting text in horizontal direction.
|
|
8
|
-
*/
|
|
9
|
-
xAdvance: number;
|
|
10
|
-
/**
|
|
11
|
-
* how much the line advances after drawing this glyph when setting text in vertical direction.
|
|
12
|
-
*/
|
|
13
|
-
yAdvance: number;
|
|
14
|
-
/**
|
|
15
|
-
* how much the glyph moves on the X-axis before drawing it, this should not affect how much the line advances.
|
|
16
|
-
*/
|
|
17
|
-
xOffset: number;
|
|
18
|
-
/**
|
|
19
|
-
* how much the glyph moves on the Y-axis before drawing it, this should not affect how much the line advances.
|
|
20
|
-
*/
|
|
21
|
-
yOffset: number;
|
|
22
|
-
}
|
|
23
|
-
/**
|
|
24
|
-
* HarfBuzz compatible glyph info
|
|
25
|
-
*/
|
|
26
|
-
export interface GlyphInfo {
|
|
27
|
-
/**
|
|
28
|
-
* Glyph ID
|
|
29
|
-
*/
|
|
30
|
-
glyphId: number;
|
|
31
|
-
/**
|
|
32
|
-
* First codepoint in the cluster this glyph was mapped from.
|
|
33
|
-
*/
|
|
34
|
-
codepoint: number;
|
|
35
|
-
/**
|
|
36
|
-
* the index of the character in the original text that corresponds to this hb_glyph_info_t
|
|
37
|
-
* This is useful for mapping back from glyphs to characters.
|
|
38
|
-
*/
|
|
39
|
-
cluster: number;
|
|
40
|
-
}
|
|
41
|
-
/**
|
|
42
|
-
* HarfBuzz compatible glyph extents
|
|
43
|
-
*/
|
|
44
|
-
export interface GlyphExtents {
|
|
45
|
-
/**
|
|
46
|
-
* The X offset from the origin to the leftmost part of the glyph.
|
|
47
|
-
* This is negative for right-to-left scripts.
|
|
48
|
-
*/
|
|
49
|
-
xBearing: number;
|
|
50
|
-
/**
|
|
51
|
-
* The Y offset from the origin to the topmost part of the glyph.
|
|
52
|
-
* This is negative for bottom-to-top scripts.
|
|
53
|
-
*/
|
|
54
|
-
yBearing: number;
|
|
55
|
-
/**
|
|
56
|
-
* Distance from the top extremum of the glyph to the bottom extremum.
|
|
57
|
-
* This is always positive.
|
|
58
|
-
*/
|
|
59
|
-
width: number;
|
|
60
|
-
/**
|
|
61
|
-
* Distance from the left extremum of the glyph to the right extremum.
|
|
62
|
-
* This is always positive.
|
|
63
|
-
*/
|
|
64
|
-
height: number;
|
|
65
|
-
}
|
|
66
|
-
export interface UnmappedCharacterInfo {
|
|
67
|
-
mapped: false;
|
|
68
|
-
/**
|
|
69
|
-
* The Unicode code point of the character.
|
|
70
|
-
*/
|
|
71
|
-
codepoint: number;
|
|
72
|
-
/**
|
|
73
|
-
* The index of the character in the original text that corresponds to this hb_glyph_info_t
|
|
74
|
-
* This is useful for mapping back from glyphs to characters.
|
|
75
|
-
*/
|
|
76
|
-
cluster: number;
|
|
77
|
-
}
|
|
78
|
-
export type MappedGlyphInfo = {
|
|
79
|
-
mapped: true;
|
|
80
|
-
} & GlyphInfo & GlyphPosition & GlyphExtents;
|
|
81
|
-
/**
|
|
82
|
-
* For performance reasons, all properties are required to reduce need for checking for undefined values.
|
|
83
|
-
*/
|
|
84
|
-
export interface FontShaperProps {
|
|
85
|
-
/**
|
|
86
|
-
* Letter spacing
|
|
87
|
-
*
|
|
88
|
-
* @default 0
|
|
89
|
-
* @see https://developer.mozilla.org/en-US/docs/Web/CSS/letter-spacing
|
|
90
|
-
**/
|
|
91
|
-
letterSpacing: number;
|
|
92
|
-
}
|
|
93
|
-
export declare abstract class FontShaper {
|
|
94
|
-
/**
|
|
95
|
-
* Returns the glyph IDs of the next
|
|
96
|
-
*
|
|
97
|
-
* @remarks
|
|
98
|
-
* If this returns undefined, a glyph for the next codepoint(s) could not be found.
|
|
99
|
-
*
|
|
100
|
-
* @param codepoints
|
|
101
|
-
*/
|
|
102
|
-
abstract shapeText(props: FontShaperProps, codepoints: PeekableIterator<number>): Generator<MappedGlyphInfo | UnmappedCharacterInfo, void>;
|
|
103
|
-
}
|
|
@@ -1,21 +0,0 @@
|
|
|
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 2023 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
|
-
export class FontShaper {
|
|
20
|
-
}
|
|
21
|
-
//# sourceMappingURL=FontShaper.js.map
|
package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/FontShaper.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"FontShaper.js","sourceRoot":"","sources":["../../../../../../../src/core/text-rendering/font-face-types/SdfTrFontFace/internal/FontShaper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AA4GH,MAAM,OAAgB,UAAU;CAa/B"}
|
package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.d.ts
DELETED
|
@@ -1,62 +0,0 @@
|
|
|
1
|
-
import type { PeekableIterator } from '../../../renderers/SdfTextRenderer/internal/PeekableGenerator.js';
|
|
2
|
-
import type { FontMetrics } from '../../TrFontFace.js';
|
|
3
|
-
import { FontShaper, type FontShaperProps, type MappedGlyphInfo, type UnmappedCharacterInfo } from './FontShaper.js';
|
|
4
|
-
export declare class SdfFontShaper extends FontShaper {
|
|
5
|
-
private readonly data;
|
|
6
|
-
private readonly glyphMap;
|
|
7
|
-
private readonly kernings;
|
|
8
|
-
constructor(data: SdfFontData, glyphMap: Map<number, SdfFontData['chars'][0]>);
|
|
9
|
-
shapeText(props: FontShaperProps, codepoints: PeekableIterator<number>): Generator<MappedGlyphInfo | UnmappedCharacterInfo, void>;
|
|
10
|
-
}
|
|
11
|
-
export interface SdfFontData {
|
|
12
|
-
pages: string[];
|
|
13
|
-
chars: Array<{
|
|
14
|
-
id: number;
|
|
15
|
-
char: string;
|
|
16
|
-
x: number;
|
|
17
|
-
y: number;
|
|
18
|
-
width: number;
|
|
19
|
-
height: number;
|
|
20
|
-
xoffset: number;
|
|
21
|
-
yoffset: number;
|
|
22
|
-
xadvance: number;
|
|
23
|
-
page: number;
|
|
24
|
-
chnl: number;
|
|
25
|
-
}>;
|
|
26
|
-
kernings: Array<{
|
|
27
|
-
first: number;
|
|
28
|
-
second: number;
|
|
29
|
-
amount: number;
|
|
30
|
-
}>;
|
|
31
|
-
info: {
|
|
32
|
-
face: string;
|
|
33
|
-
size: number;
|
|
34
|
-
bold: number;
|
|
35
|
-
italic: number;
|
|
36
|
-
charset: string[];
|
|
37
|
-
unicode: number;
|
|
38
|
-
stretchH: number;
|
|
39
|
-
smooth: number;
|
|
40
|
-
aa: number;
|
|
41
|
-
padding: [number, number, number, number];
|
|
42
|
-
spacing: [number, number];
|
|
43
|
-
outline: number;
|
|
44
|
-
};
|
|
45
|
-
common: {
|
|
46
|
-
lineHeight: number;
|
|
47
|
-
base: number;
|
|
48
|
-
scaleW: number;
|
|
49
|
-
scaleH: number;
|
|
50
|
-
pages: number;
|
|
51
|
-
packed: number;
|
|
52
|
-
alphaChnl: number;
|
|
53
|
-
redChnl: number;
|
|
54
|
-
greenChnl: number;
|
|
55
|
-
blueChnl: number;
|
|
56
|
-
};
|
|
57
|
-
distanceField: {
|
|
58
|
-
fieldType: 'sdf' | 'msdf';
|
|
59
|
-
distanceRange: number;
|
|
60
|
-
};
|
|
61
|
-
lightningMetrics?: FontMetrics;
|
|
62
|
-
}
|
package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.js
DELETED
|
@@ -1,88 +0,0 @@
|
|
|
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 2023 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 { SpecialCodepoints } from '../../../renderers/SdfTextRenderer/internal/SpecialCodepoints.js';
|
|
20
|
-
import { FontShaper, } from './FontShaper.js';
|
|
21
|
-
export class SdfFontShaper extends FontShaper {
|
|
22
|
-
data;
|
|
23
|
-
glyphMap;
|
|
24
|
-
kernings;
|
|
25
|
-
constructor(data, glyphMap) {
|
|
26
|
-
super();
|
|
27
|
-
this.data = data;
|
|
28
|
-
this.glyphMap = glyphMap;
|
|
29
|
-
const kernings = (this.kernings = {});
|
|
30
|
-
data.kernings.forEach((kerning) => {
|
|
31
|
-
const second = kerning.second;
|
|
32
|
-
const firsts = (kernings[second] = kernings[second] || {});
|
|
33
|
-
firsts[kerning.first] = kerning.amount;
|
|
34
|
-
});
|
|
35
|
-
this.kernings = kernings;
|
|
36
|
-
}
|
|
37
|
-
*shapeText(props, codepoints) {
|
|
38
|
-
let codepointResult;
|
|
39
|
-
let lastGlyphId = undefined;
|
|
40
|
-
while ((codepointResult = codepoints.peek()) && !codepointResult.done) {
|
|
41
|
-
const codepoint = codepointResult.value;
|
|
42
|
-
const glyph = this.glyphMap.get(codepoint);
|
|
43
|
-
codepoints.next();
|
|
44
|
-
if (glyph !== undefined) {
|
|
45
|
-
// We found a glyph for this codepoint
|
|
46
|
-
// Yield the mapped glyph info
|
|
47
|
-
/**
|
|
48
|
-
* Kerning includes any possible additional letter spacing
|
|
49
|
-
*/
|
|
50
|
-
const kerning = lastGlyphId !== undefined
|
|
51
|
-
? (this.kernings[glyph.id]?.[lastGlyphId] || 0) +
|
|
52
|
-
props.letterSpacing
|
|
53
|
-
: 0;
|
|
54
|
-
lastGlyphId = glyph.id;
|
|
55
|
-
yield {
|
|
56
|
-
mapped: true,
|
|
57
|
-
glyphId: glyph.id,
|
|
58
|
-
codepoint,
|
|
59
|
-
cluster: codepoints.lastIndex,
|
|
60
|
-
xAdvance: glyph.xadvance + kerning,
|
|
61
|
-
yAdvance: 0,
|
|
62
|
-
xOffset: glyph.xoffset + kerning,
|
|
63
|
-
yOffset: glyph.yoffset,
|
|
64
|
-
xBearing: 0,
|
|
65
|
-
yBearing: 0,
|
|
66
|
-
width: glyph.width,
|
|
67
|
-
height: glyph.height,
|
|
68
|
-
};
|
|
69
|
-
}
|
|
70
|
-
else {
|
|
71
|
-
// We didn't find a glyph for this codepoint
|
|
72
|
-
// Yield the unmapped codepoint info
|
|
73
|
-
// If this codepoint is a linebreak, we should reset the last glyph id
|
|
74
|
-
// so that the next glyph will not be kerned with the last glyph of the
|
|
75
|
-
// previous line.
|
|
76
|
-
if (codepoint === SpecialCodepoints.LINE_FEED) {
|
|
77
|
-
lastGlyphId = undefined;
|
|
78
|
-
}
|
|
79
|
-
yield {
|
|
80
|
-
mapped: false,
|
|
81
|
-
codepoint,
|
|
82
|
-
cluster: codepoints.lastIndex,
|
|
83
|
-
};
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
//# sourceMappingURL=SdfFontShaper.js.map
|
package/dist/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"SdfFontShaper.js","sourceRoot":"","sources":["../../../../../../../src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kEAAkE,CAAC;AAErG,OAAO,EACL,UAAU,GAIX,MAAM,iBAAiB,CAAC;AAUzB,MAAM,OAAO,aAAc,SAAQ,UAAU;IAC1B,IAAI,CAAc;IAClB,QAAQ,CAAuC;IAC/C,QAAQ,CAAe;IAExC,YACE,IAAiB,EACjB,QAA8C;QAE9C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,MAAM,QAAQ,GAAiB,CAAC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAChC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC9B,MAAM,MAAM,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC3D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,CAAC,SAAS,CACR,KAAsB,EACtB,UAAoC;QAEpC,IAAI,eAAuC,CAAC;QAC5C,IAAI,WAAW,GAAuB,SAAS,CAAC;QAChD,OAAO,CAAC,eAAe,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;YACtE,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC;YACxC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC3C,UAAU,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,sCAAsC;gBACtC,8BAA8B;gBAE9B;;mBAEG;gBACH,MAAM,OAAO,GACX,WAAW,KAAK,SAAS;oBACvB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;wBAC7C,KAAK,CAAC,aAAa;oBACrB,CAAC,CAAC,CAAC,CAAC;gBAER,WAAW,GAAG,KAAK,CAAC,EAAE,CAAC;gBACvB,MAAM;oBACJ,MAAM,EAAE,IAAI;oBACZ,OAAO,EAAE,KAAK,CAAC,EAAE;oBACjB,SAAS;oBACT,OAAO,EAAE,UAAU,CAAC,SAAS;oBAC7B,QAAQ,EAAE,KAAK,CAAC,QAAQ,GAAG,OAAO;oBAClC,QAAQ,EAAE,CAAC;oBACX,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,OAAO;oBAChC,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,QAAQ,EAAE,CAAC;oBACX,QAAQ,EAAE,CAAC;oBACX,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,MAAM,EAAE,KAAK,CAAC,MAAM;iBACrB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,4CAA4C;gBAC5C,oCAAoC;gBAEpC,sEAAsE;gBACtE,uEAAuE;gBACvE,iBAAiB;gBACjB,IAAI,SAAS,KAAK,iBAAiB,CAAC,SAAS,EAAE,CAAC;oBAC9C,WAAW,GAAG,SAAS,CAAC;gBAC1B,CAAC;gBACD,MAAM;oBACJ,MAAM,EAAE,KAAK;oBACb,SAAS;oBACT,OAAO,EAAE,UAAU,CAAC,SAAS;iBAC9B,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
|