@lightningjs/renderer 2.10.0 → 2.11.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 (327) hide show
  1. package/LICENSE +202 -202
  2. package/NOTICE +3 -3
  3. package/README.md +147 -147
  4. package/dist/exports/core-api.d.ts +74 -0
  5. package/dist/exports/core-api.js +96 -0
  6. package/dist/exports/core-api.js.map +1 -0
  7. package/dist/exports/main-api.d.ts +30 -0
  8. package/dist/exports/main-api.js +45 -0
  9. package/dist/exports/main-api.js.map +1 -0
  10. package/dist/src/core/CoreExtension.d.ts +12 -0
  11. package/dist/src/core/CoreExtension.js +29 -0
  12. package/dist/src/core/CoreExtension.js.map +1 -0
  13. package/dist/src/core/CoreStuff.d.ts +1 -0
  14. package/dist/src/core/CoreStuff.js +138 -0
  15. package/dist/src/core/CoreStuff.js.map +1 -0
  16. package/dist/src/core/CoreTextureManager.d.ts +4 -1
  17. package/dist/src/core/CoreTextureManager.js +14 -3
  18. package/dist/src/core/CoreTextureManager.js.map +1 -1
  19. package/dist/src/core/LngNode.d.ts +736 -0
  20. package/dist/src/core/LngNode.js +1174 -0
  21. package/dist/src/core/LngNode.js.map +1 -0
  22. package/dist/src/core/Matrix2DContext.d.ts +15 -0
  23. package/dist/src/core/Matrix2DContext.js +45 -0
  24. package/dist/src/core/Matrix2DContext.js.map +1 -0
  25. package/dist/src/core/ShaderNode.d.ts +10 -0
  26. package/dist/src/core/ShaderNode.js +30 -0
  27. package/dist/src/core/ShaderNode.js.map +1 -0
  28. package/dist/src/core/Stage.js +1 -1
  29. package/dist/src/core/Stage.js.map +1 -1
  30. package/dist/src/core/TextNode.d.ts +103 -0
  31. package/dist/src/core/TextNode.js +331 -0
  32. package/dist/src/core/TextNode.js.map +1 -0
  33. package/dist/src/core/TextureMemoryManager.d.ts +30 -0
  34. package/dist/src/core/TextureMemoryManager.js +58 -38
  35. package/dist/src/core/TextureMemoryManager.js.map +1 -1
  36. package/dist/src/core/lib/Coords.d.ts +14 -0
  37. package/dist/src/core/lib/Coords.js +55 -0
  38. package/dist/src/core/lib/Coords.js.map +1 -0
  39. package/dist/src/core/lib/glm/common.d.ts +162 -0
  40. package/dist/src/core/lib/glm/common.js +81 -0
  41. package/dist/src/core/lib/glm/common.js.map +1 -0
  42. package/dist/src/core/lib/glm/index.d.ts +11 -0
  43. package/dist/src/core/lib/glm/index.js +30 -0
  44. package/dist/src/core/lib/glm/index.js.map +1 -0
  45. package/dist/src/core/lib/glm/mat2.d.ts +219 -0
  46. package/dist/src/core/lib/glm/mat2.js +396 -0
  47. package/dist/src/core/lib/glm/mat2.js.map +1 -0
  48. package/dist/src/core/lib/glm/mat2d.d.ts +237 -0
  49. package/dist/src/core/lib/glm/mat2d.js +442 -0
  50. package/dist/src/core/lib/glm/mat2d.js.map +1 -0
  51. package/dist/src/core/lib/glm/mat3.d.ts +283 -0
  52. package/dist/src/core/lib/glm/mat3.js +680 -0
  53. package/dist/src/core/lib/glm/mat3.js.map +1 -0
  54. package/dist/src/core/lib/glm/mat4.d.ts +550 -0
  55. package/dist/src/core/lib/glm/mat4.js +1802 -0
  56. package/dist/src/core/lib/glm/mat4.js.map +1 -0
  57. package/dist/src/core/lib/glm/quat.d.ts +363 -0
  58. package/dist/src/core/lib/glm/quat.js +693 -0
  59. package/dist/src/core/lib/glm/quat.js.map +1 -0
  60. package/dist/src/core/lib/glm/quat2.d.ts +356 -0
  61. package/dist/src/core/lib/glm/quat2.js +754 -0
  62. package/dist/src/core/lib/glm/quat2.js.map +1 -0
  63. package/dist/src/core/lib/glm/vec2.d.ts +365 -0
  64. package/dist/src/core/lib/glm/vec2.js +569 -0
  65. package/dist/src/core/lib/glm/vec2.js.map +1 -0
  66. package/dist/src/core/lib/glm/vec3.d.ts +406 -0
  67. package/dist/src/core/lib/glm/vec3.js +720 -0
  68. package/dist/src/core/lib/glm/vec3.js.map +1 -0
  69. package/dist/src/core/lib/glm/vec4.d.ts +330 -0
  70. package/dist/src/core/lib/glm/vec4.js +608 -0
  71. package/dist/src/core/lib/glm/vec4.js.map +1 -0
  72. package/dist/src/core/lib/textureSvg.js +1 -1
  73. package/dist/src/core/lib/textureSvg.js.map +1 -1
  74. package/dist/src/core/renderers/CoreShaderManager.d.ts +19 -0
  75. package/dist/src/core/renderers/CoreShaderManager.js +33 -0
  76. package/dist/src/core/renderers/CoreShaderManager.js.map +1 -0
  77. package/dist/src/core/renderers/canvas/CanvasCoreRenderer.js +4 -2
  78. package/dist/src/core/renderers/canvas/CanvasCoreRenderer.js.map +1 -1
  79. package/dist/src/core/renderers/canvas/CanvasCoreTexture.js +4 -4
  80. package/dist/src/core/renderers/canvas/CanvasCoreTexture.js.map +1 -1
  81. package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.js +9 -12
  82. package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.js.map +1 -1
  83. package/dist/src/core/renderers/webgl/WebGlCoreShaderManager.d.ts +27 -0
  84. package/dist/src/core/renderers/webgl/WebGlCoreShaderManager.js +82 -0
  85. package/dist/src/core/renderers/webgl/WebGlCoreShaderManager.js.map +1 -0
  86. package/dist/src/core/renderers/webgl/WebGlCoreShaderProgram.d.ts +11 -0
  87. package/dist/src/core/renderers/webgl/WebGlCoreShaderProgram.js +34 -0
  88. package/dist/src/core/renderers/webgl/WebGlCoreShaderProgram.js.map +1 -0
  89. package/dist/src/core/renderers/webgl/shaders/DefaultShader.js +45 -45
  90. package/dist/src/core/renderers/webgl/shaders/DefaultShaderBatched.js +61 -61
  91. package/dist/src/core/renderers/webgl/shaders/DynamicShader.js +93 -93
  92. package/dist/src/core/renderers/webgl/shaders/RoundedRectangle.js +63 -63
  93. package/dist/src/core/renderers/webgl/shaders/SdfShader.js +62 -62
  94. package/dist/src/core/renderers/webgl/shaders/effects/BorderBottomEffect.js +15 -15
  95. package/dist/src/core/renderers/webgl/shaders/effects/BorderEffect.js +6 -6
  96. package/dist/src/core/renderers/webgl/shaders/effects/BorderLeftEffect.js +15 -15
  97. package/dist/src/core/renderers/webgl/shaders/effects/BorderRightEffect.js +15 -15
  98. package/dist/src/core/renderers/webgl/shaders/effects/BorderTopEffect.js +15 -15
  99. package/dist/src/core/renderers/webgl/shaders/effects/FadeOutEffect.js +42 -42
  100. package/dist/src/core/renderers/webgl/shaders/effects/GlitchEffect.js +44 -44
  101. package/dist/src/core/renderers/webgl/shaders/effects/GrayscaleEffect.js +3 -3
  102. package/dist/src/core/renderers/webgl/shaders/effects/HolePunchEffect.js +22 -22
  103. package/dist/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.js +28 -28
  104. package/dist/src/core/renderers/webgl/shaders/effects/RadialGradientEffect.js +10 -10
  105. package/dist/src/core/renderers/webgl/shaders/effects/RadialProgressEffect.js +37 -37
  106. package/dist/src/core/renderers/webgl/shaders/effects/RadiusEffect.js +19 -19
  107. package/dist/src/core/scene/Scene.d.ts +59 -0
  108. package/dist/src/core/scene/Scene.js +106 -0
  109. package/dist/src/core/scene/Scene.js.map +1 -0
  110. package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/makeRenderWindow.d.ts +20 -0
  111. package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/makeRenderWindow.js +55 -0
  112. package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/makeRenderWindow.js.map +1 -0
  113. package/dist/src/core/textures/ColorTexture.js +1 -1
  114. package/dist/src/core/textures/ColorTexture.js.map +1 -1
  115. package/dist/src/core/textures/ImageTexture.js +3 -3
  116. package/dist/src/core/textures/ImageTexture.js.map +1 -1
  117. package/dist/src/core/textures/NoiseTexture.js +1 -1
  118. package/dist/src/core/textures/NoiseTexture.js.map +1 -1
  119. package/dist/src/core/textures/RenderTexture.js +1 -1
  120. package/dist/src/core/textures/RenderTexture.js.map +1 -1
  121. package/dist/src/core/textures/SubTexture.d.ts +4 -0
  122. package/dist/src/core/textures/SubTexture.js +54 -16
  123. package/dist/src/core/textures/SubTexture.js.map +1 -1
  124. package/dist/src/core/textures/Texture.d.ts +2 -34
  125. package/dist/src/core/textures/Texture.js +13 -69
  126. package/dist/src/core/textures/Texture.js.map +1 -1
  127. package/dist/src/main-api/ICoreDriver.d.ts +27 -0
  128. package/dist/src/main-api/ICoreDriver.js +20 -0
  129. package/dist/src/main-api/ICoreDriver.js.map +1 -0
  130. package/dist/src/main-api/IRenderDriver.d.ts +20 -0
  131. package/dist/src/main-api/IRenderDriver.js +20 -0
  132. package/dist/src/main-api/IRenderDriver.js.map +1 -0
  133. package/dist/src/main-api/IShaderController.d.ts +14 -0
  134. package/dist/src/main-api/IShaderController.js +30 -0
  135. package/dist/src/main-api/IShaderController.js.map +1 -0
  136. package/dist/src/main-api/IShaderNode.d.ts +17 -0
  137. package/dist/src/main-api/IShaderNode.js +19 -0
  138. package/dist/src/main-api/IShaderNode.js.map +1 -0
  139. package/dist/src/main-api/Renderer.js +1 -0
  140. package/dist/src/main-api/Renderer.js.map +1 -1
  141. package/dist/src/main-api/RendererMain.d.ts +375 -0
  142. package/dist/src/main-api/RendererMain.js +365 -0
  143. package/dist/src/main-api/RendererMain.js.map +1 -0
  144. package/dist/src/main-api/texture-usage-trackers/FinalizationRegistryTextureUsageTracker.d.ts +9 -0
  145. package/dist/src/main-api/texture-usage-trackers/FinalizationRegistryTextureUsageTracker.js +38 -0
  146. package/dist/src/main-api/texture-usage-trackers/FinalizationRegistryTextureUsageTracker.js.map +1 -0
  147. package/dist/src/main-api/texture-usage-trackers/ManualCountTextureUsageTracker.d.ts +56 -0
  148. package/dist/src/main-api/texture-usage-trackers/ManualCountTextureUsageTracker.js +101 -0
  149. package/dist/src/main-api/texture-usage-trackers/ManualCountTextureUsageTracker.js.map +1 -0
  150. package/dist/src/main-api/texture-usage-trackers/TextureUsageTracker.d.ts +32 -0
  151. package/dist/src/main-api/texture-usage-trackers/TextureUsageTracker.js +28 -0
  152. package/dist/src/main-api/texture-usage-trackers/TextureUsageTracker.js.map +1 -0
  153. package/dist/src/render-drivers/main/MainCoreDriver.d.ts +24 -0
  154. package/dist/src/render-drivers/main/MainCoreDriver.js +118 -0
  155. package/dist/src/render-drivers/main/MainCoreDriver.js.map +1 -0
  156. package/dist/src/render-drivers/main/MainOnlyNode.d.ts +99 -0
  157. package/dist/src/render-drivers/main/MainOnlyNode.js +396 -0
  158. package/dist/src/render-drivers/main/MainOnlyNode.js.map +1 -0
  159. package/dist/src/render-drivers/main/MainOnlyShaderController.d.ts +6 -0
  160. package/dist/src/render-drivers/main/MainOnlyShaderController.js +15 -0
  161. package/dist/src/render-drivers/main/MainOnlyShaderController.js.map +1 -0
  162. package/dist/src/render-drivers/main/MainOnlyShaderNode.d.ts +7 -0
  163. package/dist/src/render-drivers/main/MainOnlyShaderNode.js +34 -0
  164. package/dist/src/render-drivers/main/MainOnlyShaderNode.js.map +1 -0
  165. package/dist/src/render-drivers/main/MainOnlyTextNode.d.ts +47 -0
  166. package/dist/src/render-drivers/main/MainOnlyTextNode.js +205 -0
  167. package/dist/src/render-drivers/main/MainOnlyTextNode.js.map +1 -0
  168. package/dist/src/render-drivers/main/MainRenderDriver.d.ts +17 -0
  169. package/dist/src/render-drivers/main/MainRenderDriver.js +88 -0
  170. package/dist/src/render-drivers/main/MainRenderDriver.js.map +1 -0
  171. package/dist/src/render-drivers/threadx/NodeStruct.d.ts +90 -0
  172. package/dist/src/render-drivers/threadx/NodeStruct.js +281 -0
  173. package/dist/src/render-drivers/threadx/NodeStruct.js.map +1 -0
  174. package/dist/src/render-drivers/threadx/SharedNode.d.ts +39 -0
  175. package/dist/src/render-drivers/threadx/SharedNode.js +60 -0
  176. package/dist/src/render-drivers/threadx/SharedNode.js.map +1 -0
  177. package/dist/src/render-drivers/threadx/TextNodeStruct.d.ts +44 -0
  178. package/dist/src/render-drivers/threadx/TextNodeStruct.js +201 -0
  179. package/dist/src/render-drivers/threadx/TextNodeStruct.js.map +1 -0
  180. package/dist/src/render-drivers/threadx/ThreadXCoreDriver.d.ts +28 -0
  181. package/dist/src/render-drivers/threadx/ThreadXCoreDriver.js +234 -0
  182. package/dist/src/render-drivers/threadx/ThreadXCoreDriver.js.map +1 -0
  183. package/dist/src/render-drivers/threadx/ThreadXMainAnimationController.d.ts +20 -0
  184. package/dist/src/render-drivers/threadx/ThreadXMainAnimationController.js +84 -0
  185. package/dist/src/render-drivers/threadx/ThreadXMainAnimationController.js.map +1 -0
  186. package/dist/src/render-drivers/threadx/ThreadXMainNode.d.ts +44 -0
  187. package/dist/src/render-drivers/threadx/ThreadXMainNode.js +154 -0
  188. package/dist/src/render-drivers/threadx/ThreadXMainNode.js.map +1 -0
  189. package/dist/src/render-drivers/threadx/ThreadXMainShaderController.d.ts +6 -0
  190. package/dist/src/render-drivers/threadx/ThreadXMainShaderController.js +16 -0
  191. package/dist/src/render-drivers/threadx/ThreadXMainShaderController.js.map +1 -0
  192. package/dist/src/render-drivers/threadx/ThreadXMainShaderNode.d.ts +7 -0
  193. package/dist/src/render-drivers/threadx/ThreadXMainShaderNode.js +15 -0
  194. package/dist/src/render-drivers/threadx/ThreadXMainShaderNode.js.map +1 -0
  195. package/dist/src/render-drivers/threadx/ThreadXMainTextNode.d.ts +28 -0
  196. package/dist/src/render-drivers/threadx/ThreadXMainTextNode.js +55 -0
  197. package/dist/src/render-drivers/threadx/ThreadXMainTextNode.js.map +1 -0
  198. package/dist/src/render-drivers/threadx/ThreadXRenderDriver.d.ts +21 -0
  199. package/dist/src/render-drivers/threadx/ThreadXRenderDriver.js +198 -0
  200. package/dist/src/render-drivers/threadx/ThreadXRenderDriver.js.map +1 -0
  201. package/dist/src/render-drivers/threadx/ThreadXRendererMessage.d.ts +70 -0
  202. package/dist/src/render-drivers/threadx/ThreadXRendererMessage.js +32 -0
  203. package/dist/src/render-drivers/threadx/ThreadXRendererMessage.js.map +1 -0
  204. package/dist/src/render-drivers/threadx/worker/ThreadXRendererNode.d.ts +19 -0
  205. package/dist/src/render-drivers/threadx/worker/ThreadXRendererNode.js +177 -0
  206. package/dist/src/render-drivers/threadx/worker/ThreadXRendererNode.js.map +1 -0
  207. package/dist/src/render-drivers/threadx/worker/ThreadXRendererTextNode.d.ts +27 -0
  208. package/dist/src/render-drivers/threadx/worker/ThreadXRendererTextNode.js +108 -0
  209. package/dist/src/render-drivers/threadx/worker/ThreadXRendererTextNode.js.map +1 -0
  210. package/dist/src/render-drivers/threadx/worker/renderer.d.ts +1 -0
  211. package/dist/src/render-drivers/threadx/worker/renderer.js +145 -0
  212. package/dist/src/render-drivers/threadx/worker/renderer.js.map +1 -0
  213. package/dist/src/render-drivers/utils.d.ts +12 -0
  214. package/dist/src/render-drivers/utils.js +69 -0
  215. package/dist/src/render-drivers/utils.js.map +1 -0
  216. package/dist/tsconfig.dist.tsbuildinfo +1 -1
  217. package/exports/canvas.ts +39 -39
  218. package/exports/index.ts +89 -89
  219. package/exports/inspector.ts +24 -24
  220. package/exports/utils.ts +44 -44
  221. package/exports/webgl.ts +38 -38
  222. package/package.json +2 -1
  223. package/scripts/please-use-pnpm.js +13 -13
  224. package/src/common/CommonTypes.ts +139 -139
  225. package/src/common/EventEmitter.ts +77 -77
  226. package/src/common/IAnimationController.ts +92 -92
  227. package/src/common/IEventEmitter.ts +28 -28
  228. package/src/core/CoreNode.test.ts +199 -199
  229. package/src/core/CoreNode.ts +2335 -2335
  230. package/src/core/CoreShaderManager.ts +292 -292
  231. package/src/core/CoreTextNode.ts +455 -455
  232. package/src/core/CoreTextureManager.ts +561 -545
  233. package/src/core/Stage.ts +700 -700
  234. package/src/core/TextureMemoryManager.ts +292 -277
  235. package/src/core/animations/AnimationManager.ts +38 -38
  236. package/src/core/animations/CoreAnimation.ts +340 -340
  237. package/src/core/animations/CoreAnimationController.ts +157 -157
  238. package/src/core/lib/ContextSpy.ts +41 -41
  239. package/src/core/lib/ImageWorker.ts +270 -270
  240. package/src/core/lib/Matrix3d.ts +244 -244
  241. package/src/core/lib/RenderCoords.ts +86 -86
  242. package/src/core/lib/WebGlContextWrapper.ts +1322 -1322
  243. package/src/core/lib/textureCompression.ts +152 -152
  244. package/src/core/lib/textureSvg.ts +78 -78
  245. package/src/core/lib/utils.ts +310 -310
  246. package/src/core/platform.ts +61 -61
  247. package/src/core/renderers/CoreContextTexture.ts +43 -43
  248. package/src/core/renderers/CoreRenderOp.ts +22 -22
  249. package/src/core/renderers/CoreRenderer.ts +114 -114
  250. package/src/core/renderers/CoreShader.ts +41 -41
  251. package/src/core/renderers/canvas/CanvasCoreRenderer.ts +371 -369
  252. package/src/core/renderers/canvas/CanvasCoreTexture.ts +150 -150
  253. package/src/core/renderers/canvas/internal/C2DShaderUtils.ts +231 -231
  254. package/src/core/renderers/canvas/internal/ColorUtils.ts +69 -69
  255. package/src/core/renderers/canvas/shaders/UnsupportedShader.ts +48 -48
  256. package/src/core/renderers/webgl/WebGlCoreCtxRenderTexture.ts +79 -79
  257. package/src/core/renderers/webgl/WebGlCoreCtxSubTexture.ts +50 -50
  258. package/src/core/renderers/webgl/WebGlCoreCtxTexture.ts +295 -298
  259. package/src/core/renderers/webgl/WebGlCoreRenderOp.ts +125 -125
  260. package/src/core/renderers/webgl/WebGlCoreRenderer.ts +805 -805
  261. package/src/core/renderers/webgl/WebGlCoreShader.ts +362 -362
  262. package/src/core/renderers/webgl/internal/BufferCollection.ts +54 -54
  263. package/src/core/renderers/webgl/internal/RendererUtils.ts +155 -155
  264. package/src/core/renderers/webgl/internal/ShaderUtils.ts +143 -143
  265. package/src/core/renderers/webgl/internal/WebGlUtils.ts +35 -35
  266. package/src/core/renderers/webgl/shaders/DefaultShader.ts +93 -93
  267. package/src/core/renderers/webgl/shaders/DefaultShaderBatched.ts +132 -132
  268. package/src/core/renderers/webgl/shaders/DynamicShader.ts +580 -580
  269. package/src/core/renderers/webgl/shaders/RoundedRectangle.ts +167 -167
  270. package/src/core/renderers/webgl/shaders/SdfShader.ts +204 -204
  271. package/src/core/renderers/webgl/shaders/effects/BorderBottomEffect.ts +101 -101
  272. package/src/core/renderers/webgl/shaders/effects/BorderEffect.ts +87 -87
  273. package/src/core/renderers/webgl/shaders/effects/BorderLeftEffect.ts +101 -101
  274. package/src/core/renderers/webgl/shaders/effects/BorderRightEffect.ts +101 -101
  275. package/src/core/renderers/webgl/shaders/effects/BorderTopEffect.ts +101 -101
  276. package/src/core/renderers/webgl/shaders/effects/EffectUtils.ts +159 -159
  277. package/src/core/renderers/webgl/shaders/effects/FadeOutEffect.ts +127 -127
  278. package/src/core/renderers/webgl/shaders/effects/GlitchEffect.ts +148 -148
  279. package/src/core/renderers/webgl/shaders/effects/GrayscaleEffect.ts +67 -67
  280. package/src/core/renderers/webgl/shaders/effects/HolePunchEffect.ts +157 -157
  281. package/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.ts +171 -171
  282. package/src/core/renderers/webgl/shaders/effects/RadialGradientEffect.ts +168 -168
  283. package/src/core/renderers/webgl/shaders/effects/RadialProgressEffect.ts +187 -187
  284. package/src/core/renderers/webgl/shaders/effects/RadiusEffect.ts +110 -110
  285. package/src/core/renderers/webgl/shaders/effects/ShaderEffect.ts +196 -196
  286. package/src/core/text-rendering/TextRenderingUtils.ts +36 -36
  287. package/src/core/text-rendering/TextTextureRendererUtils.ts +263 -263
  288. package/src/core/text-rendering/TrFontManager.ts +183 -183
  289. package/src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.ts +176 -176
  290. package/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/FontShaper.ts +139 -139
  291. package/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.test.ts +173 -173
  292. package/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.ts +171 -171
  293. package/src/core/text-rendering/font-face-types/TrFontFace.ts +187 -187
  294. package/src/core/text-rendering/font-face-types/WebTrFontFace.ts +94 -94
  295. package/src/core/text-rendering/renderers/CanvasTextRenderer.ts +509 -509
  296. package/src/core/text-rendering/renderers/LightningTextTextureRenderer.ts +808 -808
  297. package/src/core/text-rendering/renderers/SdfTextRenderer/SdfTextRenderer.ts +853 -853
  298. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/PeekableGenerator.test.ts +48 -48
  299. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/PeekableGenerator.ts +66 -66
  300. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/SpecialCodepoints.ts +52 -52
  301. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/constants.ts +32 -32
  302. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/getStartConditions.ts +117 -117
  303. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/getUnicodeCodepoints.test.ts +133 -133
  304. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/getUnicodeCodepoints.ts +38 -38
  305. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/layoutText.ts +408 -408
  306. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/measureText.test.ts +49 -49
  307. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/measureText.ts +52 -52
  308. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/setRenderWindow.test.ts +205 -205
  309. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/setRenderWindow.ts +93 -93
  310. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/util.ts +40 -40
  311. package/src/core/text-rendering/renderers/TextRenderer.ts +557 -557
  312. package/src/core/textures/ColorTexture.ts +102 -102
  313. package/src/core/textures/ImageTexture.ts +379 -379
  314. package/src/core/textures/NoiseTexture.ts +104 -104
  315. package/src/core/textures/RenderTexture.ts +85 -85
  316. package/src/core/textures/SubTexture.ts +225 -179
  317. package/src/core/textures/Texture.ts +347 -435
  318. package/src/core/utils.ts +227 -227
  319. package/src/env.d.ts +7 -7
  320. package/src/main-api/DynamicShaderController.ts +104 -104
  321. package/src/main-api/INode.ts +101 -101
  322. package/src/main-api/Inspector.ts +505 -505
  323. package/src/main-api/Renderer.ts +698 -694
  324. package/src/main-api/ShaderController.ts +80 -80
  325. package/src/main-api/utils.ts +45 -45
  326. package/src/utils.ts +248 -248
  327. package/COPYING +0 -1
@@ -1,139 +1,139 @@
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
- import type { CoreNodeRenderState } from '../core/CoreNode.js';
21
-
22
- /**
23
- * Types shared between Main Space and Core Space
24
- *
25
- * @remarks
26
- *
27
- * @module
28
- */
29
-
30
- /**
31
- * Represents a width and height.
32
- */
33
- export interface Dimensions {
34
- width: number;
35
- height: number;
36
- }
37
-
38
- /**
39
- * Payload for when text is loaded
40
- */
41
- export type NodeTextLoadedPayload = {
42
- type: 'text';
43
- dimensions: Dimensions;
44
- };
45
-
46
- /**
47
- * Payload for when texture is loaded
48
- */
49
- export type NodeTextureLoadedPayload = {
50
- type: 'texture';
51
- dimensions: Dimensions;
52
- };
53
-
54
- /**
55
- * Combined type for all loaded payloads
56
- */
57
- export type NodeLoadedPayload =
58
- | NodeTextLoadedPayload
59
- | NodeTextureLoadedPayload;
60
-
61
- /**
62
- * Payload for when text failed to load
63
- */
64
- export type NodeTextFailedPayload = {
65
- type: 'text';
66
- error: Error;
67
- };
68
-
69
- /**
70
- * Payload for when texture failed to load
71
- */
72
- export type NodeTextureFailedPayload = {
73
- type: 'texture';
74
- error: Error;
75
- };
76
-
77
- /**
78
- * Payload for when texture failed to load
79
- */
80
- export type NodeTextureFreedPayload = {
81
- type: 'texture';
82
- };
83
-
84
- /**
85
- * Combined type for all failed payloads
86
- */
87
- export type NodeFailedPayload =
88
- | NodeTextFailedPayload
89
- | NodeTextureFailedPayload;
90
-
91
- /**
92
- * Event handler for when the texture/text of a node has loaded
93
- */
94
- export type NodeLoadedEventHandler = (
95
- target: any,
96
- payload: NodeLoadedPayload,
97
- ) => void;
98
-
99
- /**
100
- * Event handler for when the texture/text of a node has failed to load
101
- */
102
- export type NodeFailedEventHandler = (
103
- target: any,
104
- payload: NodeFailedPayload,
105
- ) => void;
106
-
107
- export type NodeRenderStatePayload = {
108
- type: 'renderState';
109
- payload: CoreNodeRenderState;
110
- };
111
-
112
- export type NodeRenderStateEventHandler = (
113
- target: any,
114
- payload: NodeRenderStatePayload,
115
- ) => void;
116
-
117
- /**
118
- * Event payload for when an FpsUpdate event is emitted by either the Stage or
119
- * MainRenderer
120
- */
121
- export interface FpsUpdatePayload {
122
- fps: number;
123
- contextSpyData: Record<string, number> | null;
124
- }
125
-
126
- /**
127
- * Event payload for when a frame tick event is emitted by the Stage
128
- */
129
- export interface FrameTickPayload {
130
- time: number;
131
- delta: number;
132
- }
133
-
134
- /**
135
- * Event payload for when a an animtion tick event is emitted
136
- */
137
- export interface AnimationTickPayload {
138
- progress: number;
139
- }
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
+ import type { CoreNodeRenderState } from '../core/CoreNode.js';
21
+
22
+ /**
23
+ * Types shared between Main Space and Core Space
24
+ *
25
+ * @remarks
26
+ *
27
+ * @module
28
+ */
29
+
30
+ /**
31
+ * Represents a width and height.
32
+ */
33
+ export interface Dimensions {
34
+ width: number;
35
+ height: number;
36
+ }
37
+
38
+ /**
39
+ * Payload for when text is loaded
40
+ */
41
+ export type NodeTextLoadedPayload = {
42
+ type: 'text';
43
+ dimensions: Dimensions;
44
+ };
45
+
46
+ /**
47
+ * Payload for when texture is loaded
48
+ */
49
+ export type NodeTextureLoadedPayload = {
50
+ type: 'texture';
51
+ dimensions: Dimensions;
52
+ };
53
+
54
+ /**
55
+ * Combined type for all loaded payloads
56
+ */
57
+ export type NodeLoadedPayload =
58
+ | NodeTextLoadedPayload
59
+ | NodeTextureLoadedPayload;
60
+
61
+ /**
62
+ * Payload for when text failed to load
63
+ */
64
+ export type NodeTextFailedPayload = {
65
+ type: 'text';
66
+ error: Error;
67
+ };
68
+
69
+ /**
70
+ * Payload for when texture failed to load
71
+ */
72
+ export type NodeTextureFailedPayload = {
73
+ type: 'texture';
74
+ error: Error;
75
+ };
76
+
77
+ /**
78
+ * Payload for when texture failed to load
79
+ */
80
+ export type NodeTextureFreedPayload = {
81
+ type: 'texture';
82
+ };
83
+
84
+ /**
85
+ * Combined type for all failed payloads
86
+ */
87
+ export type NodeFailedPayload =
88
+ | NodeTextFailedPayload
89
+ | NodeTextureFailedPayload;
90
+
91
+ /**
92
+ * Event handler for when the texture/text of a node has loaded
93
+ */
94
+ export type NodeLoadedEventHandler = (
95
+ target: any,
96
+ payload: NodeLoadedPayload,
97
+ ) => void;
98
+
99
+ /**
100
+ * Event handler for when the texture/text of a node has failed to load
101
+ */
102
+ export type NodeFailedEventHandler = (
103
+ target: any,
104
+ payload: NodeFailedPayload,
105
+ ) => void;
106
+
107
+ export type NodeRenderStatePayload = {
108
+ type: 'renderState';
109
+ payload: CoreNodeRenderState;
110
+ };
111
+
112
+ export type NodeRenderStateEventHandler = (
113
+ target: any,
114
+ payload: NodeRenderStatePayload,
115
+ ) => void;
116
+
117
+ /**
118
+ * Event payload for when an FpsUpdate event is emitted by either the Stage or
119
+ * MainRenderer
120
+ */
121
+ export interface FpsUpdatePayload {
122
+ fps: number;
123
+ contextSpyData: Record<string, number> | null;
124
+ }
125
+
126
+ /**
127
+ * Event payload for when a frame tick event is emitted by the Stage
128
+ */
129
+ export interface FrameTickPayload {
130
+ time: number;
131
+ delta: number;
132
+ }
133
+
134
+ /**
135
+ * Event payload for when a an animtion tick event is emitted
136
+ */
137
+ export interface AnimationTickPayload {
138
+ progress: number;
139
+ }
@@ -1,77 +1,77 @@
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
- /* eslint-disable @typescript-eslint/no-unsafe-member-access */
21
- /* eslint-disable @typescript-eslint/no-unsafe-assignment */
22
- /* eslint-disable @typescript-eslint/no-unsafe-call */
23
- /* eslint-disable @typescript-eslint/no-explicit-any */
24
- import type { IEventEmitter } from './IEventEmitter.js';
25
-
26
- /**
27
- * EventEmitter base class
28
- */
29
- export class EventEmitter implements IEventEmitter {
30
- private eventListeners: { [eventName: string]: any } = {};
31
-
32
- on(event: string, listener: (target: any, data: any) => void): void {
33
- let listeners = this.eventListeners[event];
34
- if (!listeners) {
35
- listeners = [];
36
- }
37
- listeners.push(listener);
38
- this.eventListeners[event] = listeners;
39
- }
40
-
41
- off(event: string, listener?: (target: any, data: any) => void): void {
42
- const listeners = this.eventListeners[event];
43
- if (!listeners) {
44
- return;
45
- }
46
- if (!listener) {
47
- delete this.eventListeners[event];
48
- return;
49
- }
50
- const index = listeners.indexOf(listener);
51
- if (index >= 0) {
52
- listeners.splice(index, 1);
53
- }
54
- }
55
-
56
- once(event: string, listener: (target: any, data: any) => void): void {
57
- const onceListener = (target: any, data: any) => {
58
- this.off(event, onceListener);
59
- listener(target, data);
60
- };
61
- this.on(event, onceListener);
62
- }
63
-
64
- emit(event: string, data?: any): void {
65
- const listeners = this.eventListeners[event];
66
- if (!listeners) {
67
- return;
68
- }
69
- [...listeners].forEach((listener) => {
70
- listener(this, data);
71
- });
72
- }
73
-
74
- removeAllListeners() {
75
- this.eventListeners = {};
76
- }
77
- }
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
+ /* eslint-disable @typescript-eslint/no-unsafe-member-access */
21
+ /* eslint-disable @typescript-eslint/no-unsafe-assignment */
22
+ /* eslint-disable @typescript-eslint/no-unsafe-call */
23
+ /* eslint-disable @typescript-eslint/no-explicit-any */
24
+ import type { IEventEmitter } from './IEventEmitter.js';
25
+
26
+ /**
27
+ * EventEmitter base class
28
+ */
29
+ export class EventEmitter implements IEventEmitter {
30
+ private eventListeners: { [eventName: string]: any } = {};
31
+
32
+ on(event: string, listener: (target: any, data: any) => void): void {
33
+ let listeners = this.eventListeners[event];
34
+ if (!listeners) {
35
+ listeners = [];
36
+ }
37
+ listeners.push(listener);
38
+ this.eventListeners[event] = listeners;
39
+ }
40
+
41
+ off(event: string, listener?: (target: any, data: any) => void): void {
42
+ const listeners = this.eventListeners[event];
43
+ if (!listeners) {
44
+ return;
45
+ }
46
+ if (!listener) {
47
+ delete this.eventListeners[event];
48
+ return;
49
+ }
50
+ const index = listeners.indexOf(listener);
51
+ if (index >= 0) {
52
+ listeners.splice(index, 1);
53
+ }
54
+ }
55
+
56
+ once(event: string, listener: (target: any, data: any) => void): void {
57
+ const onceListener = (target: any, data: any) => {
58
+ this.off(event, onceListener);
59
+ listener(target, data);
60
+ };
61
+ this.on(event, onceListener);
62
+ }
63
+
64
+ emit(event: string, data?: any): void {
65
+ const listeners = this.eventListeners[event];
66
+ if (!listeners) {
67
+ return;
68
+ }
69
+ [...listeners].forEach((listener) => {
70
+ listener(this, data);
71
+ });
72
+ }
73
+
74
+ removeAllListeners() {
75
+ this.eventListeners = {};
76
+ }
77
+ }
@@ -1,92 +1,92 @@
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 { IEventEmitter } from './IEventEmitter.js';
20
-
21
- export type AnimationControllerState =
22
- | 'scheduled'
23
- | 'running'
24
- | 'paused'
25
- | 'stopped';
26
-
27
- /**
28
- * Animation Controller interface
29
- *
30
- * @remarks
31
- * This interface is used to control animations. It provides methods to start,
32
- * stop, pause, and restore animations. It also provides a way to wait for the
33
- * animation to stop.
34
- *
35
- * This interface extends the `IEventEmitter` interface, which means you can
36
- * listen to these events emitted by the animation controller:
37
- * - `animating` - Emitted when the animation finishes it's delay phase and
38
- * starts animating.
39
- * - `stopped` - Emitted when the animation stops either by calling the `stop()`
40
- * method or when the animation finishes naturally.
41
- */
42
- export interface IAnimationController extends IEventEmitter {
43
- /**
44
- * Start the animation
45
- *
46
- * @remarks
47
- * If the animation is paused this method will resume the animation.
48
- */
49
- start(): IAnimationController;
50
- /**
51
- * Stop the animation
52
- *
53
- * @remarks
54
- * Resets the animation to the start state
55
- */
56
- stop(): IAnimationController;
57
- /**
58
- * Pause the animation
59
- */
60
- pause(): IAnimationController;
61
- /**
62
- * Restore the animation to the original values
63
- */
64
- restore(): IAnimationController;
65
-
66
- /**
67
- * Promise that resolves when the last active animation is stopped (including
68
- * when the animation finishes naturally).
69
- *
70
- * @remarks
71
- * The Promise returned by this method is reset every time the animation
72
- * enters a new start/stop cycle. This means you must call `start()` before
73
- * calling this method if you want to wait for the animation to stop.
74
- *
75
- * This method always returns a resolved promise if the animation is currently
76
- * in a stopped state.
77
- *
78
- * @returns
79
- */
80
- waitUntilStopped(): Promise<void>;
81
-
82
- /**
83
- * Current state of the animation
84
- *
85
- * @remarks
86
- * - `stopped` - The animation is currently stopped (at the beggining or end
87
- * of the animation)
88
- * - `running` - The animation is currently running
89
- * - `paused` - The animation is currently paused
90
- */
91
- readonly state: AnimationControllerState;
92
- }
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 { IEventEmitter } from './IEventEmitter.js';
20
+
21
+ export type AnimationControllerState =
22
+ | 'scheduled'
23
+ | 'running'
24
+ | 'paused'
25
+ | 'stopped';
26
+
27
+ /**
28
+ * Animation Controller interface
29
+ *
30
+ * @remarks
31
+ * This interface is used to control animations. It provides methods to start,
32
+ * stop, pause, and restore animations. It also provides a way to wait for the
33
+ * animation to stop.
34
+ *
35
+ * This interface extends the `IEventEmitter` interface, which means you can
36
+ * listen to these events emitted by the animation controller:
37
+ * - `animating` - Emitted when the animation finishes it's delay phase and
38
+ * starts animating.
39
+ * - `stopped` - Emitted when the animation stops either by calling the `stop()`
40
+ * method or when the animation finishes naturally.
41
+ */
42
+ export interface IAnimationController extends IEventEmitter {
43
+ /**
44
+ * Start the animation
45
+ *
46
+ * @remarks
47
+ * If the animation is paused this method will resume the animation.
48
+ */
49
+ start(): IAnimationController;
50
+ /**
51
+ * Stop the animation
52
+ *
53
+ * @remarks
54
+ * Resets the animation to the start state
55
+ */
56
+ stop(): IAnimationController;
57
+ /**
58
+ * Pause the animation
59
+ */
60
+ pause(): IAnimationController;
61
+ /**
62
+ * Restore the animation to the original values
63
+ */
64
+ restore(): IAnimationController;
65
+
66
+ /**
67
+ * Promise that resolves when the last active animation is stopped (including
68
+ * when the animation finishes naturally).
69
+ *
70
+ * @remarks
71
+ * The Promise returned by this method is reset every time the animation
72
+ * enters a new start/stop cycle. This means you must call `start()` before
73
+ * calling this method if you want to wait for the animation to stop.
74
+ *
75
+ * This method always returns a resolved promise if the animation is currently
76
+ * in a stopped state.
77
+ *
78
+ * @returns
79
+ */
80
+ waitUntilStopped(): Promise<void>;
81
+
82
+ /**
83
+ * Current state of the animation
84
+ *
85
+ * @remarks
86
+ * - `stopped` - The animation is currently stopped (at the beggining or end
87
+ * of the animation)
88
+ * - `running` - The animation is currently running
89
+ * - `paused` - The animation is currently paused
90
+ */
91
+ readonly state: AnimationControllerState;
92
+ }
@@ -1,28 +1,28 @@
1
- /*
2
- * Copyright 2023 Comcast Cable Communications Management, LLC
3
- * Licensed under the Apache License, Version 2.0 (the "License");
4
- * you may not use this file except in compliance with the License.
5
- * You may obtain a copy of the License at
6
- *
7
- * http://www.apache.org/licenses/LICENSE-2.0
8
- *
9
- * Unless required by applicable law or agreed to in writing, software
10
- * distributed under the License is distributed on an "AS IS" BASIS,
11
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- * See the License for the specific language governing permissions and
13
- * limitations under the License.
14
- *
15
- * SPDX-License-Identifier: Apache-2.0
16
- */
17
-
18
- export interface IEventEmitter<
19
- T extends object = { [s: string]: (target: any, data: any) => void },
20
- > {
21
- on<K extends keyof T>(event: Extract<K, string>, listener: T[K]): void;
22
- once<K extends keyof T>(event: Extract<K, string>, listener: T[K]): void;
23
- off<K extends keyof T>(event: Extract<K, string>, listener: T[K]): void;
24
- emit<K extends keyof T>(
25
- event: Extract<K, string>,
26
- data: Parameters<any>[1],
27
- ): void;
28
- }
1
+ /*
2
+ * Copyright 2023 Comcast Cable Communications Management, LLC
3
+ * Licensed under the Apache License, Version 2.0 (the "License");
4
+ * you may not use this file except in compliance with the License.
5
+ * You may obtain a copy of the License at
6
+ *
7
+ * http://www.apache.org/licenses/LICENSE-2.0
8
+ *
9
+ * Unless required by applicable law or agreed to in writing, software
10
+ * distributed under the License is distributed on an "AS IS" BASIS,
11
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ * See the License for the specific language governing permissions and
13
+ * limitations under the License.
14
+ *
15
+ * SPDX-License-Identifier: Apache-2.0
16
+ */
17
+
18
+ export interface IEventEmitter<
19
+ T extends object = { [s: string]: (target: any, data: any) => void },
20
+ > {
21
+ on<K extends keyof T>(event: Extract<K, string>, listener: T[K]): void;
22
+ once<K extends keyof T>(event: Extract<K, string>, listener: T[K]): void;
23
+ off<K extends keyof T>(event: Extract<K, string>, listener: T[K]): void;
24
+ emit<K extends keyof T>(
25
+ event: Extract<K, string>,
26
+ data: Parameters<any>[1],
27
+ ): void;
28
+ }