@nativescript/canvas 2.0.0-webgpu.3 → 2.0.0-webgpu.31

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 (198) hide show
  1. package/Canvas/common.d.ts +4 -9
  2. package/Canvas/common.js +37 -126
  3. package/Canvas/common.js.map +1 -1
  4. package/Canvas/index.android.d.ts +0 -1
  5. package/Canvas/index.android.js +45 -38
  6. package/Canvas/index.android.js.map +1 -1
  7. package/Canvas/index.d.ts +11 -3
  8. package/Canvas/index.ios.js +49 -40
  9. package/Canvas/index.ios.js.map +1 -1
  10. package/Canvas/utils.d.ts +3 -0
  11. package/Canvas/utils.js +85 -0
  12. package/Canvas/utils.js.map +1 -0
  13. package/Canvas2D/CanvasRenderingContext2D/index.d.ts +1 -0
  14. package/Canvas2D/CanvasRenderingContext2D/index.js +1 -0
  15. package/Canvas2D/CanvasRenderingContext2D/index.js.map +1 -1
  16. package/Dom/Group.d.ts +1 -2
  17. package/Dom/Group.js.map +1 -1
  18. package/Dom/Image.js +0 -1
  19. package/Dom/Image.js.map +1 -1
  20. package/Dom/Paint.d.ts +1 -1
  21. package/Dom/shapes/Path.d.ts +1 -1
  22. package/ImageAsset/index.js +77 -33
  23. package/ImageAsset/index.js.map +1 -1
  24. package/ImageBitmap/index.js +107 -20
  25. package/ImageBitmap/index.js.map +1 -1
  26. package/README.md +2 -4
  27. package/WebGL/WebGLRenderingContext/index.js +74 -31
  28. package/WebGL/WebGLRenderingContext/index.js.map +1 -1
  29. package/WebGL2/WebGL2RenderingContext/index.js +4 -4
  30. package/WebGL2/WebGL2RenderingContext/index.js.map +1 -1
  31. package/WebGPU/GPU.js +4 -3
  32. package/WebGPU/GPU.js.map +1 -1
  33. package/WebGPU/GPUAdapter.d.ts +6 -3
  34. package/WebGPU/GPUAdapter.js +31 -0
  35. package/WebGPU/GPUAdapter.js.map +1 -1
  36. package/WebGPU/GPUBindGroup.d.ts +1 -0
  37. package/WebGPU/GPUBindGroup.js +3 -0
  38. package/WebGPU/GPUBindGroup.js.map +1 -1
  39. package/WebGPU/GPUBindGroupLayout.d.ts +1 -0
  40. package/WebGPU/GPUBindGroupLayout.js +3 -0
  41. package/WebGPU/GPUBindGroupLayout.js.map +1 -1
  42. package/WebGPU/GPUBuffer.js +10 -2
  43. package/WebGPU/GPUBuffer.js.map +1 -1
  44. package/WebGPU/GPUCanvasContext.d.ts +3 -2
  45. package/WebGPU/GPUCanvasContext.js +52 -10
  46. package/WebGPU/GPUCanvasContext.js.map +1 -1
  47. package/WebGPU/GPUCommandBuffer.d.ts +1 -0
  48. package/WebGPU/GPUCommandBuffer.js +3 -0
  49. package/WebGPU/GPUCommandBuffer.js.map +1 -1
  50. package/WebGPU/GPUCommandEncoder.d.ts +3 -9
  51. package/WebGPU/GPUCommandEncoder.js +94 -41
  52. package/WebGPU/GPUCommandEncoder.js.map +1 -1
  53. package/WebGPU/GPUComputePassEncoder.d.ts +1 -0
  54. package/WebGPU/GPUComputePassEncoder.js +3 -0
  55. package/WebGPU/GPUComputePassEncoder.js.map +1 -1
  56. package/WebGPU/GPUComputePipeline.d.ts +1 -0
  57. package/WebGPU/GPUComputePipeline.js +3 -0
  58. package/WebGPU/GPUComputePipeline.js.map +1 -1
  59. package/WebGPU/GPUDevice.d.ts +17 -79
  60. package/WebGPU/GPUDevice.js +76 -91
  61. package/WebGPU/GPUDevice.js.map +1 -1
  62. package/WebGPU/GPUExternalTexture.d.ts +1 -0
  63. package/WebGPU/GPUExternalTexture.js +3 -0
  64. package/WebGPU/GPUExternalTexture.js.map +1 -1
  65. package/WebGPU/GPUPipelineLayout.d.ts +1 -0
  66. package/WebGPU/GPUPipelineLayout.js +3 -0
  67. package/WebGPU/GPUPipelineLayout.js.map +1 -1
  68. package/WebGPU/GPUQuerySet.d.ts +1 -0
  69. package/WebGPU/GPUQuerySet.js +3 -0
  70. package/WebGPU/GPUQuerySet.js.map +1 -1
  71. package/WebGPU/GPUQueue.d.ts +1 -0
  72. package/WebGPU/GPUQueue.js +56 -14
  73. package/WebGPU/GPUQueue.js.map +1 -1
  74. package/WebGPU/GPURenderBundle.d.ts +1 -0
  75. package/WebGPU/GPURenderBundle.js +3 -0
  76. package/WebGPU/GPURenderBundle.js.map +1 -1
  77. package/WebGPU/GPURenderBundleEncoder.d.ts +4 -2
  78. package/WebGPU/GPURenderBundleEncoder.js +7 -3
  79. package/WebGPU/GPURenderBundleEncoder.js.map +1 -1
  80. package/WebGPU/GPURenderPassEncoder.d.ts +2 -1
  81. package/WebGPU/GPURenderPassEncoder.js +5 -2
  82. package/WebGPU/GPURenderPassEncoder.js.map +1 -1
  83. package/WebGPU/GPURenderPipeline.d.ts +1 -0
  84. package/WebGPU/GPURenderPipeline.js +3 -0
  85. package/WebGPU/GPURenderPipeline.js.map +1 -1
  86. package/WebGPU/GPUSampler.d.ts +1 -0
  87. package/WebGPU/GPUSampler.js +3 -0
  88. package/WebGPU/GPUSampler.js.map +1 -1
  89. package/WebGPU/GPUShaderModule.d.ts +1 -1
  90. package/WebGPU/GPUShaderModule.js +2 -2
  91. package/WebGPU/GPUShaderModule.js.map +1 -1
  92. package/WebGPU/GPUTexture.d.ts +1 -0
  93. package/WebGPU/GPUTexture.js +3 -0
  94. package/WebGPU/GPUTexture.js.map +1 -1
  95. package/WebGPU/GPUTextureView.d.ts +1 -0
  96. package/WebGPU/GPUTextureView.js +3 -0
  97. package/WebGPU/GPUTextureView.js.map +1 -1
  98. package/WebGPU/Interfaces.d.ts +95 -4
  99. package/WebGPU/Types.d.ts +9 -1
  100. package/WebGPU/Utils.d.ts +6 -0
  101. package/WebGPU/Utils.js +224 -0
  102. package/WebGPU/Utils.js.map +1 -1
  103. package/angular/esm2022/index.mjs +4 -4
  104. package/angular/fesm2022/nativescript-canvas-angular.mjs +4 -4
  105. package/package.json +1 -1
  106. package/platforms/android/canvas-release.aar +0 -0
  107. package/platforms/ios/CanvasNative.xcframework/Info.plist +5 -5
  108. package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative +0 -0
  109. package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/CanvasNative-Swift.h +40 -12
  110. package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/canvas_ios.h +7 -0
  111. package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/canvas_native.h +227 -62
  112. package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Info.plist +0 -0
  113. package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo +0 -0
  114. package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.abi.json +7341 -6577
  115. package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.private.swiftinterface +62 -4
  116. package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.swiftdoc +0 -0
  117. package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios.swiftinterface +62 -4
  118. package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/NSCCanvas.nib +0 -0
  119. package/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative +0 -0
  120. package/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/Relocations/aarch64/CanvasNative.yml +650 -644
  121. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative +0 -0
  122. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Headers/CanvasNative-Swift.h +80 -24
  123. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Headers/canvas_ios.h +7 -0
  124. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Headers/canvas_native.h +227 -62
  125. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Info.plist +0 -0
  126. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo +0 -0
  127. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo +0 -0
  128. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json +7341 -6577
  129. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface +62 -4
  130. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftdoc +0 -0
  131. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftinterface +62 -4
  132. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json +7341 -6577
  133. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface +62 -4
  134. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftdoc +0 -0
  135. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +62 -4
  136. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/NSCCanvas.nib +0 -0
  137. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources +27 -27
  138. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative +0 -0
  139. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/Relocations/aarch64/CanvasNative.yml +652 -646
  140. package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/Relocations/x86_64/CanvasNative.yml +704 -684
  141. package/platforms/ios/src/NSOperationQueueWrapper.h +1 -1
  142. package/platforms/ios/src/NSOperationQueueWrapper.mm +41 -9
  143. package/platforms/ios/src/cpp/AsyncCallback.h +16 -8
  144. package/platforms/ios/src/cpp/CanvasJSIModule.cpp +208 -789
  145. package/platforms/ios/src/cpp/ImageAssetImpl.cpp +18 -28
  146. package/platforms/ios/src/cpp/ImageAssetImpl.h +3 -3
  147. package/platforms/ios/src/cpp/ImageBitmapImpl.cpp +60 -3
  148. package/platforms/ios/src/cpp/ImageBitmapImpl.h +10 -3
  149. package/platforms/ios/src/cpp/PromiseCallback.h +1 -2
  150. package/platforms/ios/src/cpp/canvas2d/CanvasRenderingContext2DImpl.cpp +1 -1
  151. package/platforms/ios/src/cpp/canvas2d/CanvasRenderingContext2DImpl.h +3 -3
  152. package/platforms/ios/src/cpp/canvas2d/Path2D.h +5 -5
  153. package/platforms/ios/src/cpp/webgl/WebGLRenderingContext.cpp +106 -1
  154. package/platforms/ios/src/cpp/webgpu/GPUAdapterImpl.cpp +26 -23
  155. package/platforms/ios/src/cpp/webgpu/GPUBindGroupImpl.cpp +31 -5
  156. package/platforms/ios/src/cpp/webgpu/GPUBindGroupImpl.h +4 -1
  157. package/platforms/ios/src/cpp/webgpu/GPUBindGroupLayoutImpl.cpp +26 -0
  158. package/platforms/ios/src/cpp/webgpu/GPUBindGroupLayoutImpl.h +3 -0
  159. package/platforms/ios/src/cpp/webgpu/GPUBufferImpl.cpp +41 -7
  160. package/platforms/ios/src/cpp/webgpu/GPUBufferImpl.h +4 -0
  161. package/platforms/ios/src/cpp/webgpu/GPUCanvasContextImpl.cpp +11 -5
  162. package/platforms/ios/src/cpp/webgpu/GPUCommandBufferImpl.cpp +28 -1
  163. package/platforms/ios/src/cpp/webgpu/GPUCommandBufferImpl.h +3 -0
  164. package/platforms/ios/src/cpp/webgpu/GPUCommandEncoderImpl.cpp +75 -79
  165. package/platforms/ios/src/cpp/webgpu/GPUCommandEncoderImpl.h +4 -0
  166. package/platforms/ios/src/cpp/webgpu/GPUComputePassEncoderImpl.cpp +42 -14
  167. package/platforms/ios/src/cpp/webgpu/GPUComputePassEncoderImpl.h +3 -0
  168. package/platforms/ios/src/cpp/webgpu/GPUComputePipelineImpl.cpp +25 -0
  169. package/platforms/ios/src/cpp/webgpu/GPUComputePipelineImpl.h +2 -0
  170. package/platforms/ios/src/cpp/webgpu/GPUDeviceImpl.cpp +1597 -674
  171. package/platforms/ios/src/cpp/webgpu/GPUDeviceImpl.h +2 -0
  172. package/platforms/ios/src/cpp/webgpu/GPUImpl.cpp +2 -1
  173. package/platforms/ios/src/cpp/webgpu/GPUImpl.h +1 -1
  174. package/platforms/ios/src/cpp/webgpu/GPULabel.h +33 -0
  175. package/platforms/ios/src/cpp/webgpu/GPUPipelineLayoutImpl.cpp +26 -0
  176. package/platforms/ios/src/cpp/webgpu/GPUPipelineLayoutImpl.h +3 -1
  177. package/platforms/ios/src/cpp/webgpu/GPUQuerySetImpl.cpp +1 -2
  178. package/platforms/ios/src/cpp/webgpu/GPUQuerySetImpl.h +1 -1
  179. package/platforms/ios/src/cpp/webgpu/GPUQueueImpl.cpp +50 -13
  180. package/platforms/ios/src/cpp/webgpu/GPUQueueImpl.h +3 -0
  181. package/platforms/ios/src/cpp/webgpu/GPURenderBundleEncoderImpl.cpp +43 -14
  182. package/platforms/ios/src/cpp/webgpu/GPURenderBundleEncoderImpl.h +3 -0
  183. package/platforms/ios/src/cpp/webgpu/GPURenderBundleImpl.cpp +25 -0
  184. package/platforms/ios/src/cpp/webgpu/GPURenderBundleImpl.h +3 -0
  185. package/platforms/ios/src/cpp/webgpu/GPURenderPassEncoderImpl.cpp +39 -13
  186. package/platforms/ios/src/cpp/webgpu/GPURenderPassEncoderImpl.h +3 -0
  187. package/platforms/ios/src/cpp/webgpu/GPURenderPipelineImpl.cpp +25 -0
  188. package/platforms/ios/src/cpp/webgpu/GPURenderPipelineImpl.h +3 -0
  189. package/platforms/ios/src/cpp/webgpu/GPUSamplerImpl.cpp +26 -0
  190. package/platforms/ios/src/cpp/webgpu/GPUSamplerImpl.h +4 -1
  191. package/platforms/ios/src/cpp/webgpu/GPUShaderModuleImpl.cpp +24 -0
  192. package/platforms/ios/src/cpp/webgpu/GPUShaderModuleImpl.h +3 -0
  193. package/platforms/ios/src/cpp/webgpu/GPUTextureImpl.cpp +34 -8
  194. package/platforms/ios/src/cpp/webgpu/GPUTextureImpl.h +2 -0
  195. package/platforms/ios/src/cpp/webgpu/GPUTextureViewImpl.cpp +26 -0
  196. package/platforms/ios/src/cpp/webgpu/GPUTextureViewImpl.h +3 -0
  197. package/platforms/ios/src/cpp/webgpu/GPUUtils.h +511 -0
  198. package/utils.d.ts +1 -1
package/Dom/Group.d.ts CHANGED
@@ -1,5 +1,4 @@
1
- import { Property, ShorthandProperty, Style, ViewBase } from '@nativescript/core';
2
- import { View } from '@nativescript/core/ui/core/view';
1
+ import { Property, ShorthandProperty, Style, View, ViewBase } from '@nativescript/core';
3
2
  import { Paint } from './Paint';
4
3
  import { DOMMatrix } from '../Canvas2D/DOMMatrix';
5
4
  import { Canvas } from '../Canvas';
package/Dom/Group.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Group.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Group.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Group.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Group.ts"],"names":[],"mappings":"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"}
package/Dom/Image.js CHANGED
@@ -26,7 +26,6 @@ const imageProperty = new Property({
26
26
  // target.invalidate();
27
27
  if (typeof newValue === 'string') {
28
28
  if (newValue.startsWith('http')) {
29
- console.log('??', newValue);
30
29
  target._loader.fromUrl(newValue);
31
30
  }
32
31
  }
package/Dom/Image.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Image.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,QAAQ,EAAE,IAAI,EAA+B,MAAM,oBAAoB,CAAC;AAE1G,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAgB;IAC7C,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IACD,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ;QACtC,MAAM,CAAC,UAAU,EAAE,CAAC;IACrB,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAgB;IAC7C,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IACD,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ;QACtC,MAAM,CAAC,UAAU,EAAE,CAAC;IACrB,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,IAAI,QAAQ,CAA6B;IAC9D,IAAI,EAAE,OAAO;IACb,YAAY,CAAC,MAAa,EAAE,QAAQ,EAAE,QAAQ;QAC7C,uBAAuB;QAEvB,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAClC,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACjC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAC5B,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAClC,CAAC;QACF,CAAC;IACF,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,OAAO,KAAM,SAAQ,IAAI;IAO9B,UAAU,CAAC,MAAc;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACvB,CAAC;IAID;QACC,KAAK,EAAE,CAAC;QAHT,YAAO,GAAG,IAAI,UAAU,EAAE,CAAC;QAI1B,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,KAAqD,EAAE,EAAE;YACrF,IAAI,CAAC,UAAU,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,UAAU;QACT,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,MAAM,YAAY,GAAG,EAAE,CAAC;YAC3B,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACnB,CAAC;aAAM,IAAI,MAAM,YAAY,KAAK,EAAE,CAAC;YACpC,MAAM,CAAC,UAAU,EAAE,CAAC;QACrB,CAAC;IACF,CAAC;IAED,IAAI;QACH,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO;QACR,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAQ,CAAC;QAErD,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAc,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjF,CAAC;CACD;AAED,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC9B,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC1B,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC"}
1
+ {"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Image.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,QAAQ,EAAE,IAAI,EAA+B,MAAM,oBAAoB,CAAC;AAE1G,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAgB;IAC7C,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IACD,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ;QACtC,MAAM,CAAC,UAAU,EAAE,CAAC;IACrB,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAgB;IAC7C,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IACD,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ;QACtC,MAAM,CAAC,UAAU,EAAE,CAAC;IACrB,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,IAAI,QAAQ,CAA6B;IAC9D,IAAI,EAAE,OAAO;IACb,YAAY,CAAC,MAAa,EAAE,QAAQ,EAAE,QAAQ;QAC7C,uBAAuB;QAEvB,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAClC,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACjC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAClC,CAAC;QACF,CAAC;IACF,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,OAAO,KAAM,SAAQ,IAAI;IAO9B,UAAU,CAAC,MAAc;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACvB,CAAC;IAID;QACC,KAAK,EAAE,CAAC;QAHT,YAAO,GAAG,IAAI,UAAU,EAAE,CAAC;QAI1B,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,KAAqD,EAAE,EAAE;YACrF,IAAI,CAAC,UAAU,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,UAAU;QACT,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,MAAM,YAAY,GAAG,EAAE,CAAC;YAC3B,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACnB,CAAC;aAAM,IAAI,MAAM,YAAY,KAAK,EAAE,CAAC;YACpC,MAAM,CAAC,UAAU,EAAE,CAAC;QACrB,CAAC;IACF,CAAC;IAED,IAAI;QACH,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO;QACR,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAQ,CAAC;QAErD,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAc,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjF,CAAC;CACD;AAED,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC9B,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC1B,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC"}
package/Dom/Paint.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { LayoutBase, Property } from '@nativescript/core';
2
2
  import { Canvas } from '../Canvas';
3
- export declare const paintStyleProperty: any;
3
+ export declare const paintStyleProperty: Property<Paint, "fill" | "stroke">;
4
4
  export declare const strokeWidthProperty: Property<Paint, number>;
5
5
  export declare const strokeJoinProperty: Property<Paint, "bevel" | "miter" | "round">;
6
6
  export declare class Paint extends LayoutBase {
package/Dom/shapes/Path.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { Property } from '@nativescript/core';
2
2
  import { Paint } from '../Paint';
3
3
  import { Path2D, DOMMatrix } from '../../Canvas2D';
4
- export declare const pathProperty: any;
4
+ export declare const pathProperty: Property<Path, string | Path2D>;
5
5
  export declare const startProperty: Property<Path, number>;
6
6
  export declare const endProperty: Property<Path, number>;
7
7
  export declare class Path extends Paint {
package/ImageAsset/index.js CHANGED
@@ -102,28 +102,50 @@ export class ImageAsset extends Observable {
102
102
  if (__ANDROID__) {
103
103
  const asset = this._android.getAsset();
104
104
  const ref = new WeakRef(this);
105
- org.nativescript.canvas.NSCImageAsset.loadImageFromPathAsync(asset, path, new org.nativescript.canvas.NSCImageAsset.Callback({
106
- onComplete(success) {
107
- const owner = ref.get();
108
- if (!success) {
109
- const error = org.nativescript.canvas.NSCImageAsset.getError(asset);
110
- if (owner) {
111
- owner.emitComplete(success, error);
105
+ if (typeof path === 'string' && path.indexOf('.webp') > -1) {
106
+ org.nativescript.canvas.NSCImageAsset.loadWebPAsync(asset, path, new org.nativescript.canvas.NSCImageAsset.Callback({
107
+ onComplete(success) {
108
+ const owner = ref.get();
109
+ if (!success) {
110
+ const error = org.nativescript.canvas.NSCImageAsset.getError(asset);
111
+ if (owner) {
112
+ owner.emitComplete(success, error);
113
+ }
114
+ reject(error);
112
115
  }
113
- reject(error);
114
- }
115
- else {
116
- if (owner) {
117
- owner.emitComplete(success, undefined);
116
+ else {
117
+ if (owner) {
118
+ owner.emitComplete(success, undefined);
119
+ }
120
+ resolve(success);
118
121
  }
119
- resolve(success);
120
- }
121
- },
122
- }));
122
+ },
123
+ }));
124
+ }
125
+ else {
126
+ org.nativescript.canvas.NSCImageAsset.loadImageFromPathAsync(asset, path, new org.nativescript.canvas.NSCImageAsset.Callback({
127
+ onComplete(success) {
128
+ const owner = ref.get();
129
+ if (!success) {
130
+ const error = org.nativescript.canvas.NSCImageAsset.getError(asset);
131
+ if (owner) {
132
+ owner.emitComplete(success, error);
133
+ }
134
+ reject(error);
135
+ }
136
+ else {
137
+ if (owner) {
138
+ owner.emitComplete(success, undefined);
139
+ }
140
+ resolve(success);
141
+ }
142
+ },
143
+ }));
144
+ }
123
145
  return;
124
146
  }
125
147
  this._incrementStrongRef();
126
- this.native.fromFileCb(path, (success, error) => {
148
+ this.native.fromFileCb(path.toString(), (success, error) => {
127
149
  this.emitComplete(success, error);
128
150
  if (error) {
129
151
  reject(error);
@@ -166,24 +188,46 @@ export class ImageAsset extends Observable {
166
188
  if (__ANDROID__) {
167
189
  const ref = new WeakRef(this);
168
190
  const asset = this._android.getAsset();
169
- org.nativescript.canvas.NSCImageAsset.loadImageFromBufferAsync(asset, bytes, new org.nativescript.canvas.NSCImageAsset.Callback({
170
- onComplete(success) {
171
- const owner = ref.get();
172
- if (!success) {
173
- const error = org.nativescript.canvas.NSCImageAsset.getError(asset);
174
- if (owner) {
175
- owner.emitComplete(success, error);
191
+ if (!ArrayBuffer.isView(bytes)) {
192
+ org.nativescript.canvas.NSCImageAsset.loadImageFromBytesAsync(asset, bytes, new org.nativescript.canvas.NSCImageAsset.Callback({
193
+ onComplete(success) {
194
+ const owner = ref.get();
195
+ if (!success) {
196
+ const error = org.nativescript.canvas.NSCImageAsset.getError(asset);
197
+ if (owner) {
198
+ owner.emitComplete(success, error);
199
+ }
200
+ reject(error);
176
201
  }
177
- reject(error);
178
- }
179
- else {
180
- if (owner) {
181
- owner.emitComplete(success, undefined);
202
+ else {
203
+ if (owner) {
204
+ owner.emitComplete(success, undefined);
205
+ }
206
+ resolve(success);
182
207
  }
183
- resolve(success);
184
- }
185
- },
186
- }));
208
+ },
209
+ }));
210
+ }
211
+ else {
212
+ org.nativescript.canvas.NSCImageAsset.loadImageFromBufferAsync(asset, bytes, new org.nativescript.canvas.NSCImageAsset.Callback({
213
+ onComplete(success) {
214
+ const owner = ref.get();
215
+ if (!success) {
216
+ const error = org.nativescript.canvas.NSCImageAsset.getError(asset);
217
+ if (owner) {
218
+ owner.emitComplete(success, error);
219
+ }
220
+ reject(error);
221
+ }
222
+ else {
223
+ if (owner) {
224
+ owner.emitComplete(success, undefined);
225
+ }
226
+ resolve(success);
227
+ }
228
+ },
229
+ }));
230
+ }
187
231
  return;
188
232
  }
189
233
  this._incrementStrongRef();
package/ImageAsset/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/canvas/ImageAsset/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/canvas/ImageAsset/index.ts"],"names":[],"mappings":"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"}
package/ImageBitmap/index.js CHANGED
@@ -3,6 +3,47 @@ import { ImageData } from '../Canvas2D';
3
3
  import { Canvas } from '../Canvas';
4
4
  import { ImageSource } from '@nativescript/core';
5
5
  import { Helpers } from '../helpers';
6
+ function parseOptions(options) {
7
+ if (__ANDROID__) {
8
+ const opts = new org.nativescript.canvas.NSCImageBitmap.Options();
9
+ if (options?.imageOrientation === 'flipY') {
10
+ opts.setImageOrientation(org.nativescript.canvas.ImageBitmapImageOrientation.FlipY);
11
+ }
12
+ switch (options?.premultiplyAlpha) {
13
+ case 'premultiply':
14
+ opts.setPremultiplyAlpha(org.nativescript.canvas.ImageBitmapPremultiplyAlpha.PremultiplyAlpha);
15
+ break;
16
+ case 'none':
17
+ opts.setPremultiplyAlpha(org.nativescript.canvas.ImageBitmapPremultiplyAlpha.None);
18
+ break;
19
+ }
20
+ if (options?.colorSpaceConversion === 'none') {
21
+ opts.setColorSpaceConversion(org.nativescript.canvas.ImageBitmapColorSpaceConversion.None);
22
+ }
23
+ if (typeof options?.resizeWidth === 'number') {
24
+ opts.setResizeWidth(options.resizeWidth);
25
+ }
26
+ if (typeof options?.resizeHeight === 'number') {
27
+ opts.setResizeHeight(options.resizeWidth);
28
+ }
29
+ switch (options?.resizeQuality) {
30
+ case 'medium':
31
+ opts.setResizeQuality(org.nativescript.canvas.ImageBitmapResizeQuality.Medium);
32
+ break;
33
+ case 'high':
34
+ opts.setResizeQuality(org.nativescript.canvas.ImageBitmapResizeQuality.High);
35
+ break;
36
+ case 'pixelated':
37
+ opts.setResizeQuality(org.nativescript.canvas.ImageBitmapResizeQuality.Pixelated);
38
+ break;
39
+ }
40
+ if (options?.premultiplyAlpha === 'flipY') {
41
+ opts.setImageOrientation(org.nativescript.canvas.ImageBitmapImageOrientation.FlipY);
42
+ }
43
+ return opts;
44
+ }
45
+ return options;
46
+ }
6
47
  export class ImageBitmap {
7
48
  get native() {
8
49
  return this._native;
@@ -28,8 +69,6 @@ export class ImageBitmap {
28
69
  static createFrom(source, options) {
29
70
  return new Promise(function (resolve, reject) {
30
71
  let realSource;
31
- let isBuffer = false;
32
- const id = Date.now();
33
72
  if (source instanceof Canvas) {
34
73
  realSource = source.native;
35
74
  }
@@ -45,7 +84,9 @@ export class ImageBitmap {
45
84
  else if (source instanceof Blob) {
46
85
  const bytes = Blob.InternalAccessor.getBuffer(source);
47
86
  realSource = bytes;
48
- isBuffer = true;
87
+ if (ArrayBuffer.isView(bytes)) {
88
+ realSource = new Uint8Array(bytes.buffer);
89
+ }
49
90
  }
50
91
  else if (source && typeof source === 'object' && typeof source.tagName === 'string') {
51
92
  if (source.tagName === 'IMG' || source.tagName === 'IMAGE') {
@@ -56,7 +97,8 @@ export class ImageBitmap {
56
97
  }
57
98
  }
58
99
  else if (source instanceof ArrayBuffer) {
59
- realSource = source;
100
+ // wrapping to create a ref
101
+ realSource = new Uint8Array(source);
60
102
  }
61
103
  else if (source instanceof ImageSource) {
62
104
  if (global.isAndroid) {
@@ -66,15 +108,38 @@ export class ImageBitmap {
66
108
  realSource = source.ios; // todo
67
109
  }
68
110
  }
69
- setTimeout(() => {
70
- global.CanvasModule.createImageBitmap(realSource, options, (error, value) => {
71
- if (value) {
72
- resolve(ImageBitmap.fromNative(value));
111
+ if (__ANDROID__) {
112
+ if (ArrayBuffer.isView(realSource)) {
113
+ const asset = new global.CanvasModule.ImageAsset();
114
+ const ptr = long(asset.__getRef());
115
+ const cb = new org.nativescript.canvas.NSCImageBitmap.Callback({
116
+ onComplete(done) {
117
+ if (done) {
118
+ const value = global.CanvasModule.ImageBitmap.fromAsset(asset);
119
+ resolve(ImageBitmap.fromNative(value));
120
+ }
121
+ else {
122
+ reject(new Error('Failed to create ImageBitmap'));
123
+ }
124
+ },
125
+ });
126
+ if (options) {
127
+ const opts = parseOptions(options);
128
+ org.nativescript.canvas.NSCImageBitmap.createFromOptions(ptr, realSource, opts, cb);
73
129
  }
74
130
  else {
75
- reject(new Error(error));
131
+ org.nativescript.canvas.NSCImageBitmap.createFrom(ptr, realSource, cb);
76
132
  }
77
- });
133
+ }
134
+ return;
135
+ }
136
+ global.CanvasModule.createImageBitmap(realSource, options, (error, value) => {
137
+ if (value) {
138
+ resolve(ImageBitmap.fromNative(value));
139
+ }
140
+ else {
141
+ reject(new Error(error));
142
+ }
78
143
  });
79
144
  });
80
145
  }
@@ -96,6 +161,9 @@ export class ImageBitmap {
96
161
  else if (source instanceof Blob) {
97
162
  const bytes = Blob.InternalAccessor.getBuffer(source);
98
163
  realSource = bytes;
164
+ if (ArrayBuffer.isView(bytes)) {
165
+ realSource = new Uint8Array(bytes.buffer);
166
+ }
99
167
  }
100
168
  else if (source && typeof source === 'object' && typeof source.tagName === 'string') {
101
169
  if (source.tagName === 'IMG' || source.tagName === 'IMAGE') {
@@ -106,7 +174,8 @@ export class ImageBitmap {
106
174
  }
107
175
  }
108
176
  else if (source instanceof ArrayBuffer) {
109
- realSource = source;
177
+ // wrapping to create a ref
178
+ realSource = new Uint8Array(source);
110
179
  }
111
180
  else if (source instanceof ImageSource) {
112
181
  if (global.isAndroid) {
@@ -116,15 +185,33 @@ export class ImageBitmap {
116
185
  realSource = source.ios; // todo
117
186
  }
118
187
  }
119
- setTimeout(() => {
120
- global.CanvasModule.createImageBitmap(realSource, sx, sy, sWidth, sHeight, options, (error, value) => {
121
- if (value) {
122
- resolve(ImageBitmap.fromNative(value));
123
- }
124
- else {
125
- reject(new Error(error));
126
- }
127
- });
188
+ if (__ANDROID__) {
189
+ if (ArrayBuffer.isView(realSource)) {
190
+ const asset = new global.CanvasModule.ImageAsset();
191
+ const ptr = long(asset.__getRef());
192
+ const cb = new org.nativescript.canvas.NSCImageBitmap.Callback({
193
+ onComplete(done) {
194
+ if (done) {
195
+ const value = global.CanvasModule.ImageBitmap.fromAsset(asset);
196
+ resolve(ImageBitmap.fromNative(value));
197
+ }
198
+ else {
199
+ reject(new Error('Failed to create ImageBitmap'));
200
+ }
201
+ },
202
+ });
203
+ const opts = parseOptions(options ?? {});
204
+ org.nativescript.canvas.NSCImageBitmap.createFromRectOptions(ptr, realSource, sx, sy, sWidth, sHeight, opts, cb);
205
+ }
206
+ return;
207
+ }
208
+ global.CanvasModule.createImageBitmap(realSource, sx, sy, sWidth, sHeight, options, (error, value) => {
209
+ if (value) {
210
+ resolve(ImageBitmap.fromNative(value));
211
+ }
212
+ else {
213
+ reject(new Error(error));
214
+ }
128
215
  });
129
216
  });
130
217
  }
package/ImageBitmap/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/canvas/ImageBitmap/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,MAAM,OAAO,WAAW;IAMvB,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,YAAoB,MAAW;QAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,KAAK;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;IAC1B,CAAC;IACD,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,KAAK;QACJ,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,KAAK;QACtB,IAAI,KAAK,EAAE,CAAC;YACX,OAAO,IAAI,WAAW,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,MAAW,EAAE,OAAY;QAC1C,OAAO,IAAI,OAAO,CAAC,UAAU,OAAO,EAAE,MAAM;YAC3C,IAAI,UAAU,CAAC;YACf,IAAI,QAAQ,GAAG,KAAK,CAAC;YACrB,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACtB,IAAI,MAAM,YAAY,MAAM,EAAE,CAAC;gBAC9B,UAAU,GAAI,MAAc,CAAC,MAAM,CAAC;YACrC,CAAC;iBAAM,IAAI,MAAM,YAAY,WAAW,EAAE,CAAC;gBAC1C,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;YAC5B,CAAC;iBAAM,IAAI,MAAM,YAAY,UAAU,EAAE,CAAC;gBACzC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;YAC5B,CAAC;iBAAM,IAAI,MAAM,YAAY,SAAS,EAAE,CAAC;gBACxC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;YAC5B,CAAC;iBAAM,IAAI,MAAM,YAAY,IAAI,EAAE,CAAC;gBACnC,MAAM,KAAK,GAAI,IAAY,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAe,CAAC;gBAC7E,UAAU,GAAG,KAAK,CAAC;gBACnB,QAAQ,GAAG,IAAI,CAAC;YACjB,CAAC;iBAAM,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACvF,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,IAAI,MAAM,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;oBAC5D,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;gBACnC,CAAC;qBAAM,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,OAAO,YAAY,MAAM,EAAE,CAAC;oBAC5E,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;gBACpC,CAAC;YACF,CAAC;iBAAM,IAAI,MAAM,YAAY,WAAW,EAAE,CAAC;gBAC1C,UAAU,GAAG,MAAM,CAAC;YACrB,CAAC;iBAAM,IAAI,MAAM,YAAY,WAAW,EAAE,CAAC;gBAC1C,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;oBACtB,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;gBACrC,CAAC;gBACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBAClB,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO;gBACjC,CAAC;YACF,CAAC;YAED,UAAU,CAAC,GAAG,EAAE;gBACf,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBAC3E,IAAI,KAAK,EAAE,CAAC;wBACX,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;oBACxC,CAAC;yBAAM,CAAC;wBACP,MAAM,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC1B,CAAC;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,MAAW,EAAE,EAAU,EAAE,EAAU,EAAE,MAAc,EAAE,OAAe,EAAE,OAAY;QACvG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtC,IAAI,UAAU,CAAC;YACf,IAAI,MAAM,YAAY,MAAM,EAAE,CAAC;gBAC9B,UAAU,GAAI,MAAc,CAAC,MAAM,CAAC;YACrC,CAAC;iBAAM,IAAI,MAAM,YAAY,WAAW,EAAE,CAAC;gBAC1C,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;YAC5B,CAAC;iBAAM,IAAI,MAAM,YAAY,UAAU,EAAE,CAAC;gBACzC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;YAC5B,CAAC;iBAAM,IAAI,MAAM,YAAY,SAAS,EAAE,CAAC;gBACxC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;YAC5B,CAAC;iBAAM,IAAI,MAAM,YAAY,IAAI,EAAE,CAAC;gBACnC,MAAM,KAAK,GAAI,IAAY,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAC/D,UAAU,GAAG,KAAK,CAAC;YACpB,CAAC;iBAAM,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACvF,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,IAAI,MAAM,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;oBAC5D,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;gBACnC,CAAC;qBAAM,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,OAAO,YAAY,MAAM,EAAE,CAAC;oBAC5E,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;gBACpC,CAAC;YACF,CAAC;iBAAM,IAAI,MAAM,YAAY,WAAW,EAAE,CAAC;gBAC1C,UAAU,GAAG,MAAM,CAAC;YACrB,CAAC;iBAAM,IAAI,MAAM,YAAY,WAAW,EAAE,CAAC;gBAC1C,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;oBACtB,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO;gBACrC,CAAC;gBAED,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBAClB,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO;gBACjC,CAAC;YACF,CAAC;YAED,UAAU,CAAC,GAAG,EAAE;gBACf,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBACpG,IAAI,KAAK,EAAE,CAAC;wBACX,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;oBACxC,CAAC;yBAAM,CAAC;wBACP,MAAM,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC1B,CAAC;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;CACD;AAxHA;IACC,OAAO,CAAC,UAAU,EAAE,CAAC;AACtB,CAAC,GAAA,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/canvas/ImageBitmap/index.ts"],"names":[],"mappings":"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"}
package/README.md CHANGED
@@ -103,12 +103,10 @@ export async function canvasReady(args) {
103
103
 
104
104
 
105
105
  /// rendering logic
106
- // to render to your screen you will need to get the current texture from the WebGPU context.
106
+ // to render to your screen you will need to call presentSurfacefrom the WebGPU context.
107
107
  // Add the followig to the end of your render loop to ensure it gets displayed.
108
108
 
109
- const texture = context.getCurrentTexture();
110
-
111
- context.presentSurface(texture);
109
+ context.presentSurface();
112
110
  }
113
111
  ```
114
112
 
package/WebGL/WebGLRenderingContext/index.js CHANGED
@@ -582,7 +582,80 @@ export class WebGLRenderingContextBase extends WebGLRenderingCommon {
582
582
  texImage2D(target, level, internalformat, width, height, border, format, type, pixels) {
583
583
  const length = arguments.length;
584
584
  if (length === 9) {
585
- this.native.texImage2D(target, level, internalformat, width, height, border, format, type ?? internalformat, pixels);
585
+ if (pixels && typeof pixels.tagName === 'string' && (pixels.tagName === 'VID' || pixels.tagName === 'VIDEO') && pixels._video && typeof pixels._video.getCurrentFrame === 'function') {
586
+ pixels._video.getCurrentFrame(this.native, this, target, level, internalformat, width, height);
587
+ }
588
+ else if (pixels && typeof pixels.getCurrentFrame === 'function') {
589
+ pixels.getCurrentFrame(this.native, this, target, level, internalformat, width, height);
590
+ }
591
+ else if (pixels instanceof ImageAsset) {
592
+ this.native.texImage2D(target, level, internalformat, width, height, border, format, type ?? internalformat, pixels.native);
593
+ }
594
+ else if (pixels instanceof ImageBitmap) {
595
+ this.native.texImage2D(target, level, internalformat, width, height, border, format, type ?? internalformat, pixels.native);
596
+ }
597
+ else if (pixels instanceof Canvas) {
598
+ this.native.texImage2D(target, level, internalformat, width, height, border, format, type ?? internalformat, pixels.native);
599
+ }
600
+ else if (global.isAndroid && pixels instanceof android.graphics.Bitmap) {
601
+ org.nativescript.canvas.NSCWebGLRenderingContext.texImage2D(java.lang.Long.valueOf(this._contextPtr), target, level, internalformat, width, height, pixels, this.native.__flipY);
602
+ //this.native.texImage2D(target, level, internalformat, width, height, pixels);
603
+ }
604
+ else if (global.isIOS && pixels instanceof UIImage) {
605
+ this.native.texImage2D(target, level, internalformat, width, height, pixels);
606
+ }
607
+ else if (pixels instanceof ImageSource) {
608
+ if (global.isAndroid) {
609
+ org.nativescript.canvas.NSCWebGLRenderingContext.texImage2D(java.lang.Long.valueOf(this._contextPtr), target, level, internalformat, width, height, pixels.android, this.native.__flipY);
610
+ }
611
+ }
612
+ else if (pixels && typeof pixels.tagName === 'string' && (pixels.tagName === 'IMG' || pixels.tagName === 'IMAGE')) {
613
+ const isSVG = !!pixels?._svg;
614
+ if (!isSVG && pixels._asset instanceof ImageAsset) {
615
+ this.native.texImage2D(target, level, internalformat, width, height, pixels._asset.native);
616
+ }
617
+ else if (pixels._imageSource instanceof ImageSource) {
618
+ if (global.isAndroid) {
619
+ org.nativescript.canvas.NSCWebGLRenderingContext.texImage2D(java.lang.Long.valueOf(this._contextPtr), target, level, internalformat, width, height, pixels._imageSource.android, this.native.__flipY);
620
+ }
621
+ }
622
+ else if (global.isAndroid && pixels._image instanceof android.graphics.Bitmap) {
623
+ org.nativescript.canvas.NSCWebGLRenderingContext.texImage2D(java.lang.Long.valueOf(this._contextPtr), target, level, internalformat, width, height, pixels._image, this.native.__flipY);
624
+ }
625
+ else if (global.isIOS && pixels._image instanceof UIImage) {
626
+ this.native.texImage2D(target, level, internalformat, width, height, pixels._image);
627
+ }
628
+ else if (pixels._svg) {
629
+ if (global.isAndroid) {
630
+ const svg = pixels._svg?._svg.getBitmap?.();
631
+ if (svg) {
632
+ org.nativescript.canvas.NSCWebGLRenderingContext.texImage2D(long(this.canvas._canvas.getNativeGL()), target, level, internalformat, width, height, svg, this.native.__flipY);
633
+ }
634
+ }
635
+ if (global.isIOS) {
636
+ const data = pixels._svg?._svg?.data;
637
+ const size = pixels._svg?._svg?.buf_size;
638
+ const dimensions = pixels._svg?._svg.data_size;
639
+ if (size) {
640
+ NSCWebGLRenderingContext.texImage2D(this.canvas._canvas.nativeGL, target, level, internalformat, width, height, data, size, dimensions, this.native.__flipY);
641
+ }
642
+ }
643
+ }
644
+ else if (typeof pixels.src === 'string') {
645
+ if (global.isAndroid) {
646
+ org.nativescript.canvas.NSCWebGLRenderingContext.texImage2D(java.lang.Long.valueOf(this._contextPtr), target, level, internalformat, width, height, ImageSource.fromFileSync(pixels.src).android, this.native.__flipY);
647
+ }
648
+ }
649
+ }
650
+ else if (pixels && typeof pixels.tagName === 'string' && pixels.tagName === 'CANVAS' && pixels._canvas instanceof Canvas) {
651
+ this.native.texImage2D(target, level, internalformat, width, height, pixels._canvas.native);
652
+ }
653
+ else if (pixels instanceof ImageData) {
654
+ this.native.texImage2D(target, level, internalformat, width, height, pixels.native);
655
+ }
656
+ else {
657
+ this.native.texImage2D(target, level, internalformat, width, height, border, format, type, pixels);
658
+ }
586
659
  }
587
660
  else if (length === 6) {
588
661
  if (border && typeof border.tagName === 'string' && (border.tagName === 'VID' || border.tagName === 'VIDEO') && border._video && typeof border._video.getCurrentFrame === 'function') {
@@ -599,19 +672,6 @@ export class WebGLRenderingContextBase extends WebGLRenderingCommon {
599
672
  }
600
673
  else if (border instanceof Canvas) {
601
674
  this.native.texImage2D(target, level, internalformat, width, height, border.native);
602
- /*if (global.isAndroid) {
603
- this.native.texImage2D(target, level, internalformat, width, height, border.native);
604
- } else {
605
- if ((border as any)._contextType === ContextType.Canvas) {
606
- if (!(border as any)._renderer) {
607
- (border as any)._renderer = Utils.setupRender();
608
- (border as any)._renderer.createSurface();
609
- }
610
- (border as any)._renderer.texImage2D(target, level, internalformat, width, height, (border as any)._canvas, this.canvas._canvas, this.native.__flipY);
611
- } else {
612
- this.native.texImage2D(target, level, internalformat, width, height, border.native);
613
- }
614
- }*/
615
675
  }
616
676
  else if (global.isAndroid && border instanceof android.graphics.Bitmap) {
617
677
  org.nativescript.canvas.NSCWebGLRenderingContext.texImage2D(java.lang.Long.valueOf(this._contextPtr), target, level, internalformat, width, height, border, this.native.__flipY);
@@ -665,23 +725,6 @@ export class WebGLRenderingContextBase extends WebGLRenderingCommon {
665
725
  }
666
726
  else if (border && typeof border.tagName === 'string' && border.tagName === 'CANVAS' && border._canvas instanceof Canvas) {
667
727
  this.native.texImage2D(target, level, internalformat, width, height, border._canvas.native);
668
- /*if (global.isAndroid) {
669
- this.native.texImage2D(target, level, internalformat, width, height, border._canvas.native);
670
- } else {
671
- if (border._canvas._contextType === ContextType.Canvas) {
672
- // const data = border._canvas._2dContext.getImageData(0, 0, width, height);
673
- // console.log(data);
674
- //this.native.texImage2D(target, level, internalformat, width, height, data);
675
- if (!border._canvas._renderer) {
676
- border._canvas._renderer = Utils.setupRender();
677
- border._canvas._renderer.createSurface();
678
- }
679
- border._canvas._renderer.texImage2D(target, level, internalformat, width, height, border._canvas._canvas, this.canvas._canvas, this.native.__flipY);
680
- } else {
681
- this.native.texImage2D(target, level, internalformat, width, height, border._canvas.native);
682
- }
683
- }[\'''
684
- */
685
728
  }
686
729
  else if (border instanceof ImageData) {
687
730
  this.native.texImage2D(target, level, internalformat, width, height, border.native);