@lightningjs/renderer 3.0.0-beta21 → 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/renderers/webgl/WebGlRenderOp.d.ts +3 -2
- package/dist/src/core/renderers/webgl/WebGlRenderOp.js +3 -1
- package/dist/src/core/renderers/webgl/WebGlRenderOp.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/webgl/Border.js +7 -13
- package/dist/src/core/shaders/webgl/Border.js.map +1 -1
- package/dist/src/core/shaders/webgl/RoundedWithBorder.js +6 -17
- package/dist/src/core/shaders/webgl/RoundedWithBorder.js.map +1 -1
- package/dist/src/core/shaders/webgl/RoundedWithBorderAndShadow.js +4 -8
- package/dist/src/core/shaders/webgl/RoundedWithBorderAndShadow.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/textures/Texture.d.ts +4 -3
- package/dist/src/core/textures/Texture.js.map +1 -1
- package/dist/src/core/utils.d.ts +1 -1
- package/dist/src/main-api/Inspector.d.ts +4 -0
- package/dist/src/main-api/Inspector.js +160 -0
- package/dist/src/main-api/Inspector.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/shaders/webgl/Border.ts +7 -13
- package/src/core/shaders/webgl/RoundedWithBorder.ts +6 -17
- package/src/core/shaders/webgl/RoundedWithBorderAndShadow.ts +4 -8
- package/src/core/textures/Texture.ts +10 -6
- package/src/main-api/Inspector.ts +215 -0
- package/dist/src/core/animations/Animation.d.ts +0 -21
- package/dist/src/core/animations/Animation.js +0 -194
- package/dist/src/core/animations/Animation.js.map +0 -1
- package/dist/src/core/animations/Playback.d.ts +0 -64
- package/dist/src/core/animations/Playback.js +0 -169
- package/dist/src/core/animations/Playback.js.map +0 -1
- package/dist/src/core/animations/Transition.d.ts +0 -27
- package/dist/src/core/animations/Transition.js +0 -52
- package/dist/src/core/animations/Transition.js.map +0 -1
- package/dist/src/core/animations/utils.d.ts +0 -2
- package/dist/src/core/animations/utils.js +0 -136
- package/dist/src/core/animations/utils.js.map +0 -1
- package/dist/src/core/shaders/webgl/SdfShadowShader.d.ts +0 -9
- package/dist/src/core/shaders/webgl/SdfShadowShader.js +0 -100
- package/dist/src/core/shaders/webgl/SdfShadowShader.js.map +0 -1
- package/dist/tsconfig.tsbuildinfo +0 -1
package/dist/exports/index.d.ts
CHANGED
|
@@ -22,6 +22,7 @@ export * from '../src/main-api/Renderer.js';
|
|
|
22
22
|
export * from '../src/common/IAnimationController.js';
|
|
23
23
|
export * from '../src/common/CommonTypes.js';
|
|
24
24
|
export { CoreTextureManager, type TextureMap, } from '../src/core/CoreTextureManager.js';
|
|
25
|
+
export { TextureError, TextureErrorCode, isTextureError, } from '../src/core/TextureError.js';
|
|
25
26
|
export type { MemoryInfo } from '../src/core/TextureMemoryManager.js';
|
|
26
27
|
export type { AnimationSettings } from '../src/core/animations/CoreAnimation.js';
|
|
27
28
|
export type { TimingFunction } from '../src/core/utils.js';
|
package/dist/exports/index.js
CHANGED
|
@@ -42,6 +42,7 @@ export * from '../src/common/CommonTypes.js';
|
|
|
42
42
|
// Selected types exported from the Core Renderer that can be used in the
|
|
43
43
|
// context of the main API.
|
|
44
44
|
export { CoreTextureManager, } from '../src/core/CoreTextureManager.js';
|
|
45
|
+
export { TextureError, TextureErrorCode, isTextureError, } from '../src/core/TextureError.js';
|
|
45
46
|
export * from '../src/core/renderers/CoreShaderNode.js';
|
|
46
47
|
export * from '../src/core/shaders/templates/BorderTemplate.js';
|
|
47
48
|
export * from '../src/core/shaders/templates/HolePunchTemplate.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../exports/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;;;;;;;;;GAkBG;AAEH,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAE7C,yEAAyE;AACzE,2BAA2B;AAC3B,OAAO,EACL,kBAAkB,GAEnB,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../exports/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;;;;;;;;;GAkBG;AAEH,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAE7C,yEAAyE;AACzE,2BAA2B;AAC3B,OAAO,EACL,kBAAkB,GAEnB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,cAAc,GACf,MAAM,6BAA6B,CAAC;AAOrC,cAAc,yCAAyC,CAAC;AACxD,cAAc,iDAAiD,CAAC;AAChE,cAAc,oDAAoD,CAAC;AACnE,cAAc,kDAAkD,CAAC;AACjE,cAAc,iDAAiD,CAAC;AAChE,cAAc,yDAAyD,CAAC;AACxE,cAAc,yDAAyD,CAAC;AAExE,UAAU;AACV,cAAc,mDAAmD,CAAC;AAGlE,WAAW;AACX,cAAc,iCAAiC,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { CoreNodeRenderState } from '../core/CoreNode.js';
|
|
2
|
+
import type { TextureError } from '../core/TextureError.js';
|
|
2
3
|
/**
|
|
3
4
|
* Types shared between Main Space and Core Space
|
|
4
5
|
*
|
|
@@ -43,7 +44,7 @@ export type NodeTextFailedPayload = {
|
|
|
43
44
|
*/
|
|
44
45
|
export type NodeTextureFailedPayload = {
|
|
45
46
|
type: 'texture';
|
|
46
|
-
error:
|
|
47
|
+
error: TextureError;
|
|
47
48
|
};
|
|
48
49
|
/**
|
|
49
50
|
* Payload for when texture failed to load
|
|
@@ -7,7 +7,7 @@ import type { QuadOptions } from '../CoreRenderer.js';
|
|
|
7
7
|
import type { CoreTextNode } from '../../CoreTextNode.js';
|
|
8
8
|
import type { RectWithValid } from '../../lib/utils.js';
|
|
9
9
|
import type { Dimensions } from '../../../common/CommonTypes.js';
|
|
10
|
-
type ReqQuad = 'alpha' | 'shader' | 'parentHasRenderTexture' | 'rtt' | 'clippingRect' | 'height' | 'width';
|
|
10
|
+
type ReqQuad = 'alpha' | 'shader' | 'parentHasRenderTexture' | 'rtt' | 'clippingRect' | 'height' | 'width' | 'time';
|
|
11
11
|
type RenderOpQuadOptions = Pick<QuadOptions, ReqQuad> & Partial<Omit<QuadOptions, ReqQuad>> & {
|
|
12
12
|
sdfShaderProps?: Record<string, unknown>;
|
|
13
13
|
sdfBuffers?: BufferCollection;
|
|
@@ -34,9 +34,10 @@ export declare class WebGlRenderOp extends CoreRenderOp {
|
|
|
34
34
|
readonly clippingRect: RectWithValid;
|
|
35
35
|
readonly rtt: boolean;
|
|
36
36
|
readonly parentHasRenderTexture: boolean;
|
|
37
|
-
readonly framebufferDimensions
|
|
37
|
+
readonly framebufferDimensions: Dimensions | null;
|
|
38
38
|
readonly alpha: number;
|
|
39
39
|
readonly pixelRatio: number;
|
|
40
|
+
readonly time?: number | null;
|
|
40
41
|
constructor(renderer: WebGlRenderer, quad: RenderOpQuadOptions, bufferIdx: number);
|
|
41
42
|
addTexture(texture: WebGlCtxTexture): number;
|
|
42
43
|
draw(): void;
|
|
@@ -42,6 +42,7 @@ export class WebGlRenderOp extends CoreRenderOp {
|
|
|
42
42
|
framebufferDimensions;
|
|
43
43
|
alpha;
|
|
44
44
|
pixelRatio;
|
|
45
|
+
time;
|
|
45
46
|
constructor(renderer, quad, bufferIdx) {
|
|
46
47
|
super();
|
|
47
48
|
this.renderer = renderer;
|
|
@@ -52,11 +53,12 @@ export class WebGlRenderOp extends CoreRenderOp {
|
|
|
52
53
|
this.height = quad.height;
|
|
53
54
|
this.clippingRect = quad.clippingRect;
|
|
54
55
|
this.parentHasRenderTexture = quad.parentHasRenderTexture;
|
|
55
|
-
this.framebufferDimensions = quad.framebufferDimensions;
|
|
56
|
+
this.framebufferDimensions = quad.framebufferDimensions || null;
|
|
56
57
|
this.rtt = quad.rtt;
|
|
57
58
|
this.alpha = quad.alpha;
|
|
58
59
|
this.pixelRatio =
|
|
59
60
|
this.parentHasRenderTexture === true ? 1 : renderer.stage.pixelRatio;
|
|
61
|
+
this.time = quad.time;
|
|
60
62
|
/**
|
|
61
63
|
* related to line 51
|
|
62
64
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebGlRenderOp.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlRenderOp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"WebGlRenderOp.js","sourceRoot":"","sources":["../../../../../src/core/renderers/webgl/WebGlRenderOp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAyBlD;;;GAGG;AACH,MAAM,OAAO,aAAc,SAAQ,YAAY;IAuBlC;IAEA;IAxBX,QAAQ,GAAG,CAAC,CAAC;IACb,QAAQ,GAAsB,EAAE,CAAC;IAEjC;;OAEG;IACM,cAAc,CAAsC;IACpD,OAAO,CAA2B;IAClC,WAAW,CAAS;IACpB,OAAO,CAAmB;IAC1B,MAAM,CAAkB;IACxB,KAAK,CAAS;IACd,MAAM,CAAS;IACf,YAAY,CAAgB;IAC5B,GAAG,CAAU;IACb,sBAAsB,CAAU;IAChC,qBAAqB,CAAoB;IACzC,KAAK,CAAS;IACd,UAAU,CAAS;IACnB,IAAI,CAAiB;IAE9B,YACW,QAAuB,EAChC,IAAyB,EAChB,SAAiB;QAE1B,KAAK,EAAE,CAAC;QAJC,aAAQ,GAAR,QAAQ,CAAe;QAEvB,cAAS,GAAT,SAAS,CAAQ;QAG1B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,QAAQ,CAAC,oBAAoB,CAAC;QAChE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAyB,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC;QAC1D,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,IAAI,IAAI,CAAC;QAChE,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,UAAU;YACb,IAAI,CAAC,sBAAsB,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC;QACvE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAEtB;;WAEG;QACH,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAE1C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,uBAAuB;YAC5D,CAAC,CAAE,QAAQ,CAAC,GAAG,CAAC,YAAY,CACxB,QAAQ,CAAC,GAAG,CAAC,8BAA8B,CACjC;YACd,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,UAAU,CAAC,OAAwB;QACjC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QACvC,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC;QACrB,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC;QACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE,CAAC;YACxC,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;gBAClB,WAAW,GAAG,CAAC,CAAC;gBAChB,MAAM;YACR,CAAC;QACH,CAAC;QAED,IAAI,WAAW,KAAK,CAAC,CAAC,EAAE,CAAC;YACvB,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,IAAI,cAAc,IAAI,WAAW,EAAE,CAAC;YAClC,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,IAAI;QACF,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QAE9C,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAEvC,WAAW;QACX,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACrC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;YAChE,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;YACxE,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1E,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CACpB,OAAO,CAAC,MAAM,CAAC,MAAM;gBACnB,UAAU;gBACV,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CACxC,CAAC;YACF,mEAAmE;YACnE,6CAA6C;YAC7C,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAChC,KAAK,GAAG,IAAI,CAAC,qBAAqB;oBAChC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM;oBAC5C,CAAC,CAAC,CAAC,CAAC;YACR,CAAC;YAED,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YACzB,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;QAED,kDAAkD;QAClD,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACtC,sFAAsF;YACtF,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtD,CAAC;aAAM,CAAC;YACN,8EAA8E;YAC9E,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC9C,GAAG,CAAC,YAAY,CACd,GAAG,CAAC,SAAS,EACb,CAAC,GAAG,IAAI,CAAC,QAAQ,EACjB,GAAG,CAAC,cAAc,EAClB,OAAO,CACR,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}
|
|
@@ -91,7 +91,9 @@ export class LinearGradientEffect extends ShaderEffect {
|
|
|
91
91
|
static ColorLoop = (amount) => {
|
|
92
92
|
let loop = '';
|
|
93
93
|
for (let i = 2; i < amount; i++) {
|
|
94
|
-
loop += `
|
|
94
|
+
loop += `
|
|
95
|
+
mixAmount = smoothstep(stops[${i - 1}], stops[${i}], dist);
|
|
96
|
+
colorOut = mix(colorOut, colors[${i}], mixAmount);`;
|
|
95
97
|
}
|
|
96
98
|
return loop;
|
|
97
99
|
};
|
|
@@ -105,29 +107,11 @@ export class LinearGradientEffect extends ShaderEffect {
|
|
|
105
107
|
vec2 gradVec = t - f;
|
|
106
108
|
float dist = dot(v_nodeCoordinate.xy * u_dimensions - f, gradVec) / dot(gradVec, gradVec);
|
|
107
109
|
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
const int last = amount - 1;
|
|
114
|
-
|
|
115
|
-
if(dist >= stops[last]) {
|
|
116
|
-
return mix(maskColor, colors[last], clamp(colors[last].a, 0.0, 1.0));
|
|
117
|
-
}
|
|
118
|
-
|
|
119
|
-
for(int i = 0; i < last; i++) {
|
|
120
|
-
float left = stops[i];
|
|
121
|
-
float right = stops[i + 1];
|
|
122
|
-
if(dist >= left && dist <= right) {
|
|
123
|
-
float localDist = smoothstep(left, right, dist);
|
|
124
|
-
vec4 colorOut = mix(colors[i], colors[i + 1], localDist);
|
|
125
|
-
return mix(maskColor, colorOut, clamp(colorOut.a, 0.0, 1.0));
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
//final fallback
|
|
130
|
-
return mix(maskColor, colors[last], clamp(colors[last].a, 0.0, 1.0));
|
|
110
|
+
float stopCalc = smoothstep(stops[0], stops[1], dist);
|
|
111
|
+
vec4 colorOut = mix(colors[0], colors[1], stopCalc);
|
|
112
|
+
float mixAmount;
|
|
113
|
+
${this.ColorLoop(colors)}
|
|
114
|
+
return mix(maskColor, colorOut, clamp(colorOut.a, 0.0, 1.0));
|
|
131
115
|
`;
|
|
132
116
|
};
|
|
133
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LinearGradientEffect.js","sourceRoot":"","sources":["../../../../../../../src/core/renderers/webgl/shaders/effects/LinearGradientEffect.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"LinearGradientEffect.js","sourceRoot":"","sources":["../../../../../../../src/core/renderers/webgl/shaders/effects/LinearGradientEffect.ts"],"names":[],"mappings":"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"}
|
|
@@ -101,7 +101,9 @@ export class RadialGradientEffect extends ShaderEffect {
|
|
|
101
101
|
static ColorLoop = (amount) => {
|
|
102
102
|
let loop = '';
|
|
103
103
|
for (let i = 2; i < amount; i++) {
|
|
104
|
-
loop += `
|
|
104
|
+
loop += `
|
|
105
|
+
mixAmount = smoothstep(stops[${i - 1}], stops[${i}], dist);
|
|
106
|
+
colorOut = mix(colorOut, colors[${i}], mixAmount);`;
|
|
105
107
|
}
|
|
106
108
|
return loop;
|
|
107
109
|
};
|
|
@@ -113,30 +115,11 @@ export class RadialGradientEffect extends ShaderEffect {
|
|
|
113
115
|
|
|
114
116
|
float dist = length((point - projection) / vec2(width, height));
|
|
115
117
|
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
const int amount = ${colors};
|
|
122
|
-
const int last = amount - 1;
|
|
123
|
-
|
|
124
|
-
if(dist >= stops[last]) {
|
|
125
|
-
return mix(maskColor, colors[last], clamp(colors[last].a, 0.0, 1.0));
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
for(int i = 0; i < last; i++) {
|
|
129
|
-
float left = stops[i];
|
|
130
|
-
float right = stops[i + 1];
|
|
131
|
-
if(dist >= left && dist <= right) {
|
|
132
|
-
float localDist = smoothstep(left, right, dist);
|
|
133
|
-
vec4 colorOut = mix(colors[i], colors[i + 1], localDist);
|
|
134
|
-
return mix(maskColor, colorOut, clamp(colorOut.a, 0.0, 1.0));
|
|
135
|
-
}
|
|
136
|
-
}
|
|
137
|
-
|
|
138
|
-
//final fallback
|
|
139
|
-
return mix(maskColor, colors[last], clamp(colors[last].a, 0.0, 1.0));
|
|
118
|
+
float stopCalc = smoothstep(stops[0], stops[1], dist);
|
|
119
|
+
vec4 colorOut = mix(colors[0], colors[1], stopCalc);
|
|
120
|
+
float mixAmount;
|
|
121
|
+
${this.ColorLoop(colors)}
|
|
122
|
+
return mix(maskColor, colorOut, clamp(colorOut.a, 0.0, 1.0));
|
|
140
123
|
`;
|
|
141
124
|
};
|
|
142
125
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadialGradientEffect.js","sourceRoot":"","sources":["../../../../../../../src/core/renderers/webgl/shaders/effects/RadialGradientEffect.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"RadialGradientEffect.js","sourceRoot":"","sources":["../../../../../../../src/core/renderers/webgl/shaders/effects/RadialGradientEffect.ts"],"names":[],"mappings":"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"}
|
|
@@ -143,23 +143,17 @@ export const Border = {
|
|
|
143
143
|
vec4 resultColor = vec4(0.0);
|
|
144
144
|
vec2 boxUv = v_nodeCoords.xy * u_dimensions - v_halfDimensions;
|
|
145
145
|
|
|
146
|
-
float outerDist = box(boxUv + v_outerBorderUv, v_outerSize - v_edgeWidth);
|
|
147
|
-
float innerDist = box(boxUv + v_innerBorderUv, v_innerSize - v_edgeWidth);
|
|
148
|
-
|
|
149
|
-
if(u_borderGap == 0.0) {
|
|
150
|
-
resultColor = mix(resultColor, u_borderColor, 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, outerDist));
|
|
151
|
-
resultColor = mix(resultColor, color, 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, innerDist));
|
|
152
|
-
gl_FragColor = resultColor * u_alpha;
|
|
153
|
-
return;
|
|
154
|
-
}
|
|
155
|
-
|
|
156
146
|
float nodeDist = box(boxUv, v_halfDimensions - v_edgeWidth);
|
|
157
147
|
float nodeAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, nodeDist);
|
|
148
|
+
resultColor = mix(resultColor, color, nodeAlpha);
|
|
149
|
+
|
|
150
|
+
float outerDist = box(boxUv + v_outerBorderUv, v_outerSize - v_edgeWidth);
|
|
151
|
+
float innerDist = box(boxUv + v_innerBorderUv, v_innerSize - v_edgeWidth);
|
|
158
152
|
|
|
159
153
|
float borderDist = max(-innerDist, outerDist);
|
|
160
|
-
float borderAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, borderDist);
|
|
161
|
-
|
|
162
|
-
resultColor = mix(resultColor, u_borderColor,
|
|
154
|
+
float borderAlpha = (1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, borderDist)) * u_borderColor.a;
|
|
155
|
+
|
|
156
|
+
resultColor = mix(resultColor, vec4(u_borderColor.rgb, 1.0), borderAlpha);
|
|
163
157
|
|
|
164
158
|
gl_FragColor = resultColor * u_alpha;
|
|
165
159
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Border.js","sourceRoot":"","sources":["../../../../../src/core/shaders/webgl/Border.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EACL,cAAc,GAEf,MAAM,gCAAgC,CAAC;AAIxC,MAAM,CAAC,MAAM,MAAM,GAAiC;IAClD,KAAK,EAAE,cAAc,CAAC,KAAK;IAC3B,MAAM,CAAC,IAAI;QACT,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,CAAS,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QACrD,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,KAAM,CAAC,GAAa,CAAC,CAAC;QACzD,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,KAAe,CAAC,CAAC;IAC/D,CAAC;IACD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgFP;IACD,QAAQ,EAAE
|
|
1
|
+
{"version":3,"file":"Border.js","sourceRoot":"","sources":["../../../../../src/core/shaders/webgl/Border.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EACL,cAAc,GAEf,MAAM,gCAAgC,CAAC;AAIxC,MAAM,CAAC,MAAM,MAAM,GAAiC;IAClD,KAAK,EAAE,cAAc,CAAC,KAAK;IAC3B,MAAM,CAAC,IAAI;QACT,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,CAAS,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,KAAK,CAAC,CAAC;QACrD,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,KAAM,CAAC,GAAa,CAAC,CAAC;QACzD,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,KAAe,CAAC,CAAC;IAC/D,CAAC;IACD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgFP;IACD,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDT;CACF,CAAC"}
|
|
@@ -177,33 +177,22 @@ export const RoundedWithBorder = {
|
|
|
177
177
|
vec4 resultColor = vec4(0.0);
|
|
178
178
|
vec2 boxUv = v_nodeCoords.xy * u_dimensions - v_halfDimensions;
|
|
179
179
|
|
|
180
|
-
float nodeDist;
|
|
181
|
-
float nodeAlpha;
|
|
180
|
+
float nodeDist = roundedBox(boxUv, v_halfDimensions - v_edgeWidth, u_radius);
|
|
181
|
+
float nodeAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, nodeDist);
|
|
182
|
+
resultColor = mix(resultColor, color, nodeAlpha);
|
|
182
183
|
|
|
183
184
|
if(v_borderZero == 1.0) {
|
|
184
|
-
|
|
185
|
-
nodeAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, nodeDist);
|
|
186
|
-
gl_FragColor = mix(vec4(0.0), color, nodeAlpha) * u_alpha;
|
|
185
|
+
gl_FragColor = resultColor * u_alpha;
|
|
187
186
|
return;
|
|
188
187
|
}
|
|
189
188
|
|
|
190
189
|
float outerDist = roundedBox(boxUv + v_outerBorderUv, v_outerSize - v_edgeWidth, v_outerBorderRadius);
|
|
191
190
|
float innerDist = roundedBox(boxUv + v_innerBorderUv, v_innerSize - v_edgeWidth, v_innerBorderRadius);
|
|
192
191
|
|
|
193
|
-
if(u_borderGap == 0.0) {
|
|
194
|
-
resultColor = mix(resultColor, u_borderColor, 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, outerDist));
|
|
195
|
-
resultColor = mix(resultColor, color, 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, innerDist));
|
|
196
|
-
gl_FragColor = resultColor * u_alpha;
|
|
197
|
-
return;
|
|
198
|
-
}
|
|
199
|
-
|
|
200
|
-
nodeDist = roundedBox(boxUv, v_halfDimensions - v_edgeWidth, u_radius);
|
|
201
|
-
nodeAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, nodeDist);
|
|
202
192
|
float borderDist = max(-innerDist, outerDist);
|
|
203
|
-
float borderAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, borderDist);
|
|
193
|
+
float borderAlpha = (1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, borderDist)) * u_borderColor.a;
|
|
204
194
|
|
|
205
|
-
resultColor = mix(vec4(
|
|
206
|
-
resultColor = mix(resultColor, u_borderColor, borderAlpha * u_borderColor.a);
|
|
195
|
+
resultColor = mix(resultColor, vec4(u_borderColor.rgb, 1.0), borderAlpha);
|
|
207
196
|
gl_FragColor = resultColor * u_alpha;
|
|
208
197
|
}
|
|
209
198
|
`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoundedWithBorder.js","sourceRoot":"","sources":["../../../../../src/core/shaders/webgl/RoundedWithBorder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,OAAO,EACL,yBAAyB,GAE1B,MAAM,2CAA2C,CAAC;AAEnD,MAAM,CAAC,MAAM,iBAAiB,GAA4C;IACxE,KAAK,EAAE,yBAAyB,CAAC,KAAK;IACtC,MAAM,CAAC,IAAc;QACnB,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,cAAc,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,UAAU,CAAS,CAAC,CAAC;QAClE,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,KAAM,CAAC,YAAY,CAAW,CAAC,CAAC;QACnE,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,cAAc,CAAW,CAAC,CAAC;QAEvE,IAAI,CAAC,UAAU,CACb,UAAU,EACV,uBAAuB,CAAC,IAAI,CAAC,KAAM,CAAC,MAAc,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CACpE,CAAC;IACJ,CAAC;IACD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0GP;IACD,QAAQ,EAAE
|
|
1
|
+
{"version":3,"file":"RoundedWithBorder.js","sourceRoot":"","sources":["../../../../../src/core/shaders/webgl/RoundedWithBorder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,OAAO,EACL,yBAAyB,GAE1B,MAAM,2CAA2C,CAAC;AAEnD,MAAM,CAAC,MAAM,iBAAiB,GAA4C;IACxE,KAAK,EAAE,yBAAyB,CAAC,KAAK;IACtC,MAAM,CAAC,IAAc;QACnB,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,cAAc,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,UAAU,CAAS,CAAC,CAAC;QAClE,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,KAAM,CAAC,YAAY,CAAW,CAAC,CAAC;QACnE,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,cAAc,CAAW,CAAC,CAAC;QAEvE,IAAI,CAAC,UAAU,CACb,UAAU,EACV,uBAAuB,CAAC,IAAI,CAAC,KAAM,CAAC,MAAc,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CACpE,CAAC;IACJ,CAAC;IACD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0GP;IACD,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+DT;CACF,CAAC"}
|
|
@@ -191,13 +191,11 @@ export const RoundedWithBorderAndShadow = {
|
|
|
191
191
|
vec4 color = texture2D(u_texture, v_textureCoords) * v_color;
|
|
192
192
|
vec4 resultColor = vec4(0.0);
|
|
193
193
|
vec2 boxUv = v_nodeCoords.xy * u_dimensions - v_halfDimensions;
|
|
194
|
-
float nodeDist;
|
|
195
|
-
float nodeAlpha;
|
|
194
|
+
float nodeDist = roundedBox(boxUv, v_halfDimensions - v_edgeWidth, u_radius);
|
|
195
|
+
float nodeAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, nodeDist);
|
|
196
196
|
float shadowAlpha;
|
|
197
197
|
|
|
198
198
|
if(v_borderZero == 1.0) {
|
|
199
|
-
nodeDist = roundedBox(boxUv, v_halfDimensions - v_edgeWidth, u_radius);
|
|
200
|
-
nodeAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, nodeDist);
|
|
201
199
|
shadowAlpha = shadowBox(boxUv - u_shadow.xy, v_halfDimensions + u_shadow.w - v_edgeWidth, u_radius + u_shadow.z);
|
|
202
200
|
resultColor = mix(resultColor, u_shadowColor, shadowAlpha);
|
|
203
201
|
gl_FragColor = mix(resultColor, color, nodeAlpha) * u_alpha;
|
|
@@ -211,15 +209,13 @@ export const RoundedWithBorderAndShadow = {
|
|
|
211
209
|
shadowAlpha = shadowBox(boxUv - u_shadow.xy, v_halfDimensions + u_shadow.w - v_edgeWidth, u_radius + u_shadow.z);
|
|
212
210
|
}
|
|
213
211
|
|
|
214
|
-
nodeDist = roundedBox(boxUv, v_halfDimensions - v_edgeWidth, u_radius);
|
|
215
|
-
nodeAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, nodeDist);
|
|
216
212
|
float outerDist = roundedBox(boxUv + v_outerBorderUv, v_outerSize - v_edgeWidth, v_outerBorderRadius);
|
|
217
213
|
float innerDist = roundedBox(boxUv + v_innerBorderUv, v_innerSize - v_edgeWidth, v_innerBorderRadius);
|
|
218
214
|
float borderDist = max(-innerDist, outerDist);
|
|
219
|
-
float borderAlpha = 1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, borderDist);
|
|
215
|
+
float borderAlpha = (1.0 - smoothstep(-0.5 * v_edgeWidth, 0.5 * v_edgeWidth, borderDist)) * u_borderColor.a;
|
|
220
216
|
resultColor = mix(resultColor, u_shadowColor, shadowAlpha);
|
|
221
217
|
resultColor = mix(resultColor, color, nodeAlpha);
|
|
222
|
-
resultColor = mix(resultColor, u_borderColor,
|
|
218
|
+
resultColor = mix(resultColor, vec4(u_borderColor.rgb, 1.0), borderAlpha);
|
|
223
219
|
gl_FragColor = resultColor * u_alpha;
|
|
224
220
|
}
|
|
225
221
|
`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoundedWithBorderAndShadow.js","sourceRoot":"","sources":["../../../../../src/core/shaders/webgl/RoundedWithBorderAndShadow.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,OAAO,EACL,kCAAkC,GAEnC,MAAM,oDAAoD,CAAC;AAE5D,MAAM,CAAC,MAAM,0BAA0B,GACrC;IACE,KAAK,EAAE,kCAAkC,CAAC,KAAK;IAC/C,MAAM,CAAC,IAAc;QACnB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAM,CAAC;QAC1B,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,KAAK,CAAC,UAAU,CAAS,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,KAAM,CAAC,YAAY,CAAW,CAAC,CAAC;QACnE,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,cAAc,CAAW,CAAC,CAAC;QAEvE,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAExD,IAAI,CAAC,UAAU,CACb,UAAU,EACV,uBAAuB,CAAC,KAAK,CAAC,MAAc,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAC9D,CAAC;IACJ,CAAC;IACD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6GT;IACC,QAAQ,EAAE
|
|
1
|
+
{"version":3,"file":"RoundedWithBorderAndShadow.js","sourceRoot":"","sources":["../../../../../src/core/shaders/webgl/RoundedWithBorderAndShadow.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,OAAO,EACL,kCAAkC,GAEnC,MAAM,oDAAoD,CAAC;AAE5D,MAAM,CAAC,MAAM,0BAA0B,GACrC;IACE,KAAK,EAAE,kCAAkC,CAAC,KAAK;IAC/C,MAAM,CAAC,IAAc;QACnB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAM,CAAC;QAC1B,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,KAAK,CAAC,UAAU,CAAS,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,KAAM,CAAC,YAAY,CAAW,CAAC,CAAC;QACnE,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,KAAM,CAAC,cAAc,CAAW,CAAC,CAAC;QAEvE,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAExD,IAAI,CAAC,UAAU,CACb,UAAU,EACV,uBAAuB,CAAC,KAAK,CAAC,MAAc,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAC9D,CAAC;IACJ,CAAC;IACD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6GT;IACC,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgFX;CACA,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { CoreFont, type CoreFontProps } from './CoreFont.js';
|
|
2
|
+
import type { NormalizedFontMetrics, TextRenderer } from './TextRenderer.js';
|
|
3
|
+
export type CanvasFontProps = CoreFontProps & {
|
|
4
|
+
fontUrl: string;
|
|
5
|
+
};
|
|
6
|
+
export declare class CanvasFont extends CoreFont {
|
|
7
|
+
private measureContext;
|
|
8
|
+
type: string;
|
|
9
|
+
url: string;
|
|
10
|
+
constructor(textRenderer: TextRenderer, props: CanvasFontProps, measureContext: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D);
|
|
11
|
+
load(): void;
|
|
12
|
+
measureText(text: string, letterSpacing: number): number;
|
|
13
|
+
getMetrics(fontSize: number): NormalizedFontMetrics;
|
|
14
|
+
}
|
|
@@ -0,0 +1,115 @@
|
|
|
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 { normalizeFontMetrics } from './TextLayoutEngine.js';
|
|
21
|
+
import { hasZeroWidthSpace } from './Utils.js';
|
|
22
|
+
export class CanvasFont extends CoreFont {
|
|
23
|
+
measureContext;
|
|
24
|
+
type = 'canvas';
|
|
25
|
+
url;
|
|
26
|
+
constructor(textRenderer, props, measureContext) {
|
|
27
|
+
super(textRenderer, props);
|
|
28
|
+
this.measureContext = measureContext;
|
|
29
|
+
this.url = props.fontUrl;
|
|
30
|
+
this.metrics = props.metrics;
|
|
31
|
+
}
|
|
32
|
+
load() {
|
|
33
|
+
if (this.state !== FontState.Created) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
if (this.family === 'sans-serif') {
|
|
37
|
+
// Default font, skip loading
|
|
38
|
+
this.onLoaded();
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
this.state = FontState.Loading;
|
|
42
|
+
new FontFace(this.family, `url(${this.url})`)
|
|
43
|
+
.load()
|
|
44
|
+
.then((loadedFont) => {
|
|
45
|
+
document.fonts.add(loadedFont);
|
|
46
|
+
this.onLoaded();
|
|
47
|
+
})
|
|
48
|
+
.catch((error) => {
|
|
49
|
+
this.state = FontState.Failed;
|
|
50
|
+
console.error(`Failed to load font: ${this.family}`, error);
|
|
51
|
+
this.emit('failed');
|
|
52
|
+
throw error;
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
measureText(text, letterSpacing) {
|
|
56
|
+
if (letterSpacing === 0) {
|
|
57
|
+
return this.measureContext.measureText(text).width;
|
|
58
|
+
}
|
|
59
|
+
if (hasZeroWidthSpace(text) === false) {
|
|
60
|
+
return (this.measureContext.measureText(text).width +
|
|
61
|
+
letterSpacing * text.length);
|
|
62
|
+
}
|
|
63
|
+
return text.split('').reduce((acc, char) => {
|
|
64
|
+
if (hasZeroWidthSpace(char) === true) {
|
|
65
|
+
return acc;
|
|
66
|
+
}
|
|
67
|
+
return acc + this.measureContext.measureText(char).width + letterSpacing;
|
|
68
|
+
}, 0);
|
|
69
|
+
}
|
|
70
|
+
getMetrics(fontSize) {
|
|
71
|
+
let m = this.normalizedMetrics[fontSize];
|
|
72
|
+
if (m !== undefined) {
|
|
73
|
+
return m;
|
|
74
|
+
}
|
|
75
|
+
let metrics = this.metrics;
|
|
76
|
+
if (metrics === undefined) {
|
|
77
|
+
metrics = calculateCanvasMetrics(this.family, fontSize, this.measureContext);
|
|
78
|
+
}
|
|
79
|
+
m = this.normalizedMetrics[fontSize] = normalizeFontMetrics(metrics, fontSize);
|
|
80
|
+
return m;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
function calculateCanvasMetrics(fontFamily, fontSize, measureContext) {
|
|
84
|
+
// If the font face doesn't have metrics defined, we fallback to using the
|
|
85
|
+
// browser's measureText method to calculate take a best guess at the font
|
|
86
|
+
// actual font's metrics.
|
|
87
|
+
// - fontBoundingBox[Ascent|Descent] is the best estimate but only supported
|
|
88
|
+
// in Chrome 87+ (2020), Firefox 116+ (2023), and Safari 11.1+ (2018).
|
|
89
|
+
// - It is an estimate as it can vary between browsers.
|
|
90
|
+
// - actualBoundingBox[Ascent|Descent] is less accurate and supported in
|
|
91
|
+
// Chrome 77+ (2019), Firefox 74+ (2020), and Safari 11.1+ (2018).
|
|
92
|
+
// - If neither are supported, we'll use some default values which will
|
|
93
|
+
// get text on the screen but likely not be great.
|
|
94
|
+
// NOTE: It's been decided not to rely on fontBoundingBox[Ascent|Descent]
|
|
95
|
+
// as it's browser support is limited and it also tends to produce higher than
|
|
96
|
+
// expected values. It is instead HIGHLY RECOMMENDED that developers provide
|
|
97
|
+
// explicit metrics in the font face definition.
|
|
98
|
+
measureContext.font = `normal ${fontSize}px Unknown, ${fontFamily}`;
|
|
99
|
+
const metrics = measureContext.measureText('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz');
|
|
100
|
+
console.warn(`Font metrics not provided for Canvas Web font ${fontFamily}. ` +
|
|
101
|
+
'Using fallback values. It is HIGHLY recommended you use the latest ' +
|
|
102
|
+
'version of the Lightning 3 `msdf-generator` tool to extract the default ' +
|
|
103
|
+
'metrics for the font and provide them in the Canvas Web font definition.');
|
|
104
|
+
const ascender = metrics.fontBoundingBoxAscent ?? metrics.actualBoundingBoxAscent ?? 0;
|
|
105
|
+
const descender = metrics.fontBoundingBoxDescent ?? metrics.actualBoundingBoxDescent ?? 0;
|
|
106
|
+
return {
|
|
107
|
+
ascender,
|
|
108
|
+
descender: -descender,
|
|
109
|
+
lineGap: (metrics.emHeightAscent ?? 0) +
|
|
110
|
+
(metrics.emHeightDescent ?? 0) -
|
|
111
|
+
(ascender + descender),
|
|
112
|
+
unitsPerEm: (metrics.emHeightAscent ?? 0) + (metrics.emHeightDescent ?? 0),
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
//# sourceMappingURL=CanvasFont.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CanvasFont.js","sourceRoot":"","sources":["../../../../src/core/text-rendering/CanvasFont.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import type { CoreTextNode } from '../CoreTextNode.js';
|
|
2
|
+
import type { FontMetrics, NormalizedFontMetrics, TextRenderer } from './TextRenderer.js';
|
|
3
|
+
import { EventEmitter } from '../../common/EventEmitter.js';
|
|
4
|
+
export declare enum FontState {
|
|
5
|
+
Created = 0,
|
|
6
|
+
Loading = 1,
|
|
7
|
+
Loaded = 2,
|
|
8
|
+
Failed = 3
|
|
9
|
+
}
|
|
10
|
+
export interface CoreFontProps {
|
|
11
|
+
fontFamily: string;
|
|
12
|
+
metrics?: FontMetrics;
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* EventEmiter only intended to communicated with FontManager
|
|
16
|
+
*/
|
|
17
|
+
export declare abstract class CoreFont extends EventEmitter {
|
|
18
|
+
protected waitingNodes?: Record<number, CoreTextNode>;
|
|
19
|
+
protected normalizedMetrics?: Record<number, NormalizedFontMetrics>;
|
|
20
|
+
textRenderer: TextRenderer;
|
|
21
|
+
state: FontState;
|
|
22
|
+
family: string;
|
|
23
|
+
metrics?: FontMetrics;
|
|
24
|
+
constructor(textRenderer: TextRenderer, props: CoreFontProps);
|
|
25
|
+
protected onLoaded(): void;
|
|
26
|
+
waiting(node: CoreTextNode): void;
|
|
27
|
+
stopWaiting(node: CoreTextNode): void;
|
|
28
|
+
destroy(): void;
|
|
29
|
+
abstract type: string;
|
|
30
|
+
abstract load(): void;
|
|
31
|
+
abstract measureText(text: string, letterSpacing: number): number;
|
|
32
|
+
abstract getMetrics(fontSize: number): NormalizedFontMetrics;
|
|
33
|
+
}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { UpdateType } from '../CoreNode.js';
|
|
2
|
+
import { EventEmitter } from '../../common/EventEmitter.js';
|
|
3
|
+
export var FontState;
|
|
4
|
+
(function (FontState) {
|
|
5
|
+
FontState[FontState["Created"] = 0] = "Created";
|
|
6
|
+
FontState[FontState["Loading"] = 1] = "Loading";
|
|
7
|
+
FontState[FontState["Loaded"] = 2] = "Loaded";
|
|
8
|
+
FontState[FontState["Failed"] = 3] = "Failed";
|
|
9
|
+
})(FontState || (FontState = {}));
|
|
10
|
+
/**
|
|
11
|
+
* EventEmiter only intended to communicated with FontManager
|
|
12
|
+
*/
|
|
13
|
+
export class CoreFont extends EventEmitter {
|
|
14
|
+
waitingNodes = Object.create(null);
|
|
15
|
+
normalizedMetrics = Object.create(null);
|
|
16
|
+
textRenderer;
|
|
17
|
+
state;
|
|
18
|
+
family;
|
|
19
|
+
metrics;
|
|
20
|
+
constructor(textRenderer, props) {
|
|
21
|
+
super();
|
|
22
|
+
this.family = props.fontFamily;
|
|
23
|
+
this.state = FontState.Created;
|
|
24
|
+
this.textRenderer = textRenderer;
|
|
25
|
+
}
|
|
26
|
+
onLoaded() {
|
|
27
|
+
const waitingNodes = this.waitingNodes;
|
|
28
|
+
for (let key in waitingNodes) {
|
|
29
|
+
waitingNodes[key].setUpdateType(UpdateType.Local);
|
|
30
|
+
delete waitingNodes[key];
|
|
31
|
+
}
|
|
32
|
+
this.state = FontState.Loaded;
|
|
33
|
+
}
|
|
34
|
+
waiting(node) {
|
|
35
|
+
this.waitingNodes[node.id] = node;
|
|
36
|
+
}
|
|
37
|
+
stopWaiting(node) {
|
|
38
|
+
if (this.waitingNodes[node.id]) {
|
|
39
|
+
delete this.waitingNodes[node.id];
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
destroy() {
|
|
43
|
+
delete this.waitingNodes;
|
|
44
|
+
delete this.normalizedMetrics;
|
|
45
|
+
delete this.metrics;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=CoreFont.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CoreFont.js","sourceRoot":"","sources":["../../../../src/core/text-rendering/CoreFont.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,+CAAO,CAAA;IACP,+CAAO,CAAA;IACP,6CAAM,CAAA;IACN,6CAAM,CAAA;AACR,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB;AAOD;;GAEG;AACH,MAAM,OAAgB,QAAS,SAAQ,YAAY;IACvC,YAAY,GAAkC,MAAM,CAAC,MAAM,CACnE,IAAI,CAC2B,CAAC;IACxB,iBAAiB,GACzB,MAAM,CAAC,MAAM,CAAC,IAAI,CAA0C,CAAC;IAExD,YAAY,CAAe;IAC3B,KAAK,CAAY;IACjB,MAAM,CAAS;IACf,OAAO,CAAe;IAE7B,YAAY,YAA0B,EAAE,KAAoB;QAC1D,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAES,QAAQ;QAChB,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,KAAK,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;YAC7B,YAAY,CAAC,GAAG,CAAE,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACnD,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC;IAChC,CAAC;IAEM,OAAO,CAAC,IAAkB;QAC/B,IAAI,CAAC,YAAa,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;IACrC,CAAC;IAEM,WAAW,CAAC,IAAkB;QACnC,IAAI,IAAI,CAAC,YAAa,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC,YAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;QAC9B,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CAMF"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { Stage } from '../Stage.js';
|
|
2
|
+
import type { CoreFont } from './CoreFont.js';
|
|
3
|
+
import type { FontLoadOptions, TextRenderer, TextRenderers } from './TextRenderer.js';
|
|
4
|
+
export declare class CoreFontManager {
|
|
5
|
+
private fonts;
|
|
6
|
+
private renderers;
|
|
7
|
+
constructor(stage: Stage, textRenderers: TextRenderer[]);
|
|
8
|
+
loadFont(type: TextRenderers, options: FontLoadOptions): void;
|
|
9
|
+
unloadFont(fontFamily: string): void;
|
|
10
|
+
getFont(fontFamily: string): CoreFont | undefined;
|
|
11
|
+
}
|