@esotericsoftware/spine-canvaskit 4.2.83 → 4.2.85

package/dist/esm/spine-canvaskit.mjs

@@ -4783,7 +4783,7 @@ var MeshAttachment = class _MeshAttachment extends VertexAttachment {
     this.copyTo(copy);
     copy.regionUVs = new Array(this.regionUVs.length);
     Utils.arrayCopy(this.regionUVs, 0, copy.regionUVs, 0, this.regionUVs.length);
-    copy.uvs = new Array(this.uvs.length);
+    copy.uvs = this.uvs instanceof Float32Array ? Utils.newFloatArray(this.uvs.length) : new Array(this.uvs.length);
     Utils.arrayCopy(this.uvs, 0, copy.uvs, 0, this.uvs.length);
     copy.triangles = new Array(this.triangles.length);
     Utils.arrayCopy(this.triangles, 0, copy.triangles, 0, this.triangles.length);
@@ -5524,16 +5524,15 @@ var AssetManagerBase = class {
   pathPrefix = "";
   textureLoader;
   downloader;
-  assets = {};
-  assetsRefCount = {};
-  assetsLoaded = {};
+  cache;
   errors = {};
   toLoad = 0;
   loaded = 0;
-  constructor(textureLoader, pathPrefix = "", downloader = new Downloader()) {
+  constructor(textureLoader, pathPrefix = "", downloader = new Downloader(), cache = new AssetCache()) {
     this.textureLoader = textureLoader;
     this.pathPrefix = pathPrefix;
     this.downloader = downloader;
+    this.cache = cache;
   }
   start(path) {
     this.toLoad++;
@@ -5542,8 +5541,8 @@ var AssetManagerBase = class {
   success(callback, path, asset) {
     this.toLoad--;
     this.loaded++;
-    this.assets[path] = asset;
-    this.assetsRefCount[path] = (this.assetsRefCount[path] || 0) + 1;
+    this.cache.assets[path] = asset;
+    this.cache.assetsRefCount[path] = (this.cache.assetsRefCount[path] || 0) + 1;
     if (callback) callback(path, asset);
   }
   error(callback, path, message) {
@@ -5574,7 +5573,7 @@ var AssetManagerBase = class {
   }) {
     path = this.start(path);
     if (this.reuseAssets(path, success, error)) return;
-    this.assetsLoaded[path] = new Promise((resolve, reject) => {
+    this.cache.assetsLoaded[path] = new Promise((resolve, reject) => {
       this.downloader.downloadBinary(path, (data) => {
         this.success(success, path, data);
         resolve(data);
@@ -5600,7 +5599,7 @@ var AssetManagerBase = class {
   }) {
     path = this.start(path);
     if (this.reuseAssets(path, success, error)) return;
-    this.assetsLoaded[path] = new Promise((resolve, reject) => {
+    this.cache.assetsLoaded[path] = new Promise((resolve, reject) => {
       this.downloader.downloadJson(path, (data) => {
         this.success(success, path, data);
         resolve(data);
@@ -5614,10 +5613,14 @@ var AssetManagerBase = class {
   reuseAssets(path, success = () => {
   }, error = () => {
   }) {
-    const loadedStatus = this.assetsLoaded[path];
+    const loadedStatus = this.cache.assetsLoaded[path];
     const alreadyExistsOrLoading = loadedStatus !== void 0;
     if (alreadyExistsOrLoading) {
-      loadedStatus.then((data) => this.success(success, path, data)).catch((errorMsg) => this.error(error, path, errorMsg));
+      this.cache.assetsLoaded[path] = loadedStatus.then((data) => {
+        data = data instanceof Image || data instanceof ImageBitmap ? this.textureLoader(data) : data;
+        this.success(success, path, data);
+        return data;
+      }).catch((errorMsg) => this.error(error, path, errorMsg));
     }
     return alreadyExistsOrLoading;
   }
@@ -5626,7 +5629,7 @@ var AssetManagerBase = class {
   }) {
     path = this.start(path);
     if (this.reuseAssets(path, success, error)) return;
-    this.assetsLoaded[path] = new Promise((resolve, reject) => {
+    this.cache.assetsLoaded[path] = new Promise((resolve, reject) => {
       let isBrowser = !!(typeof window !== "undefined" && typeof navigator !== "undefined" && window.document);
       let isWebWorker = !isBrowser;
       if (isWebWorker) {
@@ -5670,7 +5673,7 @@ var AssetManagerBase = class {
     let parent = index >= 0 ? path.substring(0, index + 1) : "";
     path = this.start(path);
     if (this.reuseAssets(path, success, error)) return;
-    this.assetsLoaded[path] = new Promise((resolve, reject) => {
+    this.cache.assetsLoaded[path] = new Promise((resolve, reject) => {
       this.downloader.downloadText(path, (atlasText) => {
         try {
           let atlas = new TextureAtlas(atlasText);
@@ -5689,7 +5692,7 @@ var AssetManagerBase = class {
               },
               (imagePath, message) => {
                 if (!abort) {
-                  const errorMsg = `Couldn't load texture atlas ${path} page image: ${imagePath}`;
+                  const errorMsg = `Couldn't load texture ${path} page image: ${imagePath}`;
                   this.error(error, path, errorMsg);
                   reject(errorMsg);
                 }
@@ -5714,7 +5717,7 @@ var AssetManagerBase = class {
   }, fileAlias) {
     path = this.start(path);
     if (this.reuseAssets(path, success, error)) return;
-    this.assetsLoaded[path] = new Promise((resolve, reject) => {
+    this.cache.assetsLoaded[path] = new Promise((resolve, reject) => {
       this.downloader.downloadText(path, (atlasText) => {
         try {
           const atlas = new TextureAtlas(atlasText);
@@ -5778,33 +5781,36 @@ var AssetManagerBase = class {
       );
     });
   }
+  setCache(cache) {
+    this.cache = cache;
+  }
   get(path) {
-    return this.assets[this.pathPrefix + path];
+    return this.cache.assets[this.pathPrefix + path];
   }
   require(path) {
     path = this.pathPrefix + path;
-    let asset = this.assets[path];
+    let asset = this.cache.assets[path];
     if (asset) return asset;
     let error = this.errors[path];
     throw Error("Asset not found: " + path + (error ? "\n" + error : ""));
   }
   remove(path) {
     path = this.pathPrefix + path;
-    let asset = this.assets[path];
+    let asset = this.cache.assets[path];
     if (asset.dispose) asset.dispose();
-    delete this.assets[path];
-    delete this.assetsRefCount[path];
-    delete this.assetsLoaded[path];
+    delete this.cache.assets[path];
+    delete this.cache.assetsRefCount[path];
+    delete this.cache.assetsLoaded[path];
     return asset;
   }
   removeAll() {
-    for (let path in this.assets) {
-      let asset = this.assets[path];
+    for (let path in this.cache.assets) {
+      let asset = this.cache.assets[path];
       if (asset.dispose) asset.dispose();
     }
-    this.assets = {};
-    this.assetsLoaded = {};
-    this.assetsRefCount = {};
+    this.cache.assets = {};
+    this.cache.assetsLoaded = {};
+    this.cache.assetsRefCount = {};
   }
   isLoadingComplete() {
     return this.toLoad == 0;
@@ -5820,7 +5826,7 @@ var AssetManagerBase = class {
   }
   // dispose asset only if it's not used by others
   disposeAsset(path) {
-    if (--this.assetsRefCount[path] === 0) {
+    if (--this.cache.assetsRefCount[path] === 0) {
       this.remove(path);
     }
   }
@@ -5831,6 +5837,23 @@ var AssetManagerBase = class {
     return this.errors;
   }
 };
+var AssetCache = class _AssetCache {
+  assets = {};
+  assetsRefCount = {};
+  assetsLoaded = {};
+  static AVAILABLE_CACHES = /* @__PURE__ */ new Map();
+  static getCache(id) {
+    const cache = _AssetCache.AVAILABLE_CACHES.get(id);
+    if (cache) return cache;
+    const newCache = new _AssetCache();
+    _AssetCache.AVAILABLE_CACHES.set(id, newCache);
+    return newCache;
+  }
+  async addAsset(path, asset) {
+    this.assetsLoaded[path] = Promise.resolve(asset);
+    this.assets[path] = await asset;
+  }
+};
 var Downloader = class {
   callbacks = {};
   rawDataUris = {};
@@ -11512,6 +11535,7 @@ export {
   AnimationState,
   AnimationStateAdapter,
   AnimationStateData,
+  AssetCache,
   AssetManagerBase,
   AtlasAttachmentLoader,
   Attachment,