@lightningjs/renderer 2.6.2 → 2.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (193) hide show
  1. package/dist/src/core/CoreNode.d.ts +6 -1
  2. package/dist/src/core/CoreNode.js +109 -64
  3. package/dist/src/core/CoreNode.js.map +1 -1
  4. package/dist/src/core/renderers/canvas/CanvasCoreRenderer.js +40 -3
  5. package/dist/src/core/renderers/canvas/CanvasCoreRenderer.js.map +1 -1
  6. package/dist/src/core/renderers/canvas/internal/C2DShaderUtils.d.ts +9 -1
  7. package/dist/src/core/renderers/canvas/internal/C2DShaderUtils.js +68 -0
  8. package/dist/src/core/renderers/canvas/internal/C2DShaderUtils.js.map +1 -1
  9. package/dist/src/core/renderers/canvas/internal/ColorUtils.d.ts +4 -0
  10. package/dist/src/core/renderers/canvas/internal/ColorUtils.js +13 -0
  11. package/dist/src/core/renderers/canvas/internal/ColorUtils.js.map +1 -1
  12. package/dist/src/core/renderers/canvas/shaders/UnsupportedShader.js +3 -3
  13. package/dist/src/core/renderers/canvas/shaders/UnsupportedShader.js.map +1 -1
  14. package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.js.map +1 -1
  15. package/dist/src/core/renderers/webgl/WebGlCoreRenderer.d.ts +23 -0
  16. package/dist/src/core/renderers/webgl/WebGlCoreRenderer.js +65 -9
  17. package/dist/src/core/renderers/webgl/WebGlCoreRenderer.js.map +1 -1
  18. package/dist/src/core/renderers/webgl/shaders/effects/RadiusEffect.js +18 -0
  19. package/dist/src/core/renderers/webgl/shaders/effects/RadiusEffect.js.map +1 -1
  20. package/dist/src/core/renderers/webgl/shaders/effects/ShaderEffect.js.map +1 -1
  21. package/dist/tsconfig.dist.tsbuildinfo +1 -1
  22. package/package.json +1 -2
  23. package/src/core/CoreNode.ts +125 -73
  24. package/src/core/renderers/canvas/CanvasCoreRenderer.ts +91 -2
  25. package/src/core/renderers/canvas/internal/C2DShaderUtils.ts +102 -1
  26. package/src/core/renderers/canvas/internal/ColorUtils.ts +14 -0
  27. package/src/core/renderers/canvas/shaders/UnsupportedShader.ts +3 -3
  28. package/src/core/renderers/webgl/WebGlCoreCtxTexture.ts +4 -1
  29. package/src/core/renderers/webgl/WebGlCoreRenderer.ts +78 -9
  30. package/src/core/renderers/webgl/shaders/effects/RadiusEffect.ts +0 -2
  31. package/src/core/renderers/webgl/shaders/effects/ShaderEffect.ts +0 -1
  32. package/dist/exports/core-api.d.ts +0 -74
  33. package/dist/exports/core-api.js +0 -96
  34. package/dist/exports/core-api.js.map +0 -1
  35. package/dist/exports/main-api.d.ts +0 -30
  36. package/dist/exports/main-api.js +0 -45
  37. package/dist/exports/main-api.js.map +0 -1
  38. package/dist/src/core/CoreExtension.d.ts +0 -12
  39. package/dist/src/core/CoreExtension.js +0 -29
  40. package/dist/src/core/CoreExtension.js.map +0 -1
  41. package/dist/src/core/CoreStuff.d.ts +0 -1
  42. package/dist/src/core/CoreStuff.js +0 -138
  43. package/dist/src/core/CoreStuff.js.map +0 -1
  44. package/dist/src/core/LngNode.d.ts +0 -736
  45. package/dist/src/core/LngNode.js +0 -1174
  46. package/dist/src/core/LngNode.js.map +0 -1
  47. package/dist/src/core/Matrix2DContext.d.ts +0 -15
  48. package/dist/src/core/Matrix2DContext.js +0 -45
  49. package/dist/src/core/Matrix2DContext.js.map +0 -1
  50. package/dist/src/core/ShaderNode.d.ts +0 -10
  51. package/dist/src/core/ShaderNode.js +0 -30
  52. package/dist/src/core/ShaderNode.js.map +0 -1
  53. package/dist/src/core/TextNode.d.ts +0 -103
  54. package/dist/src/core/TextNode.js +0 -331
  55. package/dist/src/core/TextNode.js.map +0 -1
  56. package/dist/src/core/lib/Coords.d.ts +0 -14
  57. package/dist/src/core/lib/Coords.js +0 -55
  58. package/dist/src/core/lib/Coords.js.map +0 -1
  59. package/dist/src/core/lib/glm/common.d.ts +0 -162
  60. package/dist/src/core/lib/glm/common.js +0 -81
  61. package/dist/src/core/lib/glm/common.js.map +0 -1
  62. package/dist/src/core/lib/glm/index.d.ts +0 -11
  63. package/dist/src/core/lib/glm/index.js +0 -30
  64. package/dist/src/core/lib/glm/index.js.map +0 -1
  65. package/dist/src/core/lib/glm/mat2.d.ts +0 -219
  66. package/dist/src/core/lib/glm/mat2.js +0 -396
  67. package/dist/src/core/lib/glm/mat2.js.map +0 -1
  68. package/dist/src/core/lib/glm/mat2d.d.ts +0 -237
  69. package/dist/src/core/lib/glm/mat2d.js +0 -442
  70. package/dist/src/core/lib/glm/mat2d.js.map +0 -1
  71. package/dist/src/core/lib/glm/mat3.d.ts +0 -283
  72. package/dist/src/core/lib/glm/mat3.js +0 -680
  73. package/dist/src/core/lib/glm/mat3.js.map +0 -1
  74. package/dist/src/core/lib/glm/mat4.d.ts +0 -550
  75. package/dist/src/core/lib/glm/mat4.js +0 -1802
  76. package/dist/src/core/lib/glm/mat4.js.map +0 -1
  77. package/dist/src/core/lib/glm/quat.d.ts +0 -363
  78. package/dist/src/core/lib/glm/quat.js +0 -693
  79. package/dist/src/core/lib/glm/quat.js.map +0 -1
  80. package/dist/src/core/lib/glm/quat2.d.ts +0 -356
  81. package/dist/src/core/lib/glm/quat2.js +0 -754
  82. package/dist/src/core/lib/glm/quat2.js.map +0 -1
  83. package/dist/src/core/lib/glm/vec2.d.ts +0 -365
  84. package/dist/src/core/lib/glm/vec2.js +0 -569
  85. package/dist/src/core/lib/glm/vec2.js.map +0 -1
  86. package/dist/src/core/lib/glm/vec3.d.ts +0 -406
  87. package/dist/src/core/lib/glm/vec3.js +0 -720
  88. package/dist/src/core/lib/glm/vec3.js.map +0 -1
  89. package/dist/src/core/lib/glm/vec4.d.ts +0 -330
  90. package/dist/src/core/lib/glm/vec4.js +0 -608
  91. package/dist/src/core/lib/glm/vec4.js.map +0 -1
  92. package/dist/src/core/renderers/CoreShaderManager.d.ts +0 -19
  93. package/dist/src/core/renderers/CoreShaderManager.js +0 -33
  94. package/dist/src/core/renderers/CoreShaderManager.js.map +0 -1
  95. package/dist/src/core/renderers/webgl/WebGlCoreShaderManager.d.ts +0 -27
  96. package/dist/src/core/renderers/webgl/WebGlCoreShaderManager.js +0 -82
  97. package/dist/src/core/renderers/webgl/WebGlCoreShaderManager.js.map +0 -1
  98. package/dist/src/core/renderers/webgl/WebGlCoreShaderProgram.d.ts +0 -11
  99. package/dist/src/core/renderers/webgl/WebGlCoreShaderProgram.js +0 -34
  100. package/dist/src/core/renderers/webgl/WebGlCoreShaderProgram.js.map +0 -1
  101. package/dist/src/core/scene/Scene.d.ts +0 -59
  102. package/dist/src/core/scene/Scene.js +0 -106
  103. package/dist/src/core/scene/Scene.js.map +0 -1
  104. package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/makeRenderWindow.d.ts +0 -20
  105. package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/makeRenderWindow.js +0 -55
  106. package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/makeRenderWindow.js.map +0 -1
  107. package/dist/src/main-api/ICoreDriver.d.ts +0 -27
  108. package/dist/src/main-api/ICoreDriver.js +0 -20
  109. package/dist/src/main-api/ICoreDriver.js.map +0 -1
  110. package/dist/src/main-api/IRenderDriver.d.ts +0 -20
  111. package/dist/src/main-api/IRenderDriver.js +0 -20
  112. package/dist/src/main-api/IRenderDriver.js.map +0 -1
  113. package/dist/src/main-api/IShaderController.d.ts +0 -14
  114. package/dist/src/main-api/IShaderController.js +0 -30
  115. package/dist/src/main-api/IShaderController.js.map +0 -1
  116. package/dist/src/main-api/IShaderNode.d.ts +0 -17
  117. package/dist/src/main-api/IShaderNode.js +0 -19
  118. package/dist/src/main-api/IShaderNode.js.map +0 -1
  119. package/dist/src/main-api/RendererMain.d.ts +0 -375
  120. package/dist/src/main-api/RendererMain.js +0 -365
  121. package/dist/src/main-api/RendererMain.js.map +0 -1
  122. package/dist/src/main-api/texture-usage-trackers/FinalizationRegistryTextureUsageTracker.d.ts +0 -9
  123. package/dist/src/main-api/texture-usage-trackers/FinalizationRegistryTextureUsageTracker.js +0 -38
  124. package/dist/src/main-api/texture-usage-trackers/FinalizationRegistryTextureUsageTracker.js.map +0 -1
  125. package/dist/src/main-api/texture-usage-trackers/ManualCountTextureUsageTracker.d.ts +0 -56
  126. package/dist/src/main-api/texture-usage-trackers/ManualCountTextureUsageTracker.js +0 -101
  127. package/dist/src/main-api/texture-usage-trackers/ManualCountTextureUsageTracker.js.map +0 -1
  128. package/dist/src/main-api/texture-usage-trackers/TextureUsageTracker.d.ts +0 -32
  129. package/dist/src/main-api/texture-usage-trackers/TextureUsageTracker.js +0 -28
  130. package/dist/src/main-api/texture-usage-trackers/TextureUsageTracker.js.map +0 -1
  131. package/dist/src/render-drivers/main/MainCoreDriver.d.ts +0 -24
  132. package/dist/src/render-drivers/main/MainCoreDriver.js +0 -118
  133. package/dist/src/render-drivers/main/MainCoreDriver.js.map +0 -1
  134. package/dist/src/render-drivers/main/MainOnlyNode.d.ts +0 -99
  135. package/dist/src/render-drivers/main/MainOnlyNode.js +0 -396
  136. package/dist/src/render-drivers/main/MainOnlyNode.js.map +0 -1
  137. package/dist/src/render-drivers/main/MainOnlyShaderController.d.ts +0 -6
  138. package/dist/src/render-drivers/main/MainOnlyShaderController.js +0 -15
  139. package/dist/src/render-drivers/main/MainOnlyShaderController.js.map +0 -1
  140. package/dist/src/render-drivers/main/MainOnlyShaderNode.d.ts +0 -7
  141. package/dist/src/render-drivers/main/MainOnlyShaderNode.js +0 -34
  142. package/dist/src/render-drivers/main/MainOnlyShaderNode.js.map +0 -1
  143. package/dist/src/render-drivers/main/MainOnlyTextNode.d.ts +0 -47
  144. package/dist/src/render-drivers/main/MainOnlyTextNode.js +0 -205
  145. package/dist/src/render-drivers/main/MainOnlyTextNode.js.map +0 -1
  146. package/dist/src/render-drivers/main/MainRenderDriver.d.ts +0 -17
  147. package/dist/src/render-drivers/main/MainRenderDriver.js +0 -88
  148. package/dist/src/render-drivers/main/MainRenderDriver.js.map +0 -1
  149. package/dist/src/render-drivers/threadx/NodeStruct.d.ts +0 -90
  150. package/dist/src/render-drivers/threadx/NodeStruct.js +0 -281
  151. package/dist/src/render-drivers/threadx/NodeStruct.js.map +0 -1
  152. package/dist/src/render-drivers/threadx/SharedNode.d.ts +0 -39
  153. package/dist/src/render-drivers/threadx/SharedNode.js +0 -60
  154. package/dist/src/render-drivers/threadx/SharedNode.js.map +0 -1
  155. package/dist/src/render-drivers/threadx/TextNodeStruct.d.ts +0 -44
  156. package/dist/src/render-drivers/threadx/TextNodeStruct.js +0 -201
  157. package/dist/src/render-drivers/threadx/TextNodeStruct.js.map +0 -1
  158. package/dist/src/render-drivers/threadx/ThreadXCoreDriver.d.ts +0 -28
  159. package/dist/src/render-drivers/threadx/ThreadXCoreDriver.js +0 -234
  160. package/dist/src/render-drivers/threadx/ThreadXCoreDriver.js.map +0 -1
  161. package/dist/src/render-drivers/threadx/ThreadXMainAnimationController.d.ts +0 -20
  162. package/dist/src/render-drivers/threadx/ThreadXMainAnimationController.js +0 -84
  163. package/dist/src/render-drivers/threadx/ThreadXMainAnimationController.js.map +0 -1
  164. package/dist/src/render-drivers/threadx/ThreadXMainNode.d.ts +0 -44
  165. package/dist/src/render-drivers/threadx/ThreadXMainNode.js +0 -154
  166. package/dist/src/render-drivers/threadx/ThreadXMainNode.js.map +0 -1
  167. package/dist/src/render-drivers/threadx/ThreadXMainShaderController.d.ts +0 -6
  168. package/dist/src/render-drivers/threadx/ThreadXMainShaderController.js +0 -16
  169. package/dist/src/render-drivers/threadx/ThreadXMainShaderController.js.map +0 -1
  170. package/dist/src/render-drivers/threadx/ThreadXMainShaderNode.d.ts +0 -7
  171. package/dist/src/render-drivers/threadx/ThreadXMainShaderNode.js +0 -15
  172. package/dist/src/render-drivers/threadx/ThreadXMainShaderNode.js.map +0 -1
  173. package/dist/src/render-drivers/threadx/ThreadXMainTextNode.d.ts +0 -28
  174. package/dist/src/render-drivers/threadx/ThreadXMainTextNode.js +0 -55
  175. package/dist/src/render-drivers/threadx/ThreadXMainTextNode.js.map +0 -1
  176. package/dist/src/render-drivers/threadx/ThreadXRenderDriver.d.ts +0 -21
  177. package/dist/src/render-drivers/threadx/ThreadXRenderDriver.js +0 -198
  178. package/dist/src/render-drivers/threadx/ThreadXRenderDriver.js.map +0 -1
  179. package/dist/src/render-drivers/threadx/ThreadXRendererMessage.d.ts +0 -70
  180. package/dist/src/render-drivers/threadx/ThreadXRendererMessage.js +0 -32
  181. package/dist/src/render-drivers/threadx/ThreadXRendererMessage.js.map +0 -1
  182. package/dist/src/render-drivers/threadx/worker/ThreadXRendererNode.d.ts +0 -19
  183. package/dist/src/render-drivers/threadx/worker/ThreadXRendererNode.js +0 -177
  184. package/dist/src/render-drivers/threadx/worker/ThreadXRendererNode.js.map +0 -1
  185. package/dist/src/render-drivers/threadx/worker/ThreadXRendererTextNode.d.ts +0 -27
  186. package/dist/src/render-drivers/threadx/worker/ThreadXRendererTextNode.js +0 -108
  187. package/dist/src/render-drivers/threadx/worker/ThreadXRendererTextNode.js.map +0 -1
  188. package/dist/src/render-drivers/threadx/worker/renderer.d.ts +0 -1
  189. package/dist/src/render-drivers/threadx/worker/renderer.js +0 -145
  190. package/dist/src/render-drivers/threadx/worker/renderer.js.map +0 -1
  191. package/dist/src/render-drivers/utils.d.ts +0 -12
  192. package/dist/src/render-drivers/utils.js +0 -69
  193. package/dist/src/render-drivers/utils.js.map +0 -1
@@ -30,9 +30,10 @@ import {
30
30
  type QuadOptions,
31
31
  } from '../CoreRenderer.js';
32
32
  import { CanvasCoreTexture } from './CanvasCoreTexture.js';
33
- import { getRadius } from './internal/C2DShaderUtils.js';
33
+ import { getBorder, getRadius, strokeLine } from './internal/C2DShaderUtils.js';
34
34
  import {
35
35
  formatRgba,
36
+ parseColorRgba,
36
37
  parseColor,
37
38
  type IParsedColor,
38
39
  } from './internal/ColorUtils.js';
@@ -133,7 +134,9 @@ export class CanvasCoreRenderer extends CoreRenderer {
133
134
  const hasTransform = ta !== 1;
134
135
  const hasClipping = clippingRect.width !== 0 && clippingRect.height !== 0;
135
136
  const hasGradient = colorTl !== colorTr || colorTl !== colorBr;
136
- const radius = quad.shader ? getRadius(quad) : 0;
137
+ const hasQuadShader = Boolean(quad.shader);
138
+ const radius = hasQuadShader ? getRadius(quad) : 0;
139
+ const border = hasQuadShader ? getBorder(quad) : undefined;
137
140
 
138
141
  if (hasTransform || hasClipping || radius) {
139
142
  ctx.save();
@@ -211,6 +214,92 @@ export class CanvasCoreRenderer extends CoreRenderer {
211
214
  ctx.fillRect(tx, ty, width, height);
212
215
  }
213
216
 
217
+ if (border && border.width) {
218
+ const borderWidth = border.width;
219
+ const borderInnerWidth = border.width / 2;
220
+ const borderColor = formatRgba(parseColorRgba(border.color ?? 0));
221
+
222
+ ctx.beginPath();
223
+ ctx.lineWidth = borderWidth;
224
+ ctx.strokeStyle = borderColor;
225
+ ctx.globalAlpha = alpha;
226
+ if (radius) {
227
+ ctx.roundRect(
228
+ tx + borderInnerWidth,
229
+ ty + borderInnerWidth,
230
+ width - borderWidth,
231
+ height - borderWidth,
232
+ radius,
233
+ );
234
+ ctx.stroke();
235
+ } else {
236
+ ctx.strokeRect(
237
+ tx + borderInnerWidth,
238
+ ty + borderInnerWidth,
239
+ width - borderWidth,
240
+ height - borderWidth,
241
+ );
242
+ }
243
+ ctx.globalAlpha = 1;
244
+ } else if (hasQuadShader) {
245
+ const borderTop = getBorder(quad, 'Top');
246
+ const borderRight = getBorder(quad, 'Right');
247
+ const borderBottom = getBorder(quad, 'Bottom');
248
+ const borderLeft = getBorder(quad, 'Left');
249
+
250
+ if (borderTop) {
251
+ strokeLine(
252
+ ctx,
253
+ tx,
254
+ ty,
255
+ width,
256
+ height,
257
+ borderTop.width,
258
+ borderTop.color,
259
+ 'Top',
260
+ );
261
+ }
262
+
263
+ if (borderRight) {
264
+ strokeLine(
265
+ ctx,
266
+ tx,
267
+ ty,
268
+ width,
269
+ height,
270
+ borderRight.width,
271
+ borderRight.color,
272
+ 'Right',
273
+ );
274
+ }
275
+
276
+ if (borderBottom) {
277
+ strokeLine(
278
+ ctx,
279
+ tx,
280
+ ty,
281
+ width,
282
+ height,
283
+ borderBottom.width,
284
+ borderBottom.color,
285
+ 'Bottom',
286
+ );
287
+ }
288
+
289
+ if (borderLeft) {
290
+ strokeLine(
291
+ ctx,
292
+ tx,
293
+ ty,
294
+ width,
295
+ height,
296
+ borderLeft.width,
297
+ borderLeft.color,
298
+ 'Left',
299
+ );
300
+ }
301
+ }
302
+
214
303
  if (hasTransform || hasClipping || radius) {
215
304
  ctx.restore();
216
305
  }
@@ -18,20 +18,121 @@
18
18
  */
19
19
 
20
20
  import type { QuadOptions } from '../../CoreRenderer.js';
21
+ import type { BorderEffectProps } from '../../webgl/shaders/effects/BorderEffect.js';
22
+ import type { RadiusEffectProps } from '../../webgl/shaders/effects/RadiusEffect.js';
23
+ import type { EffectDescUnion } from '../../webgl/shaders/effects/ShaderEffect.js';
21
24
  import {
22
25
  ROUNDED_RECTANGLE_SHADER_TYPE,
23
26
  UnsupportedShader,
24
27
  } from '../shaders/UnsupportedShader.js';
28
+ import { formatRgba, parseColorRgba } from './ColorUtils.js';
29
+
30
+ type Direction = 'Top' | 'Right' | 'Bottom' | 'Left';
25
31
 
26
32
  /**
27
33
  * Extract `RoundedRectangle` shader radius to apply as a clipping
28
34
  */
29
- export function getRadius(quad: QuadOptions): number {
35
+ export function getRadius(quad: QuadOptions): RadiusEffectProps['radius'] {
30
36
  if (quad.shader instanceof UnsupportedShader) {
31
37
  const shType = quad.shader.shType;
32
38
  if (shType === ROUNDED_RECTANGLE_SHADER_TYPE) {
33
39
  return (quad.shaderProps?.radius as number) ?? 0;
40
+ } else if (shType === 'DynamicShader') {
41
+ const effects = quad.shaderProps?.effects as
42
+ | EffectDescUnion[]
43
+ | undefined;
44
+
45
+ if (effects) {
46
+ const effect = effects.find((effect: EffectDescUnion) => {
47
+ return effect.type === 'radius' && effect?.props?.radius;
48
+ });
49
+
50
+ return (effect && effect.type === 'radius' && effect.props.radius) || 0;
51
+ }
34
52
  }
35
53
  }
36
54
  return 0;
37
55
  }
56
+
57
+ /**
58
+ * Extract `RoundedRectangle` shader radius to apply as a clipping */
59
+ export function getBorder(
60
+ quad: QuadOptions,
61
+ direction: '' | Direction = '',
62
+ ): BorderEffectProps | undefined {
63
+ if (quad.shader instanceof UnsupportedShader) {
64
+ const shType = quad.shader.shType;
65
+ if (shType === 'DynamicShader') {
66
+ const effects = quad.shaderProps?.effects as
67
+ | EffectDescUnion[]
68
+ | undefined;
69
+
70
+ if (effects && effects.length) {
71
+ const effect = effects.find((effect: EffectDescUnion) => {
72
+ return (
73
+ effect.type === `border${direction}` &&
74
+ effect.props &&
75
+ effect.props.width
76
+ );
77
+ });
78
+
79
+ return effect && effect.props;
80
+ }
81
+ }
82
+ }
83
+
84
+ return undefined;
85
+ }
86
+
87
+ export function strokeLine(
88
+ ctx: CanvasRenderingContext2D,
89
+ x: number,
90
+ y: number,
91
+ width: number,
92
+ height: number,
93
+ lineWidth = 0,
94
+ color: number | undefined,
95
+ direction: Direction,
96
+ ) {
97
+ if (!lineWidth) {
98
+ return;
99
+ }
100
+
101
+ let sx,
102
+ sy = 0;
103
+ let ex,
104
+ ey = 0;
105
+
106
+ switch (direction) {
107
+ case 'Top':
108
+ sx = x;
109
+ sy = y;
110
+ ex = width + x;
111
+ ey = y;
112
+ break;
113
+ case 'Right':
114
+ sx = x + width;
115
+ sy = y;
116
+ ex = x + width;
117
+ ey = y + height;
118
+ break;
119
+ case 'Bottom':
120
+ sx = x;
121
+ sy = y + height;
122
+ ex = x + width;
123
+ ey = y + height;
124
+ break;
125
+ case 'Left':
126
+ sx = x;
127
+ sy = y;
128
+ ex = x;
129
+ ey = y + height;
130
+ break;
131
+ }
132
+ ctx.beginPath();
133
+ ctx.lineWidth = lineWidth;
134
+ ctx.strokeStyle = formatRgba(parseColorRgba(color ?? 0));
135
+ ctx.moveTo(sx, sy);
136
+ ctx.lineTo(ex, ey);
137
+ ctx.stroke();
138
+ }
@@ -47,6 +47,20 @@ export function parseColor(abgr: number): IParsedColor {
47
47
  return { isWhite: false, a, r, g, b };
48
48
  }
49
49
 
50
+ /**
51
+ * Extract color components
52
+ */
53
+ export function parseColorRgba(rgba: number): IParsedColor {
54
+ if (rgba === 0xffffffff) {
55
+ return WHITE;
56
+ }
57
+ const r = (rgba >>> 24) & 0xff;
58
+ const g = (rgba >>> 16) & 0xff & 0xff;
59
+ const b = (rgba >>> 8) & 0xff & 0xff;
60
+ const a = (rgba & 0xff & 0xff) / 255;
61
+ return { isWhite: false, r, g, b, a };
62
+ }
63
+
50
64
  /**
51
65
  * Format a parsed color into a rgba CSS color
52
66
  */
@@ -27,9 +27,9 @@ export class UnsupportedShader extends CoreShader {
27
27
  constructor(shType: string) {
28
28
  super();
29
29
  this.shType = shType;
30
- if (shType !== ROUNDED_RECTANGLE_SHADER_TYPE) {
31
- console.warn('Unsupported shader:', shType);
32
- }
30
+ // if (shType !== ROUNDED_RECTANGLE_SHADER_TYPE) {
31
+ // console.warn('Unsupported shader:', shType);
32
+ // }
33
33
  }
34
34
 
35
35
  bindRenderOp(): void {
@@ -88,7 +88,10 @@ export class WebGlCoreCtxTexture extends CoreContextTexture {
88
88
  this._nativeCtxTexture = this.createNativeCtxTexture();
89
89
  if (this._nativeCtxTexture === null) {
90
90
  this._state = 'failed';
91
- this.textureSource.setState('failed', new Error('Could not create WebGL Texture'));
91
+ this.textureSource.setState(
92
+ 'failed',
93
+ new Error('Could not create WebGL Texture'),
94
+ );
92
95
  console.error('Could not create WebGL Texture');
93
96
  return;
94
97
  }
@@ -626,13 +626,88 @@ export class WebGlCoreRenderer extends CoreRenderer {
626
626
  }
627
627
  }
628
628
 
629
- // @todo: Better bottom up rendering order
630
- this.rttNodes.unshift(node);
629
+ this.insertRTTNodeInOrder(node);
630
+ }
631
+
632
+ /**
633
+ * Inserts an RTT node into `this.rttNodes` while maintaining the correct rendering order based on hierarchy.
634
+ *
635
+ * Rendering order for RTT nodes is critical when nested RTT nodes exist in a parent-child relationship.
636
+ * Specifically:
637
+ * - Child RTT nodes must be rendered before their RTT-enabled parents to ensure proper texture composition.
638
+ * - If an RTT node is added and it has existing RTT children, it should be rendered after those children.
639
+ *
640
+ * This function addresses both cases by:
641
+ * 1. **Checking Upwards**: It traverses the node's hierarchy upwards to identify any RTT parent
642
+ * already in `rttNodes`. If an RTT parent is found, the new node is placed before this parent.
643
+ * 2. **Checking Downwards**: It traverses the node’s children recursively to find any RTT-enabled
644
+ * children that are already in `rttNodes`. If such children are found, the new node is inserted
645
+ * after the last (highest index) RTT child node.
646
+ *
647
+ * The final calculated insertion index ensures the new node is positioned in `rttNodes` to respect
648
+ * both parent-before-child and child-before-parent rendering rules, preserving the correct order
649
+ * for the WebGL renderer.
650
+ *
651
+ * @param node - The RTT-enabled CoreNode to be added to `rttNodes` in the appropriate hierarchical position.
652
+ */
653
+ private insertRTTNodeInOrder(node: CoreNode) {
654
+ let insertIndex = this.rttNodes.length; // Default to the end of the array
655
+
656
+ // 1. Traverse upwards to ensure the node is placed before its RTT parent (if any).
657
+ let currentNode: CoreNode = node;
658
+ while (currentNode) {
659
+ if (!currentNode.parent) {
660
+ break;
661
+ }
662
+
663
+ const parentIndex = this.rttNodes.indexOf(currentNode.parent);
664
+ if (parentIndex !== -1) {
665
+ // Found an RTT parent in the list; set insertIndex to place node before the parent
666
+ insertIndex = parentIndex;
667
+ break;
668
+ }
669
+
670
+ currentNode = currentNode.parent;
671
+ }
672
+
673
+ // 2. Traverse downwards to ensure the node is placed after any RTT children.
674
+ // Look through each child recursively to see if any are already in rttNodes.
675
+ const maxChildIndex = this.findMaxChildRTTIndex(node);
676
+ if (maxChildIndex !== -1) {
677
+ // Adjust insertIndex to be after the last child RTT node
678
+ insertIndex = Math.max(insertIndex, maxChildIndex + 1);
679
+ }
680
+
681
+ // 3. Insert the node at the calculated position
682
+ this.rttNodes.splice(insertIndex, 0, node);
683
+ }
684
+
685
+ // Helper function to find the highest index of any RTT children of a node within rttNodes
686
+ private findMaxChildRTTIndex(node: CoreNode): number {
687
+ let maxIndex = -1;
688
+
689
+ const traverseChildren = (currentNode: CoreNode) => {
690
+ const currentIndex = this.rttNodes.indexOf(currentNode);
691
+ if (currentIndex !== -1) {
692
+ maxIndex = Math.max(maxIndex, currentIndex);
693
+ }
694
+
695
+ // Recursively check all children of the current node
696
+ for (const child of currentNode.children) {
697
+ traverseChildren(child);
698
+ }
699
+ };
700
+
701
+ // Start traversal directly with the provided node
702
+ traverseChildren(node);
703
+
704
+ return maxIndex;
631
705
  }
632
706
 
633
707
  renderRTTNodes() {
634
708
  const { glw } = this;
635
709
  const { txManager } = this.stage;
710
+
636
711
  // Render all associated RTT nodes to their textures
637
712
  for (let i = 0; i < this.rttNodes.length; i++) {
638
713
  const node = this.rttNodes[i];
@@ -662,16 +737,10 @@ export class WebGlCoreRenderer extends CoreRenderer {
662
737
  // Render all associated quads to the texture
663
738
  for (let i = 0; i < node.children.length; i++) {
664
739
  const child = node.children[i];
740
+
665
741
  if (!child) {
666
742
  continue;
667
743
  }
668
- child.update(this.stage.deltaTime, {
669
- x: 0,
670
- y: 0,
671
- width: 0,
672
- height: 0,
673
- valid: false,
674
- });
675
744
 
676
745
  this.stage.addQuads(child);
677
746
  child.hasRTTupdates = false;
@@ -16,13 +16,11 @@
16
16
  * See the License for the specific language governing permissions and
17
17
  * limitations under the License.
18
18
  */
19
- import type { DynamicShaderProps } from '../DynamicShader.js';
20
19
  import { updateWebSafeRadius, validateArrayLength4 } from './EffectUtils.js';
21
20
  import {
22
21
  ShaderEffect,
23
22
  type DefaultEffectProps,
24
23
  type ShaderEffectUniforms,
25
- type ShaderEffectValueMap,
26
24
  } from './ShaderEffect.js';
27
25
 
28
26
  /**
@@ -1,6 +1,5 @@
1
1
  import type { EffectMap } from '../../../../CoreShaderManager.js';
2
2
  import type { ExtractProps } from '../../../../CoreTextureManager.js';
3
- import type { WebGlContextWrapper } from '../../../../lib/WebGlContextWrapper.js';
4
3
  import type {
5
4
  AlphaShaderProp,
6
5
  DimensionsShaderProp,
@@ -1,74 +0,0 @@
1
- /**
2
- * Lightning 3 Renderer Core API
3
- *
4
- * @remarks
5
- * ```
6
- * import * from '@lightning/renderer/core';
7
- * ```
8
- *
9
- * The Core API is used by developers to extend the capabilities of the Renderer
10
- * by writing custom Shaders, Dynamic Shader Effects, Textures, Text Renderers,
11
- * etc.
12
- *
13
- * Custom capabilities as well as fonts can be loaded via Core Extensions.
14
- *
15
- * A core extension module is structured like so:
16
- * ```ts
17
- * import {
18
- * CoreExtension,
19
- * WebTrFontFace,
20
- * SdfTrFontFace,
21
- * type Stage
22
- * } from '@lightning/renderer/core';
23
- *
24
- * export default class MyCoreExtension extends CoreExtension {
25
- * async run(stage: Stage) {
26
- * stage.fontManager.addFontFace(
27
- * new WebTrFontFace('Ubuntu', {}, '/fonts/Ubuntu-Regular.ttf'),
28
- * );
29
- *
30
- * stage.fontManager.addFontFace(
31
- * new SdfTrFontFace(
32
- * 'Ubuntu',
33
- * {},
34
- * 'msdf',
35
- * stage,
36
- * '/fonts/Ubuntu-Regular.msdf.png',
37
- * '/fonts/Ubuntu-Regular.msdf.json',
38
- * ),
39
- * );
40
- * }
41
- * }
42
- * ```
43
- *
44
- * And then imported and registered in the application's entry point
45
- * using the `@lightningjs/vite-plugin-import-chunk-url` plugin:
46
- * ```ts
47
- * import coreExtensionModuleUrl from './MyCoreExtension.js?importChunkUrl';
48
- *
49
- * // Set up driver, etc.
50
- *
51
- * // Initialize the Renderer
52
- * const renderer = new RendererMain(
53
- * {
54
- * // Other Renderer Config...
55
- * coreExtensionModule: coreExtensionModuleUrl,
56
- * },
57
- * 'app',
58
- * driver,
59
- * );
60
- * ```
61
- *
62
- * @module
63
- */
64
- export * from '../src/core/renderers/webgl/WebGlCoreShader.js';
65
- export * from '../src/core/renderers/webgl/shaders/effects/ShaderEffect.js';
66
- export * from '../src/core/textures/Texture.js';
67
- export * from '../src/core/text-rendering/renderers/TextRenderer.js';
68
- export * from '../src/core/text-rendering/renderers/CanvasTextRenderer.js';
69
- export * from '../src/core/text-rendering/renderers/SdfTextRenderer/SdfTextRenderer.js';
70
- export * from '../src/core/text-rendering/font-face-types/TrFontFace.js';
71
- export * from '../src/core/text-rendering/font-face-types/WebTrFontFace.js';
72
- export * from '../src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.js';
73
- export * from '../src/core/CoreExtension.js';
74
- export type * from '../src/core/Stage.js';
@@ -1,96 +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
- /**
20
- * Lightning 3 Renderer Core API
21
- *
22
- * @remarks
23
- * ```
24
- * import * from '@lightning/renderer/core';
25
- * ```
26
- *
27
- * The Core API is used by developers to extend the capabilities of the Renderer
28
- * by writing custom Shaders, Dynamic Shader Effects, Textures, Text Renderers,
29
- * etc.
30
- *
31
- * Custom capabilities as well as fonts can be loaded via Core Extensions.
32
- *
33
- * A core extension module is structured like so:
34
- * ```ts
35
- * import {
36
- * CoreExtension,
37
- * WebTrFontFace,
38
- * SdfTrFontFace,
39
- * type Stage
40
- * } from '@lightning/renderer/core';
41
- *
42
- * export default class MyCoreExtension extends CoreExtension {
43
- * async run(stage: Stage) {
44
- * stage.fontManager.addFontFace(
45
- * new WebTrFontFace('Ubuntu', {}, '/fonts/Ubuntu-Regular.ttf'),
46
- * );
47
- *
48
- * stage.fontManager.addFontFace(
49
- * new SdfTrFontFace(
50
- * 'Ubuntu',
51
- * {},
52
- * 'msdf',
53
- * stage,
54
- * '/fonts/Ubuntu-Regular.msdf.png',
55
- * '/fonts/Ubuntu-Regular.msdf.json',
56
- * ),
57
- * );
58
- * }
59
- * }
60
- * ```
61
- *
62
- * And then imported and registered in the application's entry point
63
- * using the `@lightningjs/vite-plugin-import-chunk-url` plugin:
64
- * ```ts
65
- * import coreExtensionModuleUrl from './MyCoreExtension.js?importChunkUrl';
66
- *
67
- * // Set up driver, etc.
68
- *
69
- * // Initialize the Renderer
70
- * const renderer = new RendererMain(
71
- * {
72
- * // Other Renderer Config...
73
- * coreExtensionModule: coreExtensionModuleUrl,
74
- * },
75
- * 'app',
76
- * driver,
77
- * );
78
- * ```
79
- *
80
- * @module
81
- */
82
- // Shaders
83
- export * from '../src/core/renderers/webgl/WebGlCoreShader.js';
84
- export * from '../src/core/renderers/webgl/shaders/effects/ShaderEffect.js';
85
- // Textures
86
- export * from '../src/core/textures/Texture.js';
87
- // Text Rendering & Fonts
88
- export * from '../src/core/text-rendering/renderers/TextRenderer.js';
89
- export * from '../src/core/text-rendering/renderers/CanvasTextRenderer.js';
90
- export * from '../src/core/text-rendering/renderers/SdfTextRenderer/SdfTextRenderer.js';
91
- export * from '../src/core/text-rendering/font-face-types/TrFontFace.js';
92
- export * from '../src/core/text-rendering/font-face-types/WebTrFontFace.js';
93
- export * from '../src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.js';
94
- // Core Extensions
95
- export * from '../src/core/CoreExtension.js';
96
- //# sourceMappingURL=core-api.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"core-api.js","sourceRoot":"","sources":["../../exports/core-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DG;AAEH,UAAU;AACV,cAAc,gDAAgD,CAAC;AAC/D,cAAc,6DAA6D,CAAC;AAE5E,WAAW;AACX,cAAc,iCAAiC,CAAC;AAEhD,yBAAyB;AACzB,cAAc,sDAAsD,CAAC;AACrE,cAAc,4DAA4D,CAAC;AAC3E,cAAc,yEAAyE,CAAC;AACxF,cAAc,0DAA0D,CAAC;AACzE,cAAc,6DAA6D,CAAC;AAC5E,cAAc,2EAA2E,CAAC;AAE1F,kBAAkB;AAClB,cAAc,8BAA8B,CAAC"}
@@ -1,30 +0,0 @@
1
- /**
2
- * Lightning 3 Renderer Main API
3
- *
4
- * @remarks
5
- * This module exports the Main API for the Lightning 3 Renderer. You
6
- * can import the exports from this module like so:
7
- * ```ts
8
- * import { RendererMain } from '@lightning/renderer';
9
- * ```
10
- *
11
- * Generally developers/frameworks using the Renderer will use the Main API to
12
- * render applications.
13
- *
14
- * Do not confuse the Main API with the Core API which is used to extend
15
- * capabilities of the Renderer. The Main API code always runs from the main
16
- * thread.
17
- *
18
- * @module
19
- */
20
- export * from '../src/main-api/INode.js';
21
- export * from '../src/main-api/ICoreDriver.js';
22
- export * from '../src/main-api/RendererMain.js';
23
- export * from '../src/render-drivers/main/MainCoreDriver.js';
24
- export * from '../src/render-drivers/threadx/ThreadXCoreDriver.js';
25
- export * from '../src/common/IAnimationController.js';
26
- export * from '../src/common/CommonTypes.js';
27
- export type { TextRendererMap } from '../src/core/text-rendering/renderers/TextRenderer.js';
28
- export type { TrFontFaceMap } from '../src/core/text-rendering/font-face-types/TrFontFace.js';
29
- export type { AnimationSettings } from '../src/core/animations/CoreAnimation.js';
30
- export type { EffectProps, FadeOutEffectProps, LinearGradientEffectProps, RadialGradientEffectProps, GrayscaleEffectProps, GlitchEffectProps, RadialProgressEffectProps, } from '../src/core/CoreShaderManager.js';
@@ -1,45 +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
- /**
20
- * Lightning 3 Renderer Main API
21
- *
22
- * @remarks
23
- * This module exports the Main API for the Lightning 3 Renderer. You
24
- * can import the exports from this module like so:
25
- * ```ts
26
- * import { RendererMain } from '@lightning/renderer';
27
- * ```
28
- *
29
- * Generally developers/frameworks using the Renderer will use the Main API to
30
- * render applications.
31
- *
32
- * Do not confuse the Main API with the Core API which is used to extend
33
- * capabilities of the Renderer. The Main API code always runs from the main
34
- * thread.
35
- *
36
- * @module
37
- */
38
- export * from '../src/main-api/INode.js';
39
- export * from '../src/main-api/ICoreDriver.js';
40
- export * from '../src/main-api/RendererMain.js';
41
- export * from '../src/render-drivers/main/MainCoreDriver.js';
42
- export * from '../src/render-drivers/threadx/ThreadXCoreDriver.js';
43
- export * from '../src/common/IAnimationController.js';
44
- export * from '../src/common/CommonTypes.js';
45
- //# sourceMappingURL=main-api.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"main-api.js","sourceRoot":"","sources":["../../exports/main-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;;;;;;;;;GAkBG;AACH,cAAc,0BAA0B,CAAC;AACzC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,8CAA8C,CAAC;AAC7D,cAAc,oDAAoD,CAAC;AACnE,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC"}
@@ -1,12 +0,0 @@
1
- import type { Stage } from './Stage.js';
2
- /**
3
- * Base class for Core extensions.
4
- *
5
- * @remarks
6
- * Core extensions are used to extend the Core Renderer with custom code such as
7
- * custom fonts, custom shaders, custom textures, custom animation functions,
8
- * and more.
9
- */
10
- export declare abstract class CoreExtension {
11
- abstract run(stage: Stage): Promise<void>;
12
- }