@galacean/engine-spine 4.2.3 → 4.2.5

package/dist/main.js

@@ -5016,19 +5016,18 @@ function _async_to_generator(fn) {
 }
 
 var AssetManagerBase = /*#__PURE__*/ function() {
-    function AssetManagerBase(textureLoader, pathPrefix, downloader) {
+    function AssetManagerBase(textureLoader, pathPrefix, downloader, cache) {
         if (pathPrefix === void 0) pathPrefix = "";
         if (downloader === void 0) downloader = new Downloader();
+        if (cache === void 0) cache = new AssetCache();
         this.pathPrefix = "";
-        this.assets = {};
-        this.assetsRefCount = {};
-        this.assetsLoaded = {};
         this.errors = {};
         this.toLoad = 0;
         this.loaded = 0;
         this.textureLoader = textureLoader;
         this.pathPrefix = pathPrefix;
         this.downloader = downloader;
+        this.cache = cache;
     }
     var _proto = AssetManagerBase.prototype;
     _proto.start = function start(path) {
@@ -5038,8 +5037,8 @@ var AssetManagerBase = /*#__PURE__*/ function() {
     _proto.success = function 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);
     };
     _proto.error = function error(callback, path, message) {
@@ -5072,7 +5071,7 @@ var AssetManagerBase = /*#__PURE__*/ function() {
         if (error === void 0) error = function() {};
         path = this.start(path);
         if (this.reuseAssets(path, success, error)) return;
-        this.assetsLoaded[path] = new Promise(function(resolve, reject) {
+        this.cache.assetsLoaded[path] = new Promise(function(resolve, reject) {
             _this.downloader.downloadBinary(path, function(data) {
                 _this.success(success, path, data);
                 resolve(data);
@@ -5100,7 +5099,7 @@ var AssetManagerBase = /*#__PURE__*/ function() {
         if (error === void 0) error = function() {};
         path = this.start(path);
         if (this.reuseAssets(path, success, error)) return;
-        this.assetsLoaded[path] = new Promise(function(resolve, reject) {
+        this.cache.assetsLoaded[path] = new Promise(function(resolve, reject) {
             _this.downloader.downloadJson(path, function(data) {
                 _this.success(success, path, data);
                 resolve(data);
@@ -5115,11 +5114,15 @@ var AssetManagerBase = /*#__PURE__*/ function() {
         var _this = this;
         if (success === void 0) success = function() {};
         if (error === void 0) error = function() {};
-        var loadedStatus = this.assetsLoaded[path];
+        var loadedStatus = this.cache.assetsLoaded[path];
         var alreadyExistsOrLoading = loadedStatus !== undefined;
         if (alreadyExistsOrLoading) {
-            loadedStatus.then(function(data) {
-                return _this.success(success, path, data);
+            this.cache.assetsLoaded[path] = loadedStatus.then(function(data) {
+                // necessary when user preloads an image into the cache.
+                // texture loader is not avaiable in the cache, so we transform in GLTexture at first use
+                data = _instanceof1(data, Image) || _instanceof1(data, ImageBitmap) ? _this.textureLoader(data) : data;
+                _this.success(success, path, data);
+                return data;
             }).catch(function(errorMsg) {
                 return _this.error(error, path, errorMsg);
             });
@@ -5132,7 +5135,7 @@ var AssetManagerBase = /*#__PURE__*/ function() {
         if (error === void 0) error = function() {};
         path = this.start(path);
         if (this.reuseAssets(path, success, error)) return;
-        this.assetsLoaded[path] = new Promise(function(resolve, reject) {
+        this.cache.assetsLoaded[path] = new Promise(function(resolve, reject) {
             var isBrowser = !!(typeof window !== 'undefined' && typeof navigator !== 'undefined' && window.document);
             var isWebWorker = !isBrowser; // && typeof importScripts !== 'undefined';
             if (isWebWorker) {
@@ -5181,7 +5184,7 @@ var AssetManagerBase = /*#__PURE__*/ function() {
         var parent = index >= 0 ? path.substring(0, index + 1) : "";
         path = this.start(path);
         if (this.reuseAssets(path, success, error)) return;
-        this.assetsLoaded[path] = new Promise(function(resolve, reject) {
+        this.cache.assetsLoaded[path] = new Promise(function(resolve, reject) {
             _this.downloader.downloadText(path, function(atlasText) {
                 try {
                     var _loop = function() {
@@ -5196,7 +5199,7 @@ var AssetManagerBase = /*#__PURE__*/ function() {
                             }
                         }, function(imagePath, message) {
                             if (!abort) {
-                                var errorMsg = "Couldn't load texture atlas " + path + " page image: " + imagePath;
+                                var errorMsg = "Couldn't load texture " + path + " page image: " + imagePath;
                                 _this.error(error, path, errorMsg);
                                 reject(errorMsg);
                             }
@@ -5224,7 +5227,7 @@ var AssetManagerBase = /*#__PURE__*/ function() {
         if (error === void 0) error = function() {};
         path = this.start(path);
         if (this.reuseAssets(path, success, error)) return;
-        this.assetsLoaded[path] = new Promise(function(resolve, reject) {
+        this.cache.assetsLoaded[path] = new Promise(function(resolve, reject) {
             _this.downloader.downloadText(path, function(atlasText) {
                 try {
                     var atlas = new TextureAtlas(atlasText);
@@ -5333,33 +5336,36 @@ var AssetManagerBase = /*#__PURE__*/ function() {
             });
         }).call(this);
     };
+    _proto.setCache = function setCache(cache) {
+        this.cache = cache;
+    };
     _proto.get = function get(path) {
-        return this.assets[this.pathPrefix + path];
+        return this.cache.assets[this.pathPrefix + path];
     };
     _proto.require = function require(path) {
         path = this.pathPrefix + path;
-        var asset = this.assets[path];
+        var asset = this.cache.assets[path];
         if (asset) return asset;
         var error = this.errors[path];
         throw Error("Asset not found: " + path + (error ? "\n" + error : ""));
     };
     _proto.remove = function remove(path) {
         path = this.pathPrefix + path;
-        var asset = this.assets[path];
+        var 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;
     };
     _proto.removeAll = function removeAll() {
-        for(var path in this.assets){
-            var asset = this.assets[path];
+        for(var path in this.cache.assets){
+            var 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 = {};
     };
     _proto.isLoadingComplete = function isLoadingComplete() {
         return this.toLoad == 0;
@@ -5375,7 +5381,7 @@ var AssetManagerBase = /*#__PURE__*/ function() {
     };
     // dispose asset only if it's not used by others
     _proto.disposeAsset = function disposeAsset(path) {
-        if (--this.assetsRefCount[path] === 0) {
+        if (--this.cache.assetsRefCount[path] === 0) {
             this.remove(path);
         }
     };
@@ -5387,6 +5393,44 @@ var AssetManagerBase = /*#__PURE__*/ function() {
     };
     return AssetManagerBase;
 }();
+var AssetCache = /*#__PURE__*/ function() {
+    function AssetCache() {
+        this.assets = {};
+        this.assetsRefCount = {};
+        this.assetsLoaded = {};
+    }
+    var _proto = AssetCache.prototype;
+    _proto.addAsset = function addAsset(path, asset) {
+        return _async_to_generator(function() {
+            var _;
+            return __generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        this.assetsLoaded[path] = Promise.resolve(asset);
+                        _ = this.assets;
+                        return [
+                            4,
+                            asset
+                        ];
+                    case 1:
+                        _[path] = _state.sent();
+                        return [
+                            2
+                        ];
+                }
+            });
+        }).call(this);
+    };
+    AssetCache.getCache = function getCache(id) {
+        var cache = AssetCache.AVAILABLE_CACHES.get(id);
+        if (cache) return cache;
+        var newCache = new AssetCache();
+        AssetCache.AVAILABLE_CACHES.set(id, newCache);
+        return newCache;
+    };
+    return AssetCache;
+}();
+AssetCache.AVAILABLE_CACHES = new Map();
 var Downloader = /*#__PURE__*/ function() {
     function Downloader() {
         this.callbacks = {};
@@ -11363,6 +11407,7 @@ SpineMaterial._spineFS = "\n    #include <common>\n    uniform sampler2D materia
    */ _this.defaultConfig = new SpineAnimationDefaultConfig(), /** @internal */ _this._subPrimitives = [], /** @internal */ _this._vertices = new Float32Array(), /** @internal */ _this._indices = new Uint16Array(), /** @internal */ _this._needResizeBuffer = false, /** @internal */ _this._vertexCount = 0, /** @internal */ _this._localBounds = new engine.BoundingBox(new engine.Vector3(Infinity, Infinity, Infinity), new engine.Vector3(-Infinity, -Infinity, -Infinity));
         var primitive = new engine.Primitive(_this._engine);
         _this._primitive = primitive;
+        _this._primitive._addReferCount(1);
         primitive.addVertexElement(SpineAnimationRenderer._positionVertexElement);
         primitive.addVertexElement(SpineAnimationRenderer._lightColorVertexElement);
         primitive.addVertexElement(SpineAnimationRenderer._uvVertexElement);
@@ -11448,8 +11493,12 @@ SpineMaterial._spineFS = "\n    #include <common>\n    uniform sampler2D materia
    */ _proto._onDestroy = function _onDestroy() {
         this._clearMaterialCache();
         this._subPrimitives.length = 0;
-        this._primitive && this._primitive.destroy();
-        this._primitive = null;
+        var primitive = this._primitive;
+        if (primitive) {
+            primitive._addReferCount(-1);
+            primitive.destroy();
+            this._primitive = null;
+        }
         this._resource = null;
         this._skeleton = null;
         this._state = null;
@@ -12010,7 +12059,7 @@ for(var key in RendererObject){
 for(var key1 in LoaderObject){
     engine.Loader.registerClass(key1, LoaderObject[key1]);
 }
-var version = "4.2.3";
+var version = "4.2.5";
 console.log("Galacean spine version: " + version);
 
 exports.AlphaTimeline = AlphaTimeline;
@@ -12018,6 +12067,7 @@ exports.Animation = Animation;
 exports.AnimationState = AnimationState;
 exports.AnimationStateAdapter = AnimationStateAdapter;
 exports.AnimationStateData = AnimationStateData;
+exports.AssetCache = AssetCache;
 exports.AssetManagerBase = AssetManagerBase;
 exports.AtlasAttachmentLoader = AtlasAttachmentLoader;
 exports.Attachment = Attachment;