@esotericsoftware/spine-pixi-v8 4.2.83 → 4.2.85

package/dist/iife/spine-pixi-v8.js

@@ -33,6 +33,7 @@ var spine = (() => {
     AnimationState: () => AnimationState,
     AnimationStateAdapter: () => AnimationStateAdapter,
     AnimationStateData: () => AnimationStateData,
+    AssetCache: () => AssetCache,
     AssetManagerBase: () => AssetManagerBase,
     AtlasAttachmentLoader: () => AtlasAttachmentLoader,
     Attachment: () => Attachment,
@@ -4952,7 +4953,7 @@ var spine = (() => {
       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);
@@ -5693,16 +5694,15 @@ var spine = (() => {
     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(path2) {
       this.toLoad++;
@@ -5711,8 +5711,8 @@ var spine = (() => {
     success(callback, path2, asset) {
       this.toLoad--;
       this.loaded++;
-      this.assets[path2] = asset;
-      this.assetsRefCount[path2] = (this.assetsRefCount[path2] || 0) + 1;
+      this.cache.assets[path2] = asset;
+      this.cache.assetsRefCount[path2] = (this.cache.assetsRefCount[path2] || 0) + 1;
       if (callback) callback(path2, asset);
     }
     error(callback, path2, message) {
@@ -5743,7 +5743,7 @@ var spine = (() => {
     }) {
       path2 = this.start(path2);
       if (this.reuseAssets(path2, success, error)) return;
-      this.assetsLoaded[path2] = new Promise((resolve, reject) => {
+      this.cache.assetsLoaded[path2] = new Promise((resolve, reject) => {
         this.downloader.downloadBinary(path2, (data) => {
           this.success(success, path2, data);
           resolve(data);
@@ -5769,7 +5769,7 @@ var spine = (() => {
     }) {
       path2 = this.start(path2);
       if (this.reuseAssets(path2, success, error)) return;
-      this.assetsLoaded[path2] = new Promise((resolve, reject) => {
+      this.cache.assetsLoaded[path2] = new Promise((resolve, reject) => {
         this.downloader.downloadJson(path2, (data) => {
           this.success(success, path2, data);
           resolve(data);
@@ -5783,10 +5783,14 @@ var spine = (() => {
     reuseAssets(path2, success = () => {
     }, error = () => {
     }) {
-      const loadedStatus = this.assetsLoaded[path2];
+      const loadedStatus = this.cache.assetsLoaded[path2];
       const alreadyExistsOrLoading = loadedStatus !== void 0;
       if (alreadyExistsOrLoading) {
-        loadedStatus.then((data) => this.success(success, path2, data)).catch((errorMsg) => this.error(error, path2, errorMsg));
+        this.cache.assetsLoaded[path2] = loadedStatus.then((data) => {
+          data = data instanceof Image || data instanceof ImageBitmap ? this.textureLoader(data) : data;
+          this.success(success, path2, data);
+          return data;
+        }).catch((errorMsg) => this.error(error, path2, errorMsg));
       }
       return alreadyExistsOrLoading;
     }
@@ -5795,7 +5799,7 @@ var spine = (() => {
     }) {
       path2 = this.start(path2);
       if (this.reuseAssets(path2, success, error)) return;
-      this.assetsLoaded[path2] = new Promise((resolve, reject) => {
+      this.cache.assetsLoaded[path2] = new Promise((resolve, reject) => {
         let isBrowser = !!(typeof window !== "undefined" && typeof navigator !== "undefined" && window.document);
         let isWebWorker = !isBrowser;
         if (isWebWorker) {
@@ -5839,7 +5843,7 @@ var spine = (() => {
       let parent = index >= 0 ? path2.substring(0, index + 1) : "";
       path2 = this.start(path2);
       if (this.reuseAssets(path2, success, error)) return;
-      this.assetsLoaded[path2] = new Promise((resolve, reject) => {
+      this.cache.assetsLoaded[path2] = new Promise((resolve, reject) => {
         this.downloader.downloadText(path2, (atlasText) => {
           try {
             let atlas = new TextureAtlas(atlasText);
@@ -5858,7 +5862,7 @@ var spine = (() => {
                 },
                 (imagePath, message) => {
                   if (!abort) {
-                    const errorMsg = `Couldn't load texture atlas ${path2} page image: ${imagePath}`;
+                    const errorMsg = `Couldn't load texture ${path2} page image: ${imagePath}`;
                     this.error(error, path2, errorMsg);
                     reject(errorMsg);
                   }
@@ -5883,7 +5887,7 @@ var spine = (() => {
     }, fileAlias) {
       path2 = this.start(path2);
       if (this.reuseAssets(path2, success, error)) return;
-      this.assetsLoaded[path2] = new Promise((resolve, reject) => {
+      this.cache.assetsLoaded[path2] = new Promise((resolve, reject) => {
         this.downloader.downloadText(path2, (atlasText) => {
           try {
             const atlas = new TextureAtlas(atlasText);
@@ -5947,33 +5951,36 @@ var spine = (() => {
         );
       });
     }
+    setCache(cache) {
+      this.cache = cache;
+    }
     get(path2) {
-      return this.assets[this.pathPrefix + path2];
+      return this.cache.assets[this.pathPrefix + path2];
     }
     require(path2) {
       path2 = this.pathPrefix + path2;
-      let asset = this.assets[path2];
+      let asset = this.cache.assets[path2];
       if (asset) return asset;
       let error = this.errors[path2];
       throw Error("Asset not found: " + path2 + (error ? "\n" + error : ""));
     }
     remove(path2) {
       path2 = this.pathPrefix + path2;
-      let asset = this.assets[path2];
+      let asset = this.cache.assets[path2];
       if (asset.dispose) asset.dispose();
-      delete this.assets[path2];
-      delete this.assetsRefCount[path2];
-      delete this.assetsLoaded[path2];
+      delete this.cache.assets[path2];
+      delete this.cache.assetsRefCount[path2];
+      delete this.cache.assetsLoaded[path2];
       return asset;
     }
     removeAll() {
-      for (let path2 in this.assets) {
-        let asset = this.assets[path2];
+      for (let path2 in this.cache.assets) {
+        let asset = this.cache.assets[path2];
         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;
@@ -5989,7 +5996,7 @@ var spine = (() => {
     }
     // dispose asset only if it's not used by others
     disposeAsset(path2) {
-      if (--this.assetsRefCount[path2] === 0) {
+      if (--this.cache.assetsRefCount[path2] === 0) {
         this.remove(path2);
       }
     }
@@ -6000,6 +6007,23 @@ var spine = (() => {
       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(path2, asset) {
+      this.assetsLoaded[path2] = Promise.resolve(asset);
+      this.assets[path2] = await asset;
+    }
+  };
   var Downloader = class {
     callbacks = {};
     rawDataUris = {};
@@ -11514,6 +11538,7 @@ var spine = (() => {
   };
 
   // spine-pixi-v8/src/assets/atlasLoader.ts
+  var loaderName = "spineTextureAtlasLoader";
   var spineTextureAtlasLoader = {
     extension: import_pixi2.ExtensionType.Asset,
     resolver: {
@@ -11528,10 +11553,11 @@ var spine = (() => {
       }
     },
     loader: {
+      name: loaderName,
       extension: {
         type: import_pixi2.ExtensionType.LoadParser,
         priority: import_pixi2.LoaderParserPriority.Normal,
-        name: "spineTextureAtlasLoader"
+        name: loaderName
       },
       test(url) {
         return (0, import_pixi2.checkExtension)(url, ".atlas");
@@ -11544,7 +11570,8 @@ var spine = (() => {
       testParse(asset, options) {
         const isExtensionRight = (0, import_pixi2.checkExtension)(options.src, ".atlas");
         const isString = typeof asset === "string";
-        return Promise.resolve(isExtensionRight && isString);
+        const isExplicitLoadParserSet = options.loadParser === loaderName;
+        return Promise.resolve((isExtensionRight || isExplicitLoadParserSet) && isString);
       },
       unload(atlas) {
         atlas.dispose();
@@ -11573,7 +11600,9 @@ var spine = (() => {
               src: (0, import_pixi2.copySearchParams)(url, options.src),
               data: {
                 ...metadata.imageMetadata,
-                alphaMode: page.pma ? "premultiplied-alpha" : "premultiply-alpha-on-upload"
+                // alphaMode: 'premultiplied-alpha'
+                alphaMode: "premultiply-alpha-on-upload"
+                // alphaMode: 'no-premultiply-alpha'
               }
             };
             const pixiPromise = loader.load(assetsToLoadIn).then((texture) => {
@@ -11591,6 +11620,7 @@ var spine = (() => {
 
   // spine-pixi-v8/src/assets/skeletonLoader.ts
   var import_pixi3 = __require("pixi.js");
+  var loaderName2 = "spineSkeletonLoader";
   function isJson(resource) {
     return Object.prototype.hasOwnProperty.call(resource, "bones");
   }
@@ -11600,10 +11630,11 @@ var spine = (() => {
   var spineLoaderExtension = {
     extension: import_pixi3.ExtensionType.Asset,
     loader: {
+      name: loaderName2,
       extension: {
         type: import_pixi3.ExtensionType.LoadParser,
         priority: import_pixi3.LoaderParserPriority.Normal,
-        name: "spineSkeletonLoader"
+        name: loaderName2
       },
       test(url) {
         return (0, import_pixi3.checkExtension)(url, ".skel");
@@ -11616,7 +11647,8 @@ var spine = (() => {
       testParse(asset, options) {
         const isJsonSpineModel = (0, import_pixi3.checkExtension)(options.src, ".json") && isJson(asset);
         const isBinarySpineModel = (0, import_pixi3.checkExtension)(options.src, ".skel") && isBuffer(asset);
-        return Promise.resolve(isJsonSpineModel || isBinarySpineModel);
+        const isExplicitLoadParserSet = options.loadParser === loaderName2;
+        return Promise.resolve(isJsonSpineModel || isBinarySpineModel || isExplicitLoadParserSet);
       }
     }
   };