@eva/spine-base 1.2.8 → 2.0.0-beta.0

package/dist/spine-base.cjs.js

@@ -96,6 +96,7 @@ var Spine = (function (_super) {
     function Spine() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.resource = '';
+        _this.scale = 1;
         _this.animationName = '';
         _this.autoPlay = true;
         _this.waitExecuteInfos = [];
@@ -154,7 +155,7 @@ var Spine = (function (_super) {
                     playType: true,
                     name: name,
                     loop: loop !== null && loop !== void 0 ? loop : this.autoPlay,
-                    track: track
+                    track: track,
                 });
             }
             else {
@@ -172,7 +173,7 @@ var Spine = (function (_super) {
         if (!this.armature) {
             this.waitExecuteInfos.push({
                 playType: false,
-                track: track
+                track: track,
             });
             return;
         }
@@ -237,6 +238,9 @@ var Spine = (function (_super) {
     __decorate([
         inspectorDecorator.type('string')
     ], Spine.prototype, "resource", void 0);
+    __decorate([
+        inspectorDecorator.type('number')
+    ], Spine.prototype, "scale", void 0);
     __decorate([
         inspectorDecorator.type('string')
     ], Spine.prototype, "animationName", void 0);
@@ -251,7 +255,7 @@ var texCache = {};
 function cacheImage(data) {
     var oldImg = data.image;
     return {
-        tex: pixi_js.Texture.from(oldImg),
+        tex: oldImg instanceof pixi_js.Texture ? oldImg : pixi_js.Texture.from(oldImg),
         count: 0,
     };
 }
@@ -264,14 +268,6 @@ function retainTexture(name, data) {
     cache.count++;
     return cache.tex;
 }
-function getTexture(imageSrc, data) {
-    var cache = texCache[imageSrc];
-    if (!cache) {
-        cache = cacheImage(data);
-        texCache[imageSrc] = cache;
-    }
-    return cache.tex;
-}
 function releaseTexture(imageSrc) {
     if (!imageSrc)
         return;
@@ -292,38 +288,32 @@ function releaseTexture(imageSrc) {
 
 var dataMap = {};
 function createSpineData(name, data, scale, pixiSpine) {
-    var spineData = null;
-    var img = getTexture(data.image.src, data);
-    new pixiSpine.core.TextureAtlas(data.atlas, function (line, callback) {
-        callback(img.baseTexture);
-    }, function (spineAtlas) {
-        if (spineAtlas) {
-            var attachmentLoader = new pixiSpine.core.AtlasAttachmentLoader(spineAtlas);
-            var spineJsonParser = new pixiSpine.core.SkeletonJson(attachmentLoader);
-            if (scale) {
-                spineJsonParser.scale = scale;
-            }
-            spineData = spineJsonParser.readSkeletonData(data.ske);
-        }
-    });
-    var obj = { spineData: spineData, ref: 0, imageSrc: data.image.src };
+    var skeletonAsset = data.ske;
+    var atlasAsset = data.atlas;
+    var attachmentLoader = new pixiSpine.AtlasAttachmentLoader(atlasAsset);
+    var parser = skeletonAsset instanceof Uint8Array
+        ? new pixiSpine.SkeletonBinary(attachmentLoader)
+        : new pixiSpine.SkeletonJson(attachmentLoader);
+    parser.scale = scale || 1;
+    var skeletonData = parser.readSkeletonData(skeletonAsset);
+    var obj = { spineData: skeletonData, ref: 0, imageSrc: data.image.label };
     dataMap[name] = obj;
     return obj;
 }
-function getSpineData(res, pixiSpine) {
+function getSpineData(res, scale, pixiSpine) {
     return __awaiter(this, void 0, void 0, function () {
         var data;
         return __generator(this, function (_a) {
             data = dataMap[res.name];
             if (!data) {
                 if (res.complete) {
-                    data = createSpineData(res.name, res.data, res.scale, pixiSpine);
+                    data = createSpineData(res.name, res.data, scale, pixiSpine);
                 }
                 else if (!data) {
                     return [2];
                 }
             }
-            retainTexture(res.data.image.src, res.data);
+            retainTexture(res.data.image.label, res.data);
             data.ref++;
             return [2, data.spineData];
         });
@@ -392,7 +382,6 @@ var SpineSystem = (function (_super) {
     SpineSystem.prototype.update = function (e) {
         for (var key in this.armatures) {
             this.armatures[key].update(e.deltaTime * 0.001);
-            this.armatures[key].updateTransform();
         }
         _super.prototype.update.call(this);
     };
@@ -435,7 +424,7 @@ var SpineSystem = (function (_super) {
                         res = _c.sent();
                         if (!this.validateAsyncId(gameObjectId, asyncId))
                             return [2];
-                        return [4, getSpineData(res, this.pixiSpine)];
+                        return [4, getSpineData(res, component.scale, this.pixiSpine)];
                     case 2:
                         spineData = _c.sent();
                         if (!this.validateAsyncId(gameObjectId, asyncId))
@@ -463,7 +452,10 @@ var SpineSystem = (function (_super) {
                             return [2];
                         }
                         component.lastResource = component.resource;
-                        armature = new this.pixiSpine.Spine(spineData);
+                        armature = new this.pixiSpine.Spine({
+                            skeletonData: spineData,
+                            autoUpdate: false,
+                        });
                         this.armatures[changed.gameObject.id] = armature;
                         if (changed.gameObject && changed.gameObject.transform) {
                             tran = changed.gameObject.transform;
@@ -472,7 +464,6 @@ var SpineSystem = (function (_super) {
                         }
                         container.addChildAt(armature, 0);
                         armature.update();
-                        armature.updateTransform();
                         component.armature = armature;
                         component.emit('loaded', { resource: component.resource });
                         armature.state.addListener({

package/dist/spine-base.cjs.prod.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/plugin-renderer"),r=require("@eva/inspector-decorator"),n=require("pixi.js"),a=function(e,t){return a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r])},a(e,t)};function o(e,t){function r(){this.constructor=e}a(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}function i(e,t,r,n){var a,o=arguments.length,i=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)i=Reflect.decorate(e,t,r,n);else for(var s=e.length-1;s>=0;s--)(a=e[s])&&(i=(o<3?a(i):o>3?a(t,r,i):a(t,r))||i);return o>3&&i&&Object.defineProperty(t,r,i),i}function s(e,t,r,n){return new(r||(r=Promise))((function(a,o){function i(e){try{u(n.next(e))}catch(e){o(e)}}function s(e){try{u(n.throw(e))}catch(e){o(e)}}function u(e){e.done?a(e.value):new r((function(t){t(e.value)})).then(i,s)}u((n=n.apply(e,t||[])).next())}))}function u(e,t){var r,n,a,o,i={label:0,sent:function(){if(1&a[0])throw a[1];return a[1]},trys:[],ops:[]};return o={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function s(o){return function(s){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;i;)try{if(r=1,n&&(a=2&o[0]?n.return:o[0]?n.throw||((a=n.return)&&a.call(n),0):n.next)&&!(a=a.call(n,o[1])).done)return a;switch(n=0,a&&(o=[2&o[0],a.value]),o[0]){case 0:case 1:a=o;break;case 4:return i.label++,{value:o[1],done:!1};case 5:i.label++,n=o[1],o=[0];continue;case 7:o=i.ops.pop(),i.trys.pop();continue;default:if(!(a=i.trys,(a=a.length>0&&a[a.length-1])||6!==o[0]&&2!==o[0])){i=0;continue}if(3===o[0]&&(!a||o[1]>a[0]&&o[1]<a[3])){i.label=o[1];break}if(6===o[0]&&i.label<a[1]){i.label=a[1],a=o;break}if(a&&i.label<a[2]){i.label=a[2],i.ops.push(o);break}a[2]&&i.ops.pop(),i.trys.pop();continue}o=t.call(e,i)}catch(e){o=[6,e],n=0}finally{r=a=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,s])}}}var c=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t.animationName="",t.autoPlay=!0,t.waitExecuteInfos=[],t}return o(t,e),Object.defineProperty(t.prototype,"armature",{get:function(){return this._armature},set:function(e){var t,r;if(this._armature=e,e){this.autoPlay&&this.play(this.animationName);try{for(var n=function(e){var t="function"==typeof Symbol&&e[Symbol.iterator],r=0;return t?t.call(e):{next:function(){return e&&r>=e.length&&(e=void 0),{value:e&&e[r++],done:!e}}}}(this.waitExecuteInfos),a=n.next();!a.done;a=n.next()){var o=a.value;if(o.playType){var i=o.name,s=o.loop,u=o.track;this.play(i,s,u)}else this.stop(o.track)}}catch(e){t={error:e}}finally{try{a&&!a.done&&(r=n.return)&&r.call(n)}finally{if(t)throw t.error}}this.waitExecuteInfos=[]}},enumerable:!1,configurable:!0}),t.prototype.init=function(e){e&&Object.assign(this,e)},t.prototype.onDestroy=function(){this.destroied=!0},t.prototype.play=function(e,t,r){try{e&&(this.animationName=e),this.armature?(void 0===r&&(r=0),this.armature.state.setAnimation(r,this.animationName,t)):this.waitExecuteInfos.push({playType:!0,name:e,loop:null!=t?t:this.autoPlay,track:r})}catch(e){console.log(e)}},t.prototype.stop=function(e){this.armature?(void 0===e&&(e=0),this.armature.state.setEmptyAnimation(e,0)):this.waitExecuteInfos.push({playType:!1,track:e})},t.prototype.addAnimation=function(e,t,r,n){try{this.armature&&(void 0===n&&(n=0),this.armature.state.addAnimation(n,e,r,t))}catch(e){console.log(e)}},t.prototype.setMix=function(e,t,r){this.armature&&this.armature.stateData.setMix(e,t,r)},t.prototype.getAnim=function(e){void 0===e&&(e=0);try{if(this.armature)return this.armature.state.tracks[e].animation.name}catch(e){console.log(e)}},t.prototype.setDefaultMix=function(e){this.armature&&(this.armature.stateData.defaultMix=e)},t.prototype.setAttachment=function(e,t){this.armature&&this.armature.skeleton.setAttachment(e,t)},t.prototype.getBone=function(e){if(this.armature)return this.armature.skeleton.findBone(e)},t.componentName="Spine",i([r.type("string")],t.prototype,"resource",void 0),i([r.type("string")],t.prototype,"animationName",void 0),i([r.type("boolean")],t.prototype,"autoPlay",void 0),t}(e.Component),p={};function l(e){var t=e.image;return{tex:n.Texture.from(t),count:0}}var m={};function f(e,t,r,n){var a=null,o=function(e,t){var r=p[e];return r||(r=l(t),p[e]=r),r.tex}(t.image.src,t);new n.core.TextureAtlas(t.atlas,(function(e,t){t(o.baseTexture)}),(function(e){if(e){var o=new n.core.AtlasAttachmentLoader(e),i=new n.core.SkeletonJson(o);r&&(i.scale=r),a=i.readSkeletonData(t.ske)}}));var i={spineData:a,ref:0,imageSrc:t.image.src};return m[e]=i,i}function d(e,t){return s(this,void 0,void 0,(function(){var r;return u(this,(function(n){if(!(r=m[e.name]))if(e.complete)r=f(e.name,e.data,e.scale,t);else if(!r)return[2];return function(e,t){var r=p[e];r||(r=l(t),p[e]=r),r.count++,r.tex}(e.data.image.src,e.data),r.ref++,[2,r.spineData]}))}))}function h(e,t){var r=m[e];r&&(r.ref--,r.ref<=0&&(!function(e){e&&setTimeout((function(){var t=p[e];t&&(t.count--,t.count<=0&&(t.tex&&(t.tex.destroy(!0),t.tex=null),delete p[e]))}),100)}(t),delete m[e]))}var y=function(r){function n(){var e=null!==r&&r.apply(this,arguments)||this;return e.armatures={},e}return o(n,r),n.prototype.init=function(r){var n=this,a=r.pixiSpine;this.renderSystem=this.game.getSystem(t.RendererSystem),this.renderSystem.rendererManager.register(this),this.pixiSpine=a,this.game.canvas.addEventListener("webglcontextrestored",(function(){var t=n.game.gameObjects,r=[];for(var a in n.armatures)for(var o=+a,i=0;i<t.length;++i){var s=t[i];if(s.id===o){var u=s.getComponent(c);u&&(n.remove({type:e.OBSERVER_TYPE.REMOVE,gameObject:s,component:u,componentName:c.componentName}),r.push({type:e.OBSERVER_TYPE.ADD,gameObject:s,component:u,componentName:c.componentName}));break}}setTimeout((function(){r.forEach((function(e){n.add(e)}))}),1e3)}),!1)},n.prototype.update=function(e){for(var t in this.armatures)this.armatures[t].update(.001*e.deltaTime),this.armatures[t].updateTransform();r.prototype.update.call(this)},n.prototype.componentChanged=function(t){return s(this,void 0,void 0,(function(){return u(this,(function(r){if("Spine"===t.componentName)if(t.type===e.OBSERVER_TYPE.ADD)this.add(t);else if(t.type===e.OBSERVER_TYPE.CHANGE){if("resource"===t.prop.prop[0])this.change(t)}else t.type===e.OBSERVER_TYPE.REMOVE&&this.remove(t);return[2]}))}))},n.prototype.add=function(t,r){var n,a;return s(this,void 0,void 0,(function(){var o,i,s,c,p,l,m,f,h=this;return u(this,(function(u){switch(u.label){case 0:return o=t.component,clearTimeout(o.addHandler),i=t.gameObject.id,s=this.increaseAsyncId(i),[4,e.resource.getResource(o.resource)];case 1:return c=u.sent(),this.validateAsyncId(i,s)?[4,d(c,this.pixiSpine)]:[2];case 2:return p=u.sent(),this.validateAsyncId(i,s)?p?(this.remove(t),(l=null===(a=null===(n=this.renderSystem)||void 0===n?void 0:n.containerManager)||void 0===a?void 0:a.getContainer(t.gameObject.id))?(o.lastResource=o.resource,m=new this.pixiSpine.Spine(p),this.armatures[t.gameObject.id]=m,t.gameObject&&t.gameObject.transform&&(f=t.gameObject.transform,m.x=f.size.width*f.origin.x,m.y=f.size.height*f.origin.y),l.addChildAt(m,0),m.update(),m.updateTransform(),o.armature=m,o.emit("loaded",{resource:o.resource}),m.state.addListener({start:function(e,t){o.emit("start",{track:e,name:e.animation.name})},complete:function(e,t){o.emit("complete",{track:e,name:e.animation.name})},interrupt:function(e,t){o.emit("interrupt",{track:e,name:e.animation.name})},end:function(e,t){o.emit("end",{track:e,name:e.animation.name})},event:function(e,t){o.emit("event",e,t)}}),[2]):[2]):(o.addHandler=setTimeout((function(){o.destroied||(void 0===r&&(r=20),--r>0?h.add(t,r):console.log("retry exceed max times",o.resource))}),1e3),[2]):[2]}}))}))},n.prototype.change=function(e){this.remove(e),this.add(e)},n.prototype.remove=function(t){var r,n,a,o;return s(this,void 0,void 0,(function(){var i,s,c,p;return u(this,(function(u){switch(u.label){case 0:return this.increaseAsyncId(t.gameObject.id),i=t.component,clearTimeout(i.addHandler),s=this.armatures[t.gameObject.id],(c=null===(n=null===(r=this.renderSystem)||void 0===r?void 0:r.containerManager)||void 0===n?void 0:n.getContainer(t.gameObject.id))&&s&&c.removeChild(s),i.armature?(i.armature.destroy({children:!0}),[4,e.resource.getResource(i.lastResource)]):[3,2];case 1:h((p=u.sent()).name,null===(o=null===(a=p.data)||void 0===a?void 0:a.image)||void 0===o?void 0:o.src),u.label=2;case 2:return i.armature=null,delete this.armatures[t.gameObject.id],t.type,e.OBSERVER_TYPE.CHANGE,[2]}}))}))},n.systemName="SpineSystem",n=i([e.decorators.componentObserver({Spine:["resource"]})],n)}(t.Renderer);e.resource.registerResourceType("SPINE"),exports.Spine=c,exports.SpineSystem=y;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/plugin-renderer"),n=require("@eva/inspector-decorator"),r=require("pixi.js"),a=function(e,t){return a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])},a(e,t)};function o(e,t){function n(){this.constructor=e}a(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}function i(e,t,n,r){var a,o=arguments.length,i=o<3?t:null===r?r=Object.getOwnPropertyDescriptor(t,n):r;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)i=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(a=e[s])&&(i=(o<3?a(i):o>3?a(t,n,i):a(t,n))||i);return o>3&&i&&Object.defineProperty(t,n,i),i}function s(e,t,n,r){return new(n||(n=Promise))((function(a,o){function i(e){try{u(r.next(e))}catch(e){o(e)}}function s(e){try{u(r.throw(e))}catch(e){o(e)}}function u(e){e.done?a(e.value):new n((function(t){t(e.value)})).then(i,s)}u((r=r.apply(e,t||[])).next())}))}function u(e,t){var n,r,a,o,i={label:0,sent:function(){if(1&a[0])throw a[1];return a[1]},trys:[],ops:[]};return o={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function s(o){return function(s){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(a=2&o[0]?r.return:o[0]?r.throw||((a=r.return)&&a.call(r),0):r.next)&&!(a=a.call(r,o[1])).done)return a;switch(r=0,a&&(o=[2&o[0],a.value]),o[0]){case 0:case 1:a=o;break;case 4:return i.label++,{value:o[1],done:!1};case 5:i.label++,r=o[1],o=[0];continue;case 7:o=i.ops.pop(),i.trys.pop();continue;default:if(!(a=i.trys,(a=a.length>0&&a[a.length-1])||6!==o[0]&&2!==o[0])){i=0;continue}if(3===o[0]&&(!a||o[1]>a[0]&&o[1]<a[3])){i.label=o[1];break}if(6===o[0]&&i.label<a[1]){i.label=a[1],a=o;break}if(a&&i.label<a[2]){i.label=a[2],i.ops.push(o);break}a[2]&&i.ops.pop(),i.trys.pop();continue}o=t.call(e,i)}catch(e){o=[6,e],r=0}finally{n=a=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,s])}}}var c=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t.scale=1,t.animationName="",t.autoPlay=!0,t.waitExecuteInfos=[],t}return o(t,e),Object.defineProperty(t.prototype,"armature",{get:function(){return this._armature},set:function(e){var t,n;if(this._armature=e,e){this.autoPlay&&this.play(this.animationName);try{for(var r=function(e){var t="function"==typeof Symbol&&e[Symbol.iterator],n=0;return t?t.call(e):{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}}}(this.waitExecuteInfos),a=r.next();!a.done;a=r.next()){var o=a.value;if(o.playType){var i=o.name,s=o.loop,u=o.track;this.play(i,s,u)}else this.stop(o.track)}}catch(e){t={error:e}}finally{try{a&&!a.done&&(n=r.return)&&n.call(r)}finally{if(t)throw t.error}}this.waitExecuteInfos=[]}},enumerable:!1,configurable:!0}),t.prototype.init=function(e){e&&Object.assign(this,e)},t.prototype.onDestroy=function(){this.destroied=!0},t.prototype.play=function(e,t,n){try{e&&(this.animationName=e),this.armature?(void 0===n&&(n=0),this.armature.state.setAnimation(n,this.animationName,t)):this.waitExecuteInfos.push({playType:!0,name:e,loop:null!=t?t:this.autoPlay,track:n})}catch(e){console.log(e)}},t.prototype.stop=function(e){this.armature?(void 0===e&&(e=0),this.armature.state.setEmptyAnimation(e,0)):this.waitExecuteInfos.push({playType:!1,track:e})},t.prototype.addAnimation=function(e,t,n,r){try{this.armature&&(void 0===r&&(r=0),this.armature.state.addAnimation(r,e,n,t))}catch(e){console.log(e)}},t.prototype.setMix=function(e,t,n){this.armature&&this.armature.stateData.setMix(e,t,n)},t.prototype.getAnim=function(e){void 0===e&&(e=0);try{if(this.armature)return this.armature.state.tracks[e].animation.name}catch(e){console.log(e)}},t.prototype.setDefaultMix=function(e){this.armature&&(this.armature.stateData.defaultMix=e)},t.prototype.setAttachment=function(e,t){this.armature&&this.armature.skeleton.setAttachment(e,t)},t.prototype.getBone=function(e){if(this.armature)return this.armature.skeleton.findBone(e)},t.componentName="Spine",i([n.type("string")],t.prototype,"resource",void 0),i([n.type("number")],t.prototype,"scale",void 0),i([n.type("string")],t.prototype,"animationName",void 0),i([n.type("boolean")],t.prototype,"autoPlay",void 0),t}(e.Component),p={};function l(e,t){var n=p[e];return n||(n=function(e){var t=e.image;return{tex:t instanceof r.Texture?t:r.Texture.from(t),count:0}}(t),p[e]=n),n.count++,n.tex}var m={};function d(e,t,n){return s(this,void 0,void 0,(function(){var r;return u(this,(function(a){if(!(r=m[e.name]))if(e.complete)r=function(e,t,n,r){var a=t.ske,o=t.atlas,i=new r.AtlasAttachmentLoader(o),s=a instanceof Uint8Array?new r.SkeletonBinary(i):new r.SkeletonJson(i);s.scale=n||1;var u={spineData:s.readSkeletonData(a),ref:0,imageSrc:t.image.label};return m[e]=u,u}(e.name,e.data,t,n);else if(!r)return[2];return l(e.data.image.label,e.data),r.ref++,[2,r.spineData]}))}))}function f(e,t){var n=m[e];n&&(n.ref--,n.ref<=0&&(!function(e){e&&setTimeout((function(){var t=p[e];t&&(t.count--,t.count<=0&&(t.tex&&(t.tex.destroy(!0),t.tex=null),delete p[e]))}),100)}(t),delete m[e]))}var h=function(n){function r(){var e=null!==n&&n.apply(this,arguments)||this;return e.armatures={},e}return o(r,n),r.prototype.init=function(n){var r=this,a=n.pixiSpine;this.renderSystem=this.game.getSystem(t.RendererSystem),this.renderSystem.rendererManager.register(this),this.pixiSpine=a,this.game.canvas.addEventListener("webglcontextrestored",(function(){var t=r.game.gameObjects,n=[];for(var a in r.armatures)for(var o=+a,i=0;i<t.length;++i){var s=t[i];if(s.id===o){var u=s.getComponent(c);u&&(r.remove({type:e.OBSERVER_TYPE.REMOVE,gameObject:s,component:u,componentName:c.componentName}),n.push({type:e.OBSERVER_TYPE.ADD,gameObject:s,component:u,componentName:c.componentName}));break}}setTimeout((function(){n.forEach((function(e){r.add(e)}))}),1e3)}),!1)},r.prototype.update=function(e){for(var t in this.armatures)this.armatures[t].update(.001*e.deltaTime);n.prototype.update.call(this)},r.prototype.componentChanged=function(t){return s(this,void 0,void 0,(function(){return u(this,(function(n){if("Spine"===t.componentName)if(t.type===e.OBSERVER_TYPE.ADD)this.add(t);else if(t.type===e.OBSERVER_TYPE.CHANGE){if("resource"===t.prop.prop[0])this.change(t)}else t.type===e.OBSERVER_TYPE.REMOVE&&this.remove(t);return[2]}))}))},r.prototype.add=function(t,n){var r,a;return s(this,void 0,void 0,(function(){var o,i,s,c,p,l,m,f,h=this;return u(this,(function(u){switch(u.label){case 0:return o=t.component,clearTimeout(o.addHandler),i=t.gameObject.id,s=this.increaseAsyncId(i),[4,e.resource.getResource(o.resource)];case 1:return c=u.sent(),this.validateAsyncId(i,s)?[4,d(c,o.scale,this.pixiSpine)]:[2];case 2:return p=u.sent(),this.validateAsyncId(i,s)?p?(this.remove(t),(l=null===(a=null===(r=this.renderSystem)||void 0===r?void 0:r.containerManager)||void 0===a?void 0:a.getContainer(t.gameObject.id))?(o.lastResource=o.resource,m=new this.pixiSpine.Spine({skeletonData:p,autoUpdate:!1}),this.armatures[t.gameObject.id]=m,t.gameObject&&t.gameObject.transform&&(f=t.gameObject.transform,m.x=f.size.width*f.origin.x,m.y=f.size.height*f.origin.y),l.addChildAt(m,0),m.update(),o.armature=m,o.emit("loaded",{resource:o.resource}),m.state.addListener({start:function(e,t){o.emit("start",{track:e,name:e.animation.name})},complete:function(e,t){o.emit("complete",{track:e,name:e.animation.name})},interrupt:function(e,t){o.emit("interrupt",{track:e,name:e.animation.name})},end:function(e,t){o.emit("end",{track:e,name:e.animation.name})},event:function(e,t){o.emit("event",e,t)}}),[2]):[2]):(o.addHandler=setTimeout((function(){o.destroied||(void 0===n&&(n=20),--n>0?h.add(t,n):console.log("retry exceed max times",o.resource))}),1e3),[2]):[2]}}))}))},r.prototype.change=function(e){this.remove(e),this.add(e)},r.prototype.remove=function(t){var n,r,a,o;return s(this,void 0,void 0,(function(){var i,s,c,p;return u(this,(function(u){switch(u.label){case 0:return this.increaseAsyncId(t.gameObject.id),i=t.component,clearTimeout(i.addHandler),s=this.armatures[t.gameObject.id],(c=null===(r=null===(n=this.renderSystem)||void 0===n?void 0:n.containerManager)||void 0===r?void 0:r.getContainer(t.gameObject.id))&&s&&c.removeChild(s),i.armature?(i.armature.destroy({children:!0}),[4,e.resource.getResource(i.lastResource)]):[3,2];case 1:f((p=u.sent()).name,null===(o=null===(a=p.data)||void 0===a?void 0:a.image)||void 0===o?void 0:o.src),u.label=2;case 2:return i.armature=null,delete this.armatures[t.gameObject.id],t.type,e.OBSERVER_TYPE.CHANGE,[2]}}))}))},r.systemName="SpineSystem",r=i([e.decorators.componentObserver({Spine:["resource"]})],r)}(t.Renderer);e.resource.registerResourceType("SPINE"),exports.Spine=c,exports.SpineSystem=h;

package/dist/spine-base.esm.js

@@ -92,6 +92,7 @@ var Spine = (function (_super) {
     function Spine() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.resource = '';
+        _this.scale = 1;
         _this.animationName = '';
         _this.autoPlay = true;
         _this.waitExecuteInfos = [];
@@ -150,7 +151,7 @@ var Spine = (function (_super) {
                     playType: true,
                     name: name,
                     loop: loop !== null && loop !== void 0 ? loop : this.autoPlay,
-                    track: track
+                    track: track,
                 });
             }
             else {
@@ -168,7 +169,7 @@ var Spine = (function (_super) {
         if (!this.armature) {
             this.waitExecuteInfos.push({
                 playType: false,
-                track: track
+                track: track,
             });
             return;
         }
@@ -233,6 +234,9 @@ var Spine = (function (_super) {
     __decorate([
         type('string')
     ], Spine.prototype, "resource", void 0);
+    __decorate([
+        type('number')
+    ], Spine.prototype, "scale", void 0);
     __decorate([
         type('string')
     ], Spine.prototype, "animationName", void 0);
@@ -247,7 +251,7 @@ var texCache = {};
 function cacheImage(data) {
     var oldImg = data.image;
     return {
-        tex: Texture.from(oldImg),
+        tex: oldImg instanceof Texture ? oldImg : Texture.from(oldImg),
         count: 0,
     };
 }
@@ -260,14 +264,6 @@ function retainTexture(name, data) {
     cache.count++;
     return cache.tex;
 }
-function getTexture(imageSrc, data) {
-    var cache = texCache[imageSrc];
-    if (!cache) {
-        cache = cacheImage(data);
-        texCache[imageSrc] = cache;
-    }
-    return cache.tex;
-}
 function releaseTexture(imageSrc) {
     if (!imageSrc)
         return;
@@ -288,38 +284,32 @@ function releaseTexture(imageSrc) {
 
 var dataMap = {};
 function createSpineData(name, data, scale, pixiSpine) {
-    var spineData = null;
-    var img = getTexture(data.image.src, data);
-    new pixiSpine.core.TextureAtlas(data.atlas, function (line, callback) {
-        callback(img.baseTexture);
-    }, function (spineAtlas) {
-        if (spineAtlas) {
-            var attachmentLoader = new pixiSpine.core.AtlasAttachmentLoader(spineAtlas);
-            var spineJsonParser = new pixiSpine.core.SkeletonJson(attachmentLoader);
-            if (scale) {
-                spineJsonParser.scale = scale;
-            }
-            spineData = spineJsonParser.readSkeletonData(data.ske);
-        }
-    });
-    var obj = { spineData: spineData, ref: 0, imageSrc: data.image.src };
+    var skeletonAsset = data.ske;
+    var atlasAsset = data.atlas;
+    var attachmentLoader = new pixiSpine.AtlasAttachmentLoader(atlasAsset);
+    var parser = skeletonAsset instanceof Uint8Array
+        ? new pixiSpine.SkeletonBinary(attachmentLoader)
+        : new pixiSpine.SkeletonJson(attachmentLoader);
+    parser.scale = scale || 1;
+    var skeletonData = parser.readSkeletonData(skeletonAsset);
+    var obj = { spineData: skeletonData, ref: 0, imageSrc: data.image.label };
     dataMap[name] = obj;
     return obj;
 }
-function getSpineData(res, pixiSpine) {
+function getSpineData(res, scale, pixiSpine) {
     return __awaiter(this, void 0, void 0, function () {
         var data;
         return __generator(this, function (_a) {
             data = dataMap[res.name];
             if (!data) {
                 if (res.complete) {
-                    data = createSpineData(res.name, res.data, res.scale, pixiSpine);
+                    data = createSpineData(res.name, res.data, scale, pixiSpine);
                 }
                 else if (!data) {
                     return [2];
                 }
             }
-            retainTexture(res.data.image.src, res.data);
+            retainTexture(res.data.image.label, res.data);
             data.ref++;
             return [2, data.spineData];
         });
@@ -388,7 +378,6 @@ var SpineSystem = (function (_super) {
     SpineSystem.prototype.update = function (e) {
         for (var key in this.armatures) {
             this.armatures[key].update(e.deltaTime * 0.001);
-            this.armatures[key].updateTransform();
         }
         _super.prototype.update.call(this);
     };
@@ -431,7 +420,7 @@ var SpineSystem = (function (_super) {
                         res = _c.sent();
                         if (!this.validateAsyncId(gameObjectId, asyncId))
                             return [2];
-                        return [4, getSpineData(res, this.pixiSpine)];
+                        return [4, getSpineData(res, component.scale, this.pixiSpine)];
                     case 2:
                         spineData = _c.sent();
                         if (!this.validateAsyncId(gameObjectId, asyncId))
@@ -459,7 +448,10 @@ var SpineSystem = (function (_super) {
                             return [2];
                         }
                         component.lastResource = component.resource;
-                        armature = new this.pixiSpine.Spine(spineData);
+                        armature = new this.pixiSpine.Spine({
+                            skeletonData: spineData,
+                            autoUpdate: false,
+                        });
                         this.armatures[changed.gameObject.id] = armature;
                         if (changed.gameObject && changed.gameObject.transform) {
                             tran = changed.gameObject.transform;
@@ -468,7 +460,6 @@ var SpineSystem = (function (_super) {
                         }
                         container.addChildAt(armature, 0);
                         armature.update();
-                        armature.updateTransform();
                         component.armature = armature;
                         component.emit('loaded', { resource: component.resource });
                         armature.state.addListener({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/spine-base",
-  "version": "1.2.8",
+  "version": "2.0.0-beta.0",
   "description": "@eva/spine-base",
   "main": "index.js",
   "module": "dist/spine-base.esm.js",
@@ -18,9 +18,9 @@
   "license": "MIT",
   "homepage": "https://eva.js.org",
   "dependencies": {
-    "@eva/eva.js": "1.2.8",
-    "@eva/plugin-renderer": "1.2.8",
+    "@eva/eva.js": "2.0.0-beta.0",
+    "@eva/plugin-renderer": "2.0.0-beta.0",
     "@eva/inspector-decorator": "^0.0.5",
-    "pixi.js": "^4.8.9"
+    "pixi.js": "^8.6.3"
   }
 }

package/dist/global.d.ts

@@ -1,6 +0,0 @@
-import "@eva/eva.js";
-declare module "@eva/eva.js" {
-  export enum RESOURCE_TYPE {
-    'SPINE' = 'SPINE'
-  }
-}