@lightningjs/renderer 2.9.2 → 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 (329) 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 +5 -2
  17. package/dist/src/core/CoreTextureManager.js +20 -11
  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.d.ts +1 -1
  29. package/dist/src/core/Stage.js +2 -2
  30. package/dist/src/core/Stage.js.map +1 -1
  31. package/dist/src/core/TextNode.d.ts +103 -0
  32. package/dist/src/core/TextNode.js +331 -0
  33. package/dist/src/core/TextNode.js.map +1 -0
  34. package/dist/src/core/TextureMemoryManager.d.ts +30 -0
  35. package/dist/src/core/TextureMemoryManager.js +58 -38
  36. package/dist/src/core/TextureMemoryManager.js.map +1 -1
  37. package/dist/src/core/lib/Coords.d.ts +14 -0
  38. package/dist/src/core/lib/Coords.js +55 -0
  39. package/dist/src/core/lib/Coords.js.map +1 -0
  40. package/dist/src/core/lib/glm/common.d.ts +162 -0
  41. package/dist/src/core/lib/glm/common.js +81 -0
  42. package/dist/src/core/lib/glm/common.js.map +1 -0
  43. package/dist/src/core/lib/glm/index.d.ts +11 -0
  44. package/dist/src/core/lib/glm/index.js +30 -0
  45. package/dist/src/core/lib/glm/index.js.map +1 -0
  46. package/dist/src/core/lib/glm/mat2.d.ts +219 -0
  47. package/dist/src/core/lib/glm/mat2.js +396 -0
  48. package/dist/src/core/lib/glm/mat2.js.map +1 -0
  49. package/dist/src/core/lib/glm/mat2d.d.ts +237 -0
  50. package/dist/src/core/lib/glm/mat2d.js +442 -0
  51. package/dist/src/core/lib/glm/mat2d.js.map +1 -0
  52. package/dist/src/core/lib/glm/mat3.d.ts +283 -0
  53. package/dist/src/core/lib/glm/mat3.js +680 -0
  54. package/dist/src/core/lib/glm/mat3.js.map +1 -0
  55. package/dist/src/core/lib/glm/mat4.d.ts +550 -0
  56. package/dist/src/core/lib/glm/mat4.js +1802 -0
  57. package/dist/src/core/lib/glm/mat4.js.map +1 -0
  58. package/dist/src/core/lib/glm/quat.d.ts +363 -0
  59. package/dist/src/core/lib/glm/quat.js +693 -0
  60. package/dist/src/core/lib/glm/quat.js.map +1 -0
  61. package/dist/src/core/lib/glm/quat2.d.ts +356 -0
  62. package/dist/src/core/lib/glm/quat2.js +754 -0
  63. package/dist/src/core/lib/glm/quat2.js.map +1 -0
  64. package/dist/src/core/lib/glm/vec2.d.ts +365 -0
  65. package/dist/src/core/lib/glm/vec2.js +569 -0
  66. package/dist/src/core/lib/glm/vec2.js.map +1 -0
  67. package/dist/src/core/lib/glm/vec3.d.ts +406 -0
  68. package/dist/src/core/lib/glm/vec3.js +720 -0
  69. package/dist/src/core/lib/glm/vec3.js.map +1 -0
  70. package/dist/src/core/lib/glm/vec4.d.ts +330 -0
  71. package/dist/src/core/lib/glm/vec4.js +608 -0
  72. package/dist/src/core/lib/glm/vec4.js.map +1 -0
  73. package/dist/src/core/lib/textureSvg.js +1 -1
  74. package/dist/src/core/lib/textureSvg.js.map +1 -1
  75. package/dist/src/core/renderers/CoreShaderManager.d.ts +19 -0
  76. package/dist/src/core/renderers/CoreShaderManager.js +33 -0
  77. package/dist/src/core/renderers/CoreShaderManager.js.map +1 -0
  78. package/dist/src/core/renderers/canvas/CanvasCoreRenderer.js +4 -2
  79. package/dist/src/core/renderers/canvas/CanvasCoreRenderer.js.map +1 -1
  80. package/dist/src/core/renderers/canvas/CanvasCoreTexture.js +4 -4
  81. package/dist/src/core/renderers/canvas/CanvasCoreTexture.js.map +1 -1
  82. package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.js +9 -12
  83. package/dist/src/core/renderers/webgl/WebGlCoreCtxTexture.js.map +1 -1
  84. package/dist/src/core/renderers/webgl/WebGlCoreShaderManager.d.ts +27 -0
  85. package/dist/src/core/renderers/webgl/WebGlCoreShaderManager.js +82 -0
  86. package/dist/src/core/renderers/webgl/WebGlCoreShaderManager.js.map +1 -0
  87. package/dist/src/core/renderers/webgl/WebGlCoreShaderProgram.d.ts +11 -0
  88. package/dist/src/core/renderers/webgl/WebGlCoreShaderProgram.js +34 -0
  89. package/dist/src/core/renderers/webgl/WebGlCoreShaderProgram.js.map +1 -0
  90. package/dist/src/core/renderers/webgl/shaders/DefaultShader.js +45 -45
  91. package/dist/src/core/renderers/webgl/shaders/DefaultShaderBatched.js +61 -61
  92. package/dist/src/core/renderers/webgl/shaders/DynamicShader.js +93 -93
  93. package/dist/src/core/renderers/webgl/shaders/RoundedRectangle.js +63 -63
  94. package/dist/src/core/renderers/webgl/shaders/SdfShader.js +62 -62
  95. package/dist/src/core/renderers/webgl/shaders/effects/BorderBottomEffect.js +15 -15
  96. package/dist/src/core/renderers/webgl/shaders/effects/BorderEffect.js +6 -6
  97. package/dist/src/core/renderers/webgl/shaders/effects/BorderLeftEffect.js +15 -15
  98. package/dist/src/core/renderers/webgl/shaders/effects/BorderRightEffect.js +15 -15
  99. package/dist/src/core/renderers/webgl/shaders/effects/BorderTopEffect.js +15 -15
  100. package/dist/src/core/renderers/webgl/shaders/effects/FadeOutEffect.js +42 -42
  101. package/dist/src/core/renderers/webgl/shaders/effects/GlitchEffect.js +44 -44
  102. package/dist/src/core/renderers/webgl/shaders/effects/GrayscaleEffect.js +3 -3
  103. package/dist/src/core/renderers/webgl/shaders/effects/HolePunchEffect.js +22 -22
  104. package/dist/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.js +28 -28
  105. package/dist/src/core/renderers/webgl/shaders/effects/RadialGradientEffect.js +10 -10
  106. package/dist/src/core/renderers/webgl/shaders/effects/RadialProgressEffect.js +37 -37
  107. package/dist/src/core/renderers/webgl/shaders/effects/RadiusEffect.js +19 -19
  108. package/dist/src/core/scene/Scene.d.ts +59 -0
  109. package/dist/src/core/scene/Scene.js +106 -0
  110. package/dist/src/core/scene/Scene.js.map +1 -0
  111. package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/makeRenderWindow.d.ts +20 -0
  112. package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/makeRenderWindow.js +55 -0
  113. package/dist/src/core/text-rendering/renderers/SdfTextRenderer/internal/makeRenderWindow.js.map +1 -0
  114. package/dist/src/core/textures/ColorTexture.js +1 -1
  115. package/dist/src/core/textures/ColorTexture.js.map +1 -1
  116. package/dist/src/core/textures/ImageTexture.js +3 -3
  117. package/dist/src/core/textures/ImageTexture.js.map +1 -1
  118. package/dist/src/core/textures/NoiseTexture.js +1 -1
  119. package/dist/src/core/textures/NoiseTexture.js.map +1 -1
  120. package/dist/src/core/textures/RenderTexture.js +1 -1
  121. package/dist/src/core/textures/RenderTexture.js.map +1 -1
  122. package/dist/src/core/textures/SubTexture.d.ts +4 -0
  123. package/dist/src/core/textures/SubTexture.js +54 -16
  124. package/dist/src/core/textures/SubTexture.js.map +1 -1
  125. package/dist/src/core/textures/Texture.d.ts +2 -34
  126. package/dist/src/core/textures/Texture.js +13 -69
  127. package/dist/src/core/textures/Texture.js.map +1 -1
  128. package/dist/src/main-api/ICoreDriver.d.ts +27 -0
  129. package/dist/src/main-api/ICoreDriver.js +20 -0
  130. package/dist/src/main-api/ICoreDriver.js.map +1 -0
  131. package/dist/src/main-api/IRenderDriver.d.ts +20 -0
  132. package/dist/src/main-api/IRenderDriver.js +20 -0
  133. package/dist/src/main-api/IRenderDriver.js.map +1 -0
  134. package/dist/src/main-api/IShaderController.d.ts +14 -0
  135. package/dist/src/main-api/IShaderController.js +30 -0
  136. package/dist/src/main-api/IShaderController.js.map +1 -0
  137. package/dist/src/main-api/IShaderNode.d.ts +17 -0
  138. package/dist/src/main-api/IShaderNode.js +19 -0
  139. package/dist/src/main-api/IShaderNode.js.map +1 -0
  140. package/dist/src/main-api/Renderer.d.ts +6 -5
  141. package/dist/src/main-api/Renderer.js +3 -2
  142. package/dist/src/main-api/Renderer.js.map +1 -1
  143. package/dist/src/main-api/RendererMain.d.ts +375 -0
  144. package/dist/src/main-api/RendererMain.js +365 -0
  145. package/dist/src/main-api/RendererMain.js.map +1 -0
  146. package/dist/src/main-api/texture-usage-trackers/FinalizationRegistryTextureUsageTracker.d.ts +9 -0
  147. package/dist/src/main-api/texture-usage-trackers/FinalizationRegistryTextureUsageTracker.js +38 -0
  148. package/dist/src/main-api/texture-usage-trackers/FinalizationRegistryTextureUsageTracker.js.map +1 -0
  149. package/dist/src/main-api/texture-usage-trackers/ManualCountTextureUsageTracker.d.ts +56 -0
  150. package/dist/src/main-api/texture-usage-trackers/ManualCountTextureUsageTracker.js +101 -0
  151. package/dist/src/main-api/texture-usage-trackers/ManualCountTextureUsageTracker.js.map +1 -0
  152. package/dist/src/main-api/texture-usage-trackers/TextureUsageTracker.d.ts +32 -0
  153. package/dist/src/main-api/texture-usage-trackers/TextureUsageTracker.js +28 -0
  154. package/dist/src/main-api/texture-usage-trackers/TextureUsageTracker.js.map +1 -0
  155. package/dist/src/render-drivers/main/MainCoreDriver.d.ts +24 -0
  156. package/dist/src/render-drivers/main/MainCoreDriver.js +118 -0
  157. package/dist/src/render-drivers/main/MainCoreDriver.js.map +1 -0
  158. package/dist/src/render-drivers/main/MainOnlyNode.d.ts +99 -0
  159. package/dist/src/render-drivers/main/MainOnlyNode.js +396 -0
  160. package/dist/src/render-drivers/main/MainOnlyNode.js.map +1 -0
  161. package/dist/src/render-drivers/main/MainOnlyShaderController.d.ts +6 -0
  162. package/dist/src/render-drivers/main/MainOnlyShaderController.js +15 -0
  163. package/dist/src/render-drivers/main/MainOnlyShaderController.js.map +1 -0
  164. package/dist/src/render-drivers/main/MainOnlyShaderNode.d.ts +7 -0
  165. package/dist/src/render-drivers/main/MainOnlyShaderNode.js +34 -0
  166. package/dist/src/render-drivers/main/MainOnlyShaderNode.js.map +1 -0
  167. package/dist/src/render-drivers/main/MainOnlyTextNode.d.ts +47 -0
  168. package/dist/src/render-drivers/main/MainOnlyTextNode.js +205 -0
  169. package/dist/src/render-drivers/main/MainOnlyTextNode.js.map +1 -0
  170. package/dist/src/render-drivers/main/MainRenderDriver.d.ts +17 -0
  171. package/dist/src/render-drivers/main/MainRenderDriver.js +88 -0
  172. package/dist/src/render-drivers/main/MainRenderDriver.js.map +1 -0
  173. package/dist/src/render-drivers/threadx/NodeStruct.d.ts +90 -0
  174. package/dist/src/render-drivers/threadx/NodeStruct.js +281 -0
  175. package/dist/src/render-drivers/threadx/NodeStruct.js.map +1 -0
  176. package/dist/src/render-drivers/threadx/SharedNode.d.ts +39 -0
  177. package/dist/src/render-drivers/threadx/SharedNode.js +60 -0
  178. package/dist/src/render-drivers/threadx/SharedNode.js.map +1 -0
  179. package/dist/src/render-drivers/threadx/TextNodeStruct.d.ts +44 -0
  180. package/dist/src/render-drivers/threadx/TextNodeStruct.js +201 -0
  181. package/dist/src/render-drivers/threadx/TextNodeStruct.js.map +1 -0
  182. package/dist/src/render-drivers/threadx/ThreadXCoreDriver.d.ts +28 -0
  183. package/dist/src/render-drivers/threadx/ThreadXCoreDriver.js +234 -0
  184. package/dist/src/render-drivers/threadx/ThreadXCoreDriver.js.map +1 -0
  185. package/dist/src/render-drivers/threadx/ThreadXMainAnimationController.d.ts +20 -0
  186. package/dist/src/render-drivers/threadx/ThreadXMainAnimationController.js +84 -0
  187. package/dist/src/render-drivers/threadx/ThreadXMainAnimationController.js.map +1 -0
  188. package/dist/src/render-drivers/threadx/ThreadXMainNode.d.ts +44 -0
  189. package/dist/src/render-drivers/threadx/ThreadXMainNode.js +154 -0
  190. package/dist/src/render-drivers/threadx/ThreadXMainNode.js.map +1 -0
  191. package/dist/src/render-drivers/threadx/ThreadXMainShaderController.d.ts +6 -0
  192. package/dist/src/render-drivers/threadx/ThreadXMainShaderController.js +16 -0
  193. package/dist/src/render-drivers/threadx/ThreadXMainShaderController.js.map +1 -0
  194. package/dist/src/render-drivers/threadx/ThreadXMainShaderNode.d.ts +7 -0
  195. package/dist/src/render-drivers/threadx/ThreadXMainShaderNode.js +15 -0
  196. package/dist/src/render-drivers/threadx/ThreadXMainShaderNode.js.map +1 -0
  197. package/dist/src/render-drivers/threadx/ThreadXMainTextNode.d.ts +28 -0
  198. package/dist/src/render-drivers/threadx/ThreadXMainTextNode.js +55 -0
  199. package/dist/src/render-drivers/threadx/ThreadXMainTextNode.js.map +1 -0
  200. package/dist/src/render-drivers/threadx/ThreadXRenderDriver.d.ts +21 -0
  201. package/dist/src/render-drivers/threadx/ThreadXRenderDriver.js +198 -0
  202. package/dist/src/render-drivers/threadx/ThreadXRenderDriver.js.map +1 -0
  203. package/dist/src/render-drivers/threadx/ThreadXRendererMessage.d.ts +70 -0
  204. package/dist/src/render-drivers/threadx/ThreadXRendererMessage.js +32 -0
  205. package/dist/src/render-drivers/threadx/ThreadXRendererMessage.js.map +1 -0
  206. package/dist/src/render-drivers/threadx/worker/ThreadXRendererNode.d.ts +19 -0
  207. package/dist/src/render-drivers/threadx/worker/ThreadXRendererNode.js +177 -0
  208. package/dist/src/render-drivers/threadx/worker/ThreadXRendererNode.js.map +1 -0
  209. package/dist/src/render-drivers/threadx/worker/ThreadXRendererTextNode.d.ts +27 -0
  210. package/dist/src/render-drivers/threadx/worker/ThreadXRendererTextNode.js +108 -0
  211. package/dist/src/render-drivers/threadx/worker/ThreadXRendererTextNode.js.map +1 -0
  212. package/dist/src/render-drivers/threadx/worker/renderer.d.ts +1 -0
  213. package/dist/src/render-drivers/threadx/worker/renderer.js +145 -0
  214. package/dist/src/render-drivers/threadx/worker/renderer.js.map +1 -0
  215. package/dist/src/render-drivers/utils.d.ts +12 -0
  216. package/dist/src/render-drivers/utils.js +69 -0
  217. package/dist/src/render-drivers/utils.js.map +1 -0
  218. package/dist/tsconfig.dist.tsbuildinfo +1 -1
  219. package/exports/canvas.ts +39 -39
  220. package/exports/index.ts +89 -89
  221. package/exports/inspector.ts +24 -24
  222. package/exports/utils.ts +44 -44
  223. package/exports/webgl.ts +38 -38
  224. package/package.json +2 -1
  225. package/scripts/please-use-pnpm.js +13 -13
  226. package/src/common/CommonTypes.ts +139 -139
  227. package/src/common/EventEmitter.ts +77 -77
  228. package/src/common/IAnimationController.ts +92 -92
  229. package/src/common/IEventEmitter.ts +28 -28
  230. package/src/core/CoreNode.test.ts +199 -199
  231. package/src/core/CoreNode.ts +2335 -2335
  232. package/src/core/CoreShaderManager.ts +292 -292
  233. package/src/core/CoreTextNode.ts +455 -455
  234. package/src/core/CoreTextureManager.ts +561 -548
  235. package/src/core/Stage.ts +700 -700
  236. package/src/core/TextureMemoryManager.ts +292 -277
  237. package/src/core/animations/AnimationManager.ts +38 -38
  238. package/src/core/animations/CoreAnimation.ts +340 -340
  239. package/src/core/animations/CoreAnimationController.ts +157 -157
  240. package/src/core/lib/ContextSpy.ts +41 -41
  241. package/src/core/lib/ImageWorker.ts +270 -270
  242. package/src/core/lib/Matrix3d.ts +244 -244
  243. package/src/core/lib/RenderCoords.ts +86 -86
  244. package/src/core/lib/WebGlContextWrapper.ts +1322 -1322
  245. package/src/core/lib/textureCompression.ts +152 -152
  246. package/src/core/lib/textureSvg.ts +78 -78
  247. package/src/core/lib/utils.ts +310 -310
  248. package/src/core/platform.ts +61 -61
  249. package/src/core/renderers/CoreContextTexture.ts +43 -43
  250. package/src/core/renderers/CoreRenderOp.ts +22 -22
  251. package/src/core/renderers/CoreRenderer.ts +114 -114
  252. package/src/core/renderers/CoreShader.ts +41 -41
  253. package/src/core/renderers/canvas/CanvasCoreRenderer.ts +371 -369
  254. package/src/core/renderers/canvas/CanvasCoreTexture.ts +150 -150
  255. package/src/core/renderers/canvas/internal/C2DShaderUtils.ts +231 -231
  256. package/src/core/renderers/canvas/internal/ColorUtils.ts +69 -69
  257. package/src/core/renderers/canvas/shaders/UnsupportedShader.ts +48 -48
  258. package/src/core/renderers/webgl/WebGlCoreCtxRenderTexture.ts +79 -79
  259. package/src/core/renderers/webgl/WebGlCoreCtxSubTexture.ts +50 -50
  260. package/src/core/renderers/webgl/WebGlCoreCtxTexture.ts +295 -298
  261. package/src/core/renderers/webgl/WebGlCoreRenderOp.ts +125 -125
  262. package/src/core/renderers/webgl/WebGlCoreRenderer.ts +805 -805
  263. package/src/core/renderers/webgl/WebGlCoreShader.ts +362 -362
  264. package/src/core/renderers/webgl/internal/BufferCollection.ts +54 -54
  265. package/src/core/renderers/webgl/internal/RendererUtils.ts +155 -155
  266. package/src/core/renderers/webgl/internal/ShaderUtils.ts +143 -143
  267. package/src/core/renderers/webgl/internal/WebGlUtils.ts +35 -35
  268. package/src/core/renderers/webgl/shaders/DefaultShader.ts +93 -93
  269. package/src/core/renderers/webgl/shaders/DefaultShaderBatched.ts +132 -132
  270. package/src/core/renderers/webgl/shaders/DynamicShader.ts +580 -580
  271. package/src/core/renderers/webgl/shaders/RoundedRectangle.ts +167 -167
  272. package/src/core/renderers/webgl/shaders/SdfShader.ts +204 -204
  273. package/src/core/renderers/webgl/shaders/effects/BorderBottomEffect.ts +101 -101
  274. package/src/core/renderers/webgl/shaders/effects/BorderEffect.ts +87 -87
  275. package/src/core/renderers/webgl/shaders/effects/BorderLeftEffect.ts +101 -101
  276. package/src/core/renderers/webgl/shaders/effects/BorderRightEffect.ts +101 -101
  277. package/src/core/renderers/webgl/shaders/effects/BorderTopEffect.ts +101 -101
  278. package/src/core/renderers/webgl/shaders/effects/EffectUtils.ts +159 -159
  279. package/src/core/renderers/webgl/shaders/effects/FadeOutEffect.ts +127 -127
  280. package/src/core/renderers/webgl/shaders/effects/GlitchEffect.ts +148 -148
  281. package/src/core/renderers/webgl/shaders/effects/GrayscaleEffect.ts +67 -67
  282. package/src/core/renderers/webgl/shaders/effects/HolePunchEffect.ts +157 -157
  283. package/src/core/renderers/webgl/shaders/effects/LinearGradientEffect.ts +171 -171
  284. package/src/core/renderers/webgl/shaders/effects/RadialGradientEffect.ts +168 -168
  285. package/src/core/renderers/webgl/shaders/effects/RadialProgressEffect.ts +187 -187
  286. package/src/core/renderers/webgl/shaders/effects/RadiusEffect.ts +110 -110
  287. package/src/core/renderers/webgl/shaders/effects/ShaderEffect.ts +196 -196
  288. package/src/core/text-rendering/TextRenderingUtils.ts +36 -36
  289. package/src/core/text-rendering/TextTextureRendererUtils.ts +263 -263
  290. package/src/core/text-rendering/TrFontManager.ts +183 -183
  291. package/src/core/text-rendering/font-face-types/SdfTrFontFace/SdfTrFontFace.ts +176 -176
  292. package/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/FontShaper.ts +139 -139
  293. package/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.test.ts +173 -173
  294. package/src/core/text-rendering/font-face-types/SdfTrFontFace/internal/SdfFontShaper.ts +171 -171
  295. package/src/core/text-rendering/font-face-types/TrFontFace.ts +187 -187
  296. package/src/core/text-rendering/font-face-types/WebTrFontFace.ts +94 -94
  297. package/src/core/text-rendering/renderers/CanvasTextRenderer.ts +509 -509
  298. package/src/core/text-rendering/renderers/LightningTextTextureRenderer.ts +808 -808
  299. package/src/core/text-rendering/renderers/SdfTextRenderer/SdfTextRenderer.ts +853 -853
  300. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/PeekableGenerator.test.ts +48 -48
  301. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/PeekableGenerator.ts +66 -66
  302. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/SpecialCodepoints.ts +52 -52
  303. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/constants.ts +32 -32
  304. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/getStartConditions.ts +117 -117
  305. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/getUnicodeCodepoints.test.ts +133 -133
  306. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/getUnicodeCodepoints.ts +38 -38
  307. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/layoutText.ts +408 -408
  308. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/measureText.test.ts +49 -49
  309. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/measureText.ts +52 -52
  310. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/setRenderWindow.test.ts +205 -205
  311. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/setRenderWindow.ts +93 -93
  312. package/src/core/text-rendering/renderers/SdfTextRenderer/internal/util.ts +40 -40
  313. package/src/core/text-rendering/renderers/TextRenderer.ts +557 -557
  314. package/src/core/textures/ColorTexture.ts +102 -102
  315. package/src/core/textures/ImageTexture.ts +379 -379
  316. package/src/core/textures/NoiseTexture.ts +104 -104
  317. package/src/core/textures/RenderTexture.ts +85 -85
  318. package/src/core/textures/SubTexture.ts +225 -179
  319. package/src/core/textures/Texture.ts +347 -435
  320. package/src/core/utils.ts +227 -227
  321. package/src/env.d.ts +7 -7
  322. package/src/main-api/DynamicShaderController.ts +104 -104
  323. package/src/main-api/INode.ts +101 -101
  324. package/src/main-api/Inspector.ts +505 -505
  325. package/src/main-api/Renderer.ts +698 -693
  326. package/src/main-api/ShaderController.ts +80 -80
  327. package/src/main-api/utils.ts +45 -45
  328. package/src/utils.ts +248 -248
  329. package/COPYING +0 -1
@@ -1,298 +1,295 @@
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 { Dimensions } from '../../../common/CommonTypes.js';
21
- import { assertTruthy } from '../../../utils.js';
22
- import type { TextureMemoryManager } from '../../TextureMemoryManager.js';
23
- import type { WebGlContextWrapper } from '../../lib/WebGlContextWrapper.js';
24
- import type { Texture } from '../../textures/Texture.js';
25
- import { isPowerOfTwo } from '../../utils.js';
26
- import { CoreContextTexture } from '../CoreContextTexture.js';
27
- import { isHTMLImageElement } from './internal/RendererUtils.js';
28
-
29
- const TRANSPARENT_TEXTURE_DATA = new Uint8Array([0, 0, 0, 0]);
30
-
31
- /**
32
- * A wrapper around a WebGLTexture that handles loading the texture data
33
- * from a Texture source and uploading it to the GPU as well as freeing
34
- * the uploaded texture.
35
- *
36
- * @remarks
37
- * When accessing the ctxTexture property, the texture will be loaded if
38
- * it hasn't been already. ctxTexture will always return a valid WebGLTexture
39
- * and trigger the loading/uploading of the texture's data if it hasn't been
40
- * loaded yet.
41
- */
42
- export class WebGlCoreCtxTexture extends CoreContextTexture {
43
- protected _nativeCtxTexture: WebGLTexture | null = null;
44
- private _w = 0;
45
- private _h = 0;
46
-
47
- constructor(
48
- protected glw: WebGlContextWrapper,
49
- memManager: TextureMemoryManager,
50
- textureSource: Texture,
51
- ) {
52
- super(memManager, textureSource);
53
- }
54
-
55
- get ctxTexture(): WebGLTexture | null {
56
- if (this.state === 'freed') {
57
- this.load();
58
- return null;
59
- }
60
- assertTruthy(this._nativeCtxTexture);
61
- return this._nativeCtxTexture;
62
- }
63
-
64
- get w() {
65
- return this._w;
66
- }
67
-
68
- get h() {
69
- return this._h;
70
- }
71
-
72
- /**
73
- * Load the texture data from the Texture source and upload it to the GPU
74
- *
75
- * @remarks
76
- * This method is called automatically when accessing the ctxTexture property
77
- * if the texture hasn't been loaded yet. But it can also be called manually
78
- * to force the texture to be pre-loaded prior to accessing the ctxTexture
79
- * property.
80
- */
81
- load() {
82
- // If the texture is already loading or loaded, don't load it again.
83
- if (this.state === 'loading' || this.state === 'loaded') {
84
- return;
85
- }
86
-
87
- this.state = 'loading';
88
- this.textureSource.setCoreCtxState('loading');
89
- this._nativeCtxTexture = this.createNativeCtxTexture();
90
-
91
- if (this._nativeCtxTexture === null) {
92
- this.state = 'failed';
93
- this.textureSource.setCoreCtxState(
94
- 'failed',
95
- new Error('Could not create WebGL Texture'),
96
- );
97
- console.error('Could not create WebGL Texture');
98
- return;
99
- }
100
-
101
- this.onLoadRequest()
102
- .then(({ width, height }) => {
103
- // If the texture has been freed while loading, return early.
104
- if (this.state === 'freed') {
105
- return;
106
- }
107
-
108
- this.state = 'loaded';
109
- this._w = width;
110
- this._h = height;
111
- // Update the texture source's width and height so that it can be used
112
- // for rendering.
113
- this.textureSource.setCoreCtxState('loaded', { width, height });
114
- })
115
- .catch((err) => {
116
- // If the texture has been freed while loading, return early.
117
- if (this.state === 'freed') {
118
- return;
119
- }
120
- this.state = 'failed';
121
- this.textureSource.setCoreCtxState('failed', err);
122
- console.error(err);
123
- });
124
- }
125
-
126
- /**
127
- * Called when the texture data needs to be loaded and uploaded to a texture
128
- */
129
- async onLoadRequest(): Promise<Dimensions> {
130
- const { glw } = this;
131
- const textureData = this.textureSource.textureData;
132
- assertTruthy(textureData, 'Texture data is null');
133
-
134
- // Set to a 1x1 transparent texture
135
- glw.texImage2D(0, glw.RGBA, 1, 1, 0, glw.RGBA, glw.UNSIGNED_BYTE, null);
136
- this.setTextureMemUse(TRANSPARENT_TEXTURE_DATA.byteLength);
137
-
138
- // If the texture has been freed while loading, return early.
139
- if (!this._nativeCtxTexture) {
140
- assertTruthy(this.state === 'freed');
141
- return { width: 0, height: 0 };
142
- }
143
- let width = 0;
144
- let height = 0;
145
-
146
- glw.activeTexture(0);
147
-
148
- const tdata = textureData.data;
149
- const format = textureData.premultiplyAlpha ? glw.RGBA : glw.RGB;
150
- const formatBytes = format === glw.RGBA ? 4 : 3;
151
-
152
- // If textureData is null, the texture is empty (0, 0) and we don't need to
153
- // upload any data to the GPU.
154
- if (
155
- (typeof ImageBitmap !== 'undefined' && tdata instanceof ImageBitmap) ||
156
- tdata instanceof ImageData ||
157
- // not using typeof HTMLImageElement due to web worker
158
- isHTMLImageElement(tdata)
159
- ) {
160
- width = tdata.width;
161
- height = tdata.height;
162
- glw.bindTexture(this._nativeCtxTexture);
163
- glw.pixelStorei(
164
- glw.UNPACK_PREMULTIPLY_ALPHA_WEBGL,
165
- !!textureData.premultiplyAlpha,
166
- );
167
-
168
- glw.texImage2D(0, format, format, glw.UNSIGNED_BYTE, tdata);
169
- this.setTextureMemUse(width * height * formatBytes);
170
-
171
- // generate mipmaps for power-of-2 textures or in WebGL2RenderingContext
172
- if (glw.isWebGl2() || (isPowerOfTwo(width) && isPowerOfTwo(height))) {
173
- glw.generateMipmap();
174
- }
175
- } else if (tdata === null) {
176
- width = 0;
177
- height = 0;
178
- // Reset to a 1x1 transparent texture
179
- glw.bindTexture(this._nativeCtxTexture);
180
-
181
- glw.texImage2D(
182
- 0,
183
- format,
184
- 1,
185
- 1,
186
- 0,
187
- format,
188
- glw.UNSIGNED_BYTE,
189
- TRANSPARENT_TEXTURE_DATA,
190
- );
191
- this.setTextureMemUse(TRANSPARENT_TEXTURE_DATA.byteLength);
192
- } else if ('mipmaps' in tdata && tdata.mipmaps) {
193
- const { mipmaps, width = 0, height = 0, type, glInternalFormat } = tdata;
194
- const view =
195
- type === 'ktx'
196
- ? new DataView(mipmaps[0] ?? new ArrayBuffer(0))
197
- : (mipmaps[0] as unknown as ArrayBufferView);
198
-
199
- glw.bindTexture(this._nativeCtxTexture);
200
-
201
- glw.compressedTexImage2D(0, glInternalFormat, width, height, 0, view);
202
- glw.texParameteri(glw.TEXTURE_WRAP_S, glw.CLAMP_TO_EDGE);
203
- glw.texParameteri(glw.TEXTURE_WRAP_T, glw.CLAMP_TO_EDGE);
204
- glw.texParameteri(glw.TEXTURE_MAG_FILTER, glw.LINEAR);
205
- glw.texParameteri(glw.TEXTURE_MIN_FILTER, glw.LINEAR);
206
-
207
- this.setTextureMemUse(view.byteLength);
208
- } else if (tdata && tdata instanceof Uint8Array) {
209
- // Color Texture
210
- width = 1;
211
- height = 1;
212
-
213
- glw.bindTexture(this._nativeCtxTexture);
214
- glw.pixelStorei(
215
- glw.UNPACK_PREMULTIPLY_ALPHA_WEBGL,
216
- !!textureData.premultiplyAlpha,
217
- );
218
-
219
- glw.texImage2D(
220
- 0,
221
- format,
222
- width,
223
- height,
224
- 0,
225
- format,
226
- glw.UNSIGNED_BYTE,
227
- tdata,
228
- );
229
-
230
- this.setTextureMemUse(width * height * formatBytes);
231
- } else {
232
- console.error(
233
- `WebGlCoreCtxTexture.onLoadRequest: Unexpected textureData returned`,
234
- textureData,
235
- );
236
- }
237
-
238
- return {
239
- width,
240
- height,
241
- };
242
- }
243
-
244
- /**
245
- * Free the WebGLTexture from the GPU
246
- *
247
- * @returns
248
- */
249
- free() {
250
- if (this.state === 'freed') {
251
- return;
252
- }
253
- this.state = 'freed';
254
- this.textureSource.setCoreCtxState('freed');
255
- this._w = 0;
256
- this._h = 0;
257
- if (!this._nativeCtxTexture) {
258
- return;
259
- }
260
- const { glw } = this;
261
-
262
- glw.deleteTexture(this._nativeCtxTexture);
263
- this.setTextureMemUse(0);
264
- this._nativeCtxTexture = null;
265
- }
266
-
267
- /**
268
- * Create native context texture
269
- *
270
- * @remarks
271
- * When this method returns the returned texture will be bound to the GL context state.
272
- *
273
- * @param width
274
- * @param height
275
- * @returns
276
- */
277
- protected createNativeCtxTexture() {
278
- const { glw } = this;
279
- const nativeTexture = glw.createTexture();
280
- if (!nativeTexture) {
281
- return null;
282
- }
283
-
284
- // On initial load request, create a 1x1 transparent texture to use until
285
- // the texture data is finally loaded.
286
- glw.activeTexture(0);
287
- glw.bindTexture(nativeTexture);
288
-
289
- // linear texture filtering
290
- glw.texParameteri(glw.TEXTURE_MAG_FILTER, glw.LINEAR);
291
- glw.texParameteri(glw.TEXTURE_MIN_FILTER, glw.LINEAR);
292
-
293
- // texture wrapping method
294
- glw.texParameteri(glw.TEXTURE_WRAP_S, glw.CLAMP_TO_EDGE);
295
- glw.texParameteri(glw.TEXTURE_WRAP_T, glw.CLAMP_TO_EDGE);
296
- return nativeTexture;
297
- }
298
- }
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 { Dimensions } from '../../../common/CommonTypes.js';
21
+ import { assertTruthy } from '../../../utils.js';
22
+ import type { TextureMemoryManager } from '../../TextureMemoryManager.js';
23
+ import type { WebGlContextWrapper } from '../../lib/WebGlContextWrapper.js';
24
+ import type { Texture } from '../../textures/Texture.js';
25
+ import { isPowerOfTwo } from '../../utils.js';
26
+ import { CoreContextTexture } from '../CoreContextTexture.js';
27
+ import { isHTMLImageElement } from './internal/RendererUtils.js';
28
+
29
+ const TRANSPARENT_TEXTURE_DATA = new Uint8Array([0, 0, 0, 0]);
30
+
31
+ /**
32
+ * A wrapper around a WebGLTexture that handles loading the texture data
33
+ * from a Texture source and uploading it to the GPU as well as freeing
34
+ * the uploaded texture.
35
+ *
36
+ * @remarks
37
+ * When accessing the ctxTexture property, the texture will be loaded if
38
+ * it hasn't been already. ctxTexture will always return a valid WebGLTexture
39
+ * and trigger the loading/uploading of the texture's data if it hasn't been
40
+ * loaded yet.
41
+ */
42
+ export class WebGlCoreCtxTexture extends CoreContextTexture {
43
+ protected _nativeCtxTexture: WebGLTexture | null = null;
44
+ private _w = 0;
45
+ private _h = 0;
46
+
47
+ constructor(
48
+ protected glw: WebGlContextWrapper,
49
+ memManager: TextureMemoryManager,
50
+ textureSource: Texture,
51
+ ) {
52
+ super(memManager, textureSource);
53
+ }
54
+
55
+ get ctxTexture(): WebGLTexture | null {
56
+ if (this.state === 'freed') {
57
+ this.load();
58
+ return null;
59
+ }
60
+ assertTruthy(this._nativeCtxTexture);
61
+ return this._nativeCtxTexture;
62
+ }
63
+
64
+ get w() {
65
+ return this._w;
66
+ }
67
+
68
+ get h() {
69
+ return this._h;
70
+ }
71
+
72
+ /**
73
+ * Load the texture data from the Texture source and upload it to the GPU
74
+ *
75
+ * @remarks
76
+ * This method is called automatically when accessing the ctxTexture property
77
+ * if the texture hasn't been loaded yet. But it can also be called manually
78
+ * to force the texture to be pre-loaded prior to accessing the ctxTexture
79
+ * property.
80
+ */
81
+ load() {
82
+ // If the texture is already loading or loaded, don't load it again.
83
+ if (this.state === 'loading' || this.state === 'loaded') {
84
+ return;
85
+ }
86
+
87
+ this.state = 'loading';
88
+ this.textureSource.setState('loading');
89
+ this._nativeCtxTexture = this.createNativeCtxTexture();
90
+
91
+ if (this._nativeCtxTexture === null) {
92
+ this.state = 'failed';
93
+ this.textureSource.setState(
94
+ 'failed',
95
+ new Error('Could not create WebGL Texture'),
96
+ );
97
+ console.error('Could not create WebGL Texture');
98
+ return;
99
+ }
100
+
101
+ this.onLoadRequest()
102
+ .then(({ width, height }) => {
103
+ // If the texture has been freed while loading, return early.
104
+ if (this.state === 'freed') {
105
+ return;
106
+ }
107
+
108
+ this.state = 'loaded';
109
+ this._w = width;
110
+ this._h = height;
111
+ // Update the texture source's width and height so that it can be used
112
+ // for rendering.
113
+ this.textureSource.setState('loaded', { width, height });
114
+ })
115
+ .catch((err) => {
116
+ // If the texture has been freed while loading, return early.
117
+ if (this.state === 'freed') {
118
+ return;
119
+ }
120
+ this.state = 'failed';
121
+ this.textureSource.setState('failed', err);
122
+ console.error(err);
123
+ });
124
+ }
125
+
126
+ /**
127
+ * Called when the texture data needs to be loaded and uploaded to a texture
128
+ */
129
+ async onLoadRequest(): Promise<Dimensions> {
130
+ const { glw } = this;
131
+ const textureData = this.textureSource.textureData;
132
+ assertTruthy(textureData, 'Texture data is null');
133
+
134
+ // Set to a 1x1 transparent texture
135
+ glw.texImage2D(0, glw.RGBA, 1, 1, 0, glw.RGBA, glw.UNSIGNED_BYTE, null);
136
+ this.setTextureMemUse(TRANSPARENT_TEXTURE_DATA.byteLength);
137
+
138
+ // If the texture has been freed while loading, return early.
139
+ if (!this._nativeCtxTexture) {
140
+ assertTruthy(this.state === 'freed');
141
+ return { width: 0, height: 0 };
142
+ }
143
+ let width = 0;
144
+ let height = 0;
145
+
146
+ glw.activeTexture(0);
147
+
148
+ const tdata = textureData.data;
149
+ const format = glw.RGBA;
150
+ const formatBytes = 4;
151
+ const memoryPadding = 1.1; // Add padding to account for GPU Padding
152
+
153
+ // If textureData is null, the texture is empty (0, 0) and we don't need to
154
+ // upload any data to the GPU.
155
+ if (
156
+ (typeof ImageBitmap !== 'undefined' && tdata instanceof ImageBitmap) ||
157
+ tdata instanceof ImageData ||
158
+ // not using typeof HTMLImageElement due to web worker
159
+ isHTMLImageElement(tdata)
160
+ ) {
161
+ width = tdata.width;
162
+ height = tdata.height;
163
+ glw.bindTexture(this._nativeCtxTexture);
164
+ glw.pixelStorei(
165
+ glw.UNPACK_PREMULTIPLY_ALPHA_WEBGL,
166
+ !!textureData.premultiplyAlpha,
167
+ );
168
+
169
+ glw.texImage2D(0, format, format, glw.UNSIGNED_BYTE, tdata);
170
+
171
+ this.setTextureMemUse(height * width * formatBytes * memoryPadding);
172
+ } else if (tdata === null) {
173
+ width = 0;
174
+ height = 0;
175
+ // Reset to a 1x1 transparent texture
176
+ glw.bindTexture(this._nativeCtxTexture);
177
+
178
+ glw.texImage2D(
179
+ 0,
180
+ format,
181
+ 1,
182
+ 1,
183
+ 0,
184
+ format,
185
+ glw.UNSIGNED_BYTE,
186
+ TRANSPARENT_TEXTURE_DATA,
187
+ );
188
+ this.setTextureMemUse(TRANSPARENT_TEXTURE_DATA.byteLength);
189
+ } else if ('mipmaps' in tdata && tdata.mipmaps) {
190
+ const { mipmaps, width = 0, height = 0, type, glInternalFormat } = tdata;
191
+ const view =
192
+ type === 'ktx'
193
+ ? new DataView(mipmaps[0] ?? new ArrayBuffer(0))
194
+ : (mipmaps[0] as unknown as ArrayBufferView);
195
+
196
+ glw.bindTexture(this._nativeCtxTexture);
197
+
198
+ glw.compressedTexImage2D(0, glInternalFormat, width, height, 0, view);
199
+ glw.texParameteri(glw.TEXTURE_WRAP_S, glw.CLAMP_TO_EDGE);
200
+ glw.texParameteri(glw.TEXTURE_WRAP_T, glw.CLAMP_TO_EDGE);
201
+ glw.texParameteri(glw.TEXTURE_MAG_FILTER, glw.LINEAR);
202
+ glw.texParameteri(glw.TEXTURE_MIN_FILTER, glw.LINEAR);
203
+
204
+ this.setTextureMemUse(view.byteLength);
205
+ } else if (tdata && tdata instanceof Uint8Array) {
206
+ // Color Texture
207
+ width = 1;
208
+ height = 1;
209
+
210
+ glw.bindTexture(this._nativeCtxTexture);
211
+ glw.pixelStorei(
212
+ glw.UNPACK_PREMULTIPLY_ALPHA_WEBGL,
213
+ !!textureData.premultiplyAlpha,
214
+ );
215
+
216
+ glw.texImage2D(
217
+ 0,
218
+ format,
219
+ width,
220
+ height,
221
+ 0,
222
+ format,
223
+ glw.UNSIGNED_BYTE,
224
+ tdata,
225
+ );
226
+
227
+ this.setTextureMemUse(width * height * formatBytes);
228
+ } else {
229
+ console.error(
230
+ `WebGlCoreCtxTexture.onLoadRequest: Unexpected textureData returned`,
231
+ textureData,
232
+ );
233
+ }
234
+
235
+ return {
236
+ width,
237
+ height,
238
+ };
239
+ }
240
+
241
+ /**
242
+ * Free the WebGLTexture from the GPU
243
+ *
244
+ * @returns
245
+ */
246
+ free() {
247
+ if (this.state === 'freed') {
248
+ return;
249
+ }
250
+ this.state = 'freed';
251
+ this.textureSource.setState('freed');
252
+ this._w = 0;
253
+ this._h = 0;
254
+ if (!this._nativeCtxTexture) {
255
+ return;
256
+ }
257
+ const { glw } = this;
258
+
259
+ glw.deleteTexture(this._nativeCtxTexture);
260
+ this.setTextureMemUse(0);
261
+ this._nativeCtxTexture = null;
262
+ }
263
+
264
+ /**
265
+ * Create native context texture
266
+ *
267
+ * @remarks
268
+ * When this method returns the returned texture will be bound to the GL context state.
269
+ *
270
+ * @param width
271
+ * @param height
272
+ * @returns
273
+ */
274
+ protected createNativeCtxTexture() {
275
+ const { glw } = this;
276
+ const nativeTexture = glw.createTexture();
277
+ if (!nativeTexture) {
278
+ return null;
279
+ }
280
+
281
+ // On initial load request, create a 1x1 transparent texture to use until
282
+ // the texture data is finally loaded.
283
+ glw.activeTexture(0);
284
+ glw.bindTexture(nativeTexture);
285
+
286
+ // linear texture filtering
287
+ glw.texParameteri(glw.TEXTURE_MAG_FILTER, glw.LINEAR);
288
+ glw.texParameteri(glw.TEXTURE_MIN_FILTER, glw.LINEAR);
289
+
290
+ // texture wrapping method
291
+ glw.texParameteri(glw.TEXTURE_WRAP_S, glw.CLAMP_TO_EDGE);
292
+ glw.texParameteri(glw.TEXTURE_WRAP_T, glw.CLAMP_TO_EDGE);
293
+ return nativeTexture;
294
+ }
295
+ }