@eva/plugin-renderer-sprite 1.2.6 → 1.2.7-editor.10

package/dist/EVA.plugin.renderer.sprite.js

@@ -12,7 +12,7 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
       d.__proto__ = b;
     } || function (d, b) {
       for (var p in b) {
-        if (b.hasOwnProperty(p)) d[p] = b[p];
+        if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p];
       }
     };
 
@@ -20,6 +20,8 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
   };
 
   function __extends(d, b) {
+    if (typeof b !== "function" && b !== null) throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+
     _extendStatics(d, b);
 
     function __() {
@@ -29,6 +31,22 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
   }
 
+  var _assign = function __assign() {
+    _assign = Object.assign || function __assign(t) {
+      for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+
+        for (var p in s) {
+          if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+      }
+
+      return t;
+    };
+
+    return _assign.apply(this, arguments);
+  };
+
   function __decorate(decorators, target, key, desc) {
     var c = arguments.length,
         r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
@@ -39,6 +57,10 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
     return c > 3 && r && Object.defineProperty(target, key, r), r;
   }
 
+  function __metadata(metadataKey, metadataValue) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+  }
+
   function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) {
       return value instanceof P ? value : new P(function (resolve) {
@@ -199,27 +221,123 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
   }
 
-  function getIDEPropsPropertyObj(target, propertyKey) {
-    if (!target.constructor.IDEProps) {
-      target.constructor.IDEProps = {};
+  var SymbolKeysNotSupportedError = function (_super) {
+    __extends(SymbolKeysNotSupportedError, _super);
+
+    function SymbolKeysNotSupportedError() {
+      var _newTarget = this.constructor;
+
+      var _this = _super.call(this, 'Symbol keys are not supported yet!') || this;
+
+      Object.setPrototypeOf(_this, _newTarget.prototype);
+      return _this;
+    }
+
+    return SymbolKeysNotSupportedError;
+  }(Error);
+
+  (function (_super) {
+    __extends(StaticGetPropertiesIsNotAFunctionError, _super);
+
+    function StaticGetPropertiesIsNotAFunctionError() {
+      var _newTarget = this.constructor;
+
+      var _this = _super.call(this, 'getProperties is not a function!') || this;
+
+      Object.setPrototypeOf(_this, _newTarget.prototype);
+      return _this;
+    }
+
+    return StaticGetPropertiesIsNotAFunctionError;
+  })(Error);
+
+  var IDE_PROPERTY_METADATA = 'IDE_PROPERTY_METADATA';
+
+  function transformBasicType(type) {
+    if (type === String) {
+      return 'string';
+    }
+
+    if (type === Number) {
+      return 'number';
+    }
+
+    if (type === Boolean) {
+      return 'boolean';
+    }
+
+    return 'unknown';
+  }
+
+  function defineTypes(target, key, options, returnTypeFunction) {
+    var type = Reflect.getMetadata('design:type', target, key);
+    var isArray = type === Array;
+    var str = transformBasicType(type);
+
+    if (str !== 'unknown') {
+      type = str;
     }
 
-    if (!target.constructor.IDEProps[propertyKey]) {
-      target.constructor.IDEProps[propertyKey] = {};
+    if (returnTypeFunction) {
+      var returnType = returnTypeFunction();
+
+      if (Array.isArray(returnType)) {
+        isArray = true;
+        type = returnType[0];
+      } else {
+        type = returnType;
+      }
     }
 
-    var propertyObj = target.constructor.IDEProps[propertyKey];
-    return propertyObj;
+    var properties = Reflect.getMetadata(IDE_PROPERTY_METADATA, target.constructor) || {};
+    properties[key] = _assign({
+      type: type,
+      isArray: isArray
+    }, options);
+    Reflect.defineMetadata(IDE_PROPERTY_METADATA, properties, target.constructor);
   }
 
-  function type(type) {
+  function getTypeDecoratorParams(returnTypeFuncOrOptions, maybeOptions) {
+    if (typeof returnTypeFuncOrOptions === 'function') {
+      return {
+        returnTypeFunc: returnTypeFuncOrOptions,
+        options: maybeOptions || {}
+      };
+    }
+
+    return {
+      options: returnTypeFuncOrOptions || {}
+    };
+  }
+
+  function Field(returnTypeFunction, maybeOptions) {
     return function (target, propertyKey) {
-      var prop = getIDEPropsPropertyObj(target, propertyKey);
-      prop.key = propertyKey;
-      prop.type = type;
+      if (typeof propertyKey === 'symbol') {
+        throw new SymbolKeysNotSupportedError();
+      }
+
+      var _a = getTypeDecoratorParams(returnTypeFunction, maybeOptions),
+          options = _a.options,
+          returnTypeFunc = _a.returnTypeFunc;
+
+      defineTypes(target, propertyKey, options, returnTypeFunc);
     };
   }
 
+  var ExecuteMode;
+
+  (function (ExecuteMode) {
+    ExecuteMode[ExecuteMode["Edit"] = 2] = "Edit";
+    ExecuteMode[ExecuteMode["Game"] = 4] = "Game";
+    ExecuteMode[ExecuteMode["All"] = 6] = "All";
+  })(ExecuteMode || (ExecuteMode = {}));
+
+  var sleep = function sleep(time) {
+    return new Promise(function (resolve) {
+      return setTimeout(resolve, time);
+    });
+  };
+
   var Sprite$3 = function (_super) {
     __extends(Sprite, _super);
 
@@ -240,9 +358,47 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
 
     Sprite.componentName = 'Sprite';
 
-    __decorate([type('string')], Sprite.prototype, "resource", void 0);
+    __decorate([Field({
+      type: 'resource'
+    }), __metadata("design:type", String)], Sprite.prototype, "resource", void 0);
+
+    __decorate([Field({
+      type: 'selector',
+      options: function options(instance) {
+        var _a, _b, _c;
+
+        return __awaiter(this, void 0, void 0, function () {
+          var frames;
+          return __generator(this, function (_d) {
+            switch (_d.label) {
+              case 0:
+                return [4, sleep(0)];
 
-    __decorate([type('string')], Sprite.prototype, "spriteName", void 0);
+              case 1:
+                _d.sent();
+
+                if (!instance.resource || !eva_js.resource.promiseMap[instance.resource]) {
+                  return [2, {}];
+                }
+
+                return [4, eva_js.resource.promiseMap[instance.resource]];
+
+              case 2:
+                _d.sent();
+
+                frames = (_c = (_b = (_a = eva_js.resource.resourcesMap[instance.resource]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.json) === null || _c === void 0 ? void 0 : _c.frames;
+                return [2, frames ? Object.values(frames).map(function (item) {
+                  return item.name;
+                }).reduce(function (prev, key) {
+                  var _a;
+
+                  return _assign(_assign({}, prev), (_a = {}, _a[key] = key, _a));
+                }, {}) : {}];
+            }
+          });
+        });
+      }
+    }), __metadata("design:type", String)], Sprite.prototype, "spriteName", void 0);
 
     return Sprite;
   }(eva_js.Component);
@@ -380,52 +536,52 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
 
     Sprite.prototype.componentChanged = function (changed) {
       return __awaiter(this, void 0, void 0, function () {
-        var component_1, sprite_1, instance, sprite;
-
-        var _this = this;
-
+        var gameObjectId, component, sprite, asyncId, instance, asyncId, instance, sprite;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
-              if (!(changed.componentName === 'Sprite')) return [3, 4];
-              component_1 = changed.component;
-              if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 1];
-              sprite_1 = new SpriteEngine(null);
-              eva_js.resource.getResource(component_1.resource).then(function (_a) {
-                var instance = _a.instance;
-                return __awaiter(_this, void 0, void 0, function () {
-                  return __generator(this, function (_b) {
-                    if (!instance) {
-                      console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
-                      return [2];
-                    }
-
-                    sprite_1.image = instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-                    return [2];
-                  });
-                });
-              });
-              this.sprites[changed.gameObject.id] = sprite_1;
-              this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite_1.sprite, 0);
-              return [3, 4];
+              if (!(changed.componentName === 'Sprite')) return [3, 5];
+              gameObjectId = changed.gameObject.id;
+              component = changed.component;
+              if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 2];
+              sprite = new SpriteEngine(null);
+              this.sprites[changed.gameObject.id] = sprite;
+              this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite.sprite, 0);
+              asyncId = this.increaseAsyncId(gameObjectId);
+              return [4, eva_js.resource.getResource(component.resource)];
 
             case 1:
-              if (!(changed.type === eva_js.OBSERVER_TYPE.CHANGE)) return [3, 3];
-              return [4, eva_js.resource.getResource(component_1.resource)];
+              instance = _a.sent().instance;
+              if (!this.validateAsyncId(gameObjectId, asyncId)) return [2];
+
+              if (!instance) {
+                console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
+                return [2];
+              }
+
+              sprite.image = instance[component.resource + resourceKeySplit + component.spriteName];
+              return [3, 5];
 
             case 2:
+              if (!(changed.type === eva_js.OBSERVER_TYPE.CHANGE)) return [3, 4];
+              asyncId = this.increaseAsyncId(gameObjectId);
+              return [4, eva_js.resource.getResource(component.resource)];
+
+            case 3:
               instance = _a.sent().instance;
+              if (!this.validateAsyncId(gameObjectId, asyncId)) return [2];
 
               if (!instance) {
                 console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
                 return [2];
               }
 
-              this.sprites[changed.gameObject.id].image = instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-              return [3, 4];
+              this.sprites[changed.gameObject.id].image = instance[component.resource + resourceKeySplit + component.spriteName];
+              return [3, 5];
 
-            case 3:
+            case 4:
               if (changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
+                this.increaseAsyncId(gameObjectId);
                 sprite = this.sprites[changed.gameObject.id];
                 this.containerManager.getContainer(changed.gameObject.id).removeChild(sprite.sprite);
                 sprite.sprite.destroy({
@@ -434,9 +590,9 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
                 delete this.sprites[changed.gameObject.id];
               }
 
-              _a.label = 4;
+              _a.label = 5;
 
-            case 4:
+            case 5:
               return [2];
           }
         });

package/dist/EVA.plugin.renderer.sprite.min.js

@@ -1 +1 @@
-window.EVA=window.EVA||{},window.EVA.plugin=window.EVA.plugin||{},window.EVA.plugin.renderer=window.EVA.plugin.renderer||{};var _EVA_IIFE_sprite=function(e,t,r,n){"use strict";var i=function(e,t){return(i=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])})(e,t)};function o(e,t){function r(){this.constructor=e}i(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}function s(e,t,r,n){var i,o=arguments.length,s=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n);else for(var a=e.length-1;a>=0;a--)(i=e[a])&&(s=(o<3?i(s):o>3?i(t,r,s):i(t,r))||s);return o>3&&s&&Object.defineProperty(t,r,s),s}function a(e,t,r,n){return new(r||(r=Promise))((function(i,o){function s(e){try{c(n.next(e))}catch(e){o(e)}}function a(e){try{c(n.throw(e))}catch(e){o(e)}}function c(e){var t;e.done?i(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(s,a)}c((n=n.apply(e,t||[])).next())}))}function c(e,t){var r,n,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=s.trys,(i=i.length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue}o=t.call(e,s)}catch(e){o=[6,e],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}function u(e){var t="function"==typeof Symbol&&Symbol.iterator,r=t&&e[t],n=0;if(r)return r.call(e);if(e&&"number"==typeof e.length)return{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}};throw new TypeError(t?"Object is not iterable.":"Symbol.iterator is not defined.")}function p(e){return function(t,r){var n=function(e,t){return e.constructor.IDEProps||(e.constructor.IDEProps={}),e.constructor.IDEProps[t]||(e.constructor.IDEProps[t]={}),e.constructor.IDEProps[t]}(t,r);n.key=r,n.type=e}}var f=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t.spriteName="",t}return o(t,e),t.prototype.init=function(e){e&&e.resource&&(this.resource=e.resource,this.spriteName=e.spriteName)},t.componentName="Sprite",s([p("string")],t.prototype,"resource",void 0),s([p("string")],t.prototype,"spriteName",void 0),t}(t.Component),l=function(){function e(e){this._image=null,this._image=e,e?e instanceof HTMLImageElement?this.sprite=n.Sprite.from(e):e instanceof n.Texture&&(this.sprite=new n.Sprite(e)):this.sprite=new n.Sprite}return Object.defineProperty(e.prototype,"image",{get:function(){return this._image},set:function(e){this._image!==e&&(e instanceof HTMLImageElement?(this.sprite.texture&&this.sprite.texture.destroy(!1),this.sprite.texture=n.Texture.from(e)):e instanceof n.Texture&&(this.sprite.texture=e),this._image=e)},enumerable:!1,configurable:!0}),e}(),h="_s|r|c_";t.resource.registerInstance(t.RESOURCE_TYPE.SPRITE,(function(e){var t=e.name,r=e.data;return new Promise((function(e){var i,o,s=r.json,a=n.BaseTexture.from(r.image),c=s.frames||{},p=s.animations||{},f={};for(var l in c){f[t+h+l]=c[l]}for(var l in p){var d=[];if(p[l]&&p[l].length>=0)try{for(var m=(i=void 0,u(p[l])),y=m.next();!y.done;y=m.next()){var g=y.value,v=t+h+g;d.push(v)}}catch(e){i={error:e}}finally{try{y&&!y.done&&(o=m.return)&&o.call(m)}finally{if(i)throw i.error}}p[l]=d}s.frames=f;var E=new n.Spritesheet(a,s);E.parse((function(){var t=E.textures;e(t)}))}))})),t.resource.registerDestroy(t.RESOURCE_TYPE.SPRITE,(function(e){var t=e.instance;if(t)for(var r in t)t[r].destroy(!0)}));var d=function(e){function n(){var t=null!==e&&e.apply(this,arguments)||this;return t.name="Sprite",t.sprites={},t}return o(n,e),n.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},n.prototype.rendererUpdate=function(e){var t=e.transform.size,r=t.width,n=t.height;this.sprites[e.id]&&(this.sprites[e.id].sprite.width=r,this.sprites[e.id].sprite.height=n)},n.prototype.componentChanged=function(e){return a(this,void 0,void 0,(function(){var r,n,i,o,s=this;return c(this,(function(u){switch(u.label){case 0:return"Sprite"!==e.componentName?[3,4]:(r=e.component,e.type!==t.OBSERVER_TYPE.ADD?[3,1]:(n=new l(null),t.resource.getResource(r.resource).then((function(t){var i=t.instance;return a(s,void 0,void 0,(function(){return c(this,(function(t){return i?(n.image=i[r.resource+h+r.spriteName],[2]):(console.error("GameObject:"+e.gameObject.name+"'s Sprite resource load error"),[2])}))}))})),this.sprites[e.gameObject.id]=n,this.containerManager.getContainer(e.gameObject.id).addChildAt(n.sprite,0),[3,4]));case 1:return e.type!==t.OBSERVER_TYPE.CHANGE?[3,3]:[4,t.resource.getResource(r.resource)];case 2:return(i=u.sent().instance)?(this.sprites[e.gameObject.id].image=i[r.resource+h+r.spriteName],[3,4]):(console.error("GameObject:"+e.gameObject.name+"'s Sprite resource load error"),[2]);case 3:e.type===t.OBSERVER_TYPE.REMOVE&&(o=this.sprites[e.gameObject.id],this.containerManager.getContainer(e.gameObject.id).removeChild(o.sprite),o.sprite.destroy({children:!0}),delete this.sprites[e.gameObject.id]),u.label=4;case 4:return[2]}}))}))},n.systemName="Sprite",n=s([t.decorators.componentObserver({Sprite:["spriteName"]})],n)}(r.Renderer);return e.Sprite=f,e.SpriteSystem=d,Object.defineProperty(e,"__esModule",{value:!0}),e}({},EVA,EVA.plugin.renderer,PIXI);window.EVA.plugin.renderer.sprite=window.EVA.plugin.renderer.sprite||_EVA_IIFE_sprite;
+window.EVA=window.EVA||{},window.EVA.plugin=window.EVA.plugin||{},window.EVA.plugin.renderer=window.EVA.plugin.renderer||{};var _EVA_IIFE_sprite=function(e,t,r,n){"use strict";var o=function(e,t){return o=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r])},o(e,t)};function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");function r(){this.constructor=e}o(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}var s=function(){return s=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var o in t=arguments[r])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e},s.apply(this,arguments)};function a(e,t,r,n){var o,i=arguments.length,s=i<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n);else for(var a=e.length-1;a>=0;a--)(o=e[a])&&(s=(i<3?o(s):i>3?o(t,r,s):o(t,r))||s);return i>3&&s&&Object.defineProperty(t,r,s),s}function c(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function u(e,t,r,n){return new(r||(r=Promise))((function(o,i){function s(e){try{c(n.next(e))}catch(e){i(e)}}function a(e){try{c(n.throw(e))}catch(e){i(e)}}function c(e){var t;e.done?o(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(s,a)}c((n=n.apply(e,t||[])).next())}))}function p(e,t){var r,n,o,i,s={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(i){return function(a){return function(i){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(o=2&i[0]?n.return:i[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,i[1])).done)return o;switch(n=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return s.label++,{value:i[1],done:!1};case 5:s.label++,n=i[1],i=[0];continue;case 7:i=s.ops.pop(),s.trys.pop();continue;default:if(!(o=s.trys,(o=o.length>0&&o[o.length-1])||6!==i[0]&&2!==i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){s.label=i[1];break}if(6===i[0]&&s.label<o[1]){s.label=o[1],o=i;break}if(o&&s.label<o[2]){s.label=o[2],s.ops.push(i);break}o[2]&&s.ops.pop(),s.trys.pop();continue}i=t.call(e,s)}catch(e){i=[6,e],n=0}finally{r=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,a])}}}function l(e){var t="function"==typeof Symbol&&Symbol.iterator,r=t&&e[t],n=0;if(r)return r.call(e);if(e&&"number"==typeof e.length)return{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}};throw new TypeError(t?"Object is not iterable.":"Symbol.iterator is not defined.")}var f=function(e){function t(){var t=this.constructor,r=e.call(this,"Symbol keys are not supported yet!")||this;return Object.setPrototypeOf(r,t.prototype),r}return i(t,e),t}(Error);!function(e){function t(){var t=this.constructor,r=e.call(this,"getProperties is not a function!")||this;return Object.setPrototypeOf(r,t.prototype),r}i(t,e)}(Error);var d,y="IDE_PROPERTY_METADATA";function h(e,t,r,n){var o=Reflect.getMetadata("design:type",e,t),i=o===Array,a=function(e){return e===String?"string":e===Number?"number":e===Boolean?"boolean":"unknown"}(o);if("unknown"!==a&&(o=a),n){var c=n();Array.isArray(c)?(i=!0,o=c[0]):o=c}var u=Reflect.getMetadata(y,e.constructor)||{};u[t]=s({type:o,isArray:i},r),Reflect.defineMetadata(y,u,e.constructor)}function m(e,t){return function(r,n){if("symbol"==typeof n)throw new f;var o=function(e,t){return"function"==typeof e?{returnTypeFunc:e,options:t||{}}:{options:e||{}}}(e,t);h(r,n,o.options,o.returnTypeFunc)}}!function(e){e[e.Edit=2]="Edit",e[e.Game=4]="Game",e[e.All=6]="All"}(d||(d={}));var v=function(e){function r(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t.spriteName="",t}return i(r,e),r.prototype.init=function(e){e&&e.resource&&(this.resource=e.resource,this.spriteName=e.spriteName)},r.componentName="Sprite",a([m({type:"resource"}),c("design:type",String)],r.prototype,"resource",void 0),a([m({type:"selector",options:function(e){var r,n,o;return u(this,void 0,void 0,(function(){var i;return p(this,(function(a){switch(a.label){case 0:return[4,(c=0,new Promise((function(e){return setTimeout(e,c)})))];case 1:return a.sent(),e.resource&&t.resource.promiseMap[e.resource]?[4,t.resource.promiseMap[e.resource]]:[2,{}];case 2:return a.sent(),[2,(i=null===(o=null===(n=null===(r=t.resource.resourcesMap[e.resource])||void 0===r?void 0:r.data)||void 0===n?void 0:n.json)||void 0===o?void 0:o.frames)?Object.values(i).map((function(e){return e.name})).reduce((function(e,t){var r;return s(s({},e),((r={})[t]=t,r))}),{}):{}]}var c}))}))}}),c("design:type",String)],r.prototype,"spriteName",void 0),r}(t.Component),g=v,b=function(){function e(e){this._image=null,this._image=e,e?e instanceof HTMLImageElement?this.sprite=n.Sprite.from(e):e instanceof n.Texture&&(this.sprite=new n.Sprite(e)):this.sprite=new n.Sprite}return Object.defineProperty(e.prototype,"image",{get:function(){return this._image},set:function(e){this._image!==e&&(e instanceof HTMLImageElement?(this.sprite.texture&&this.sprite.texture.destroy(!1),this.sprite.texture=n.Texture.from(e)):e instanceof n.Texture&&(this.sprite.texture=e),this._image=e)},enumerable:!1,configurable:!0}),e}(),w=b,E="_s|r|c_";t.resource.registerInstance(t.RESOURCE_TYPE.SPRITE,(function(e){var t=e.name,r=e.data;return new Promise((function(e){var o,i,s=r.json,a=n.BaseTexture.from(r.image),c=s.frames||{},u=s.animations||{},p={};for(var f in c){p[t+E+f]=c[f]}for(var f in u){var d=[];if(u[f]&&u[f].length>=0)try{for(var y=(o=void 0,l(u[f])),h=y.next();!h.done;h=y.next()){var m=h.value,v=t+E+m;d.push(v)}}catch(e){o={error:e}}finally{try{h&&!h.done&&(i=y.return)&&i.call(y)}finally{if(o)throw o.error}}u[f]=d}s.frames=p;var g=new n.Spritesheet(a,s);g.parse((function(){var t=g.textures;e(t)}))}))})),t.resource.registerDestroy(t.RESOURCE_TYPE.SPRITE,(function(e){var t=e.instance;if(t)for(var r in t)t[r].destroy(!0)}));var O=function(e){function n(){var t=null!==e&&e.apply(this,arguments)||this;return t.name="Sprite",t.sprites={},t}return i(n,e),n.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},n.prototype.rendererUpdate=function(e){var t=e.transform.size,r=t.width,n=t.height;this.sprites[e.id]&&(this.sprites[e.id].sprite.width=r,this.sprites[e.id].sprite.height=n)},n.prototype.componentChanged=function(e){return u(this,void 0,void 0,(function(){var r,n,o,i,s;return p(this,(function(a){switch(a.label){case 0:return"Sprite"!==e.componentName?[3,5]:(r=e.gameObject.id,n=e.component,e.type!==t.OBSERVER_TYPE.ADD?[3,2]:(s=new w(null),this.sprites[e.gameObject.id]=s,this.containerManager.getContainer(e.gameObject.id).addChildAt(s.sprite,0),o=this.increaseAsyncId(r),[4,t.resource.getResource(n.resource)]));case 1:return i=a.sent().instance,this.validateAsyncId(r,o)?i?(s.image=i[n.resource+E+n.spriteName],[3,5]):(console.error("GameObject:"+e.gameObject.name+"'s Sprite resource load error"),[2]):[2];case 2:return e.type!==t.OBSERVER_TYPE.CHANGE?[3,4]:(o=this.increaseAsyncId(r),[4,t.resource.getResource(n.resource)]);case 3:return i=a.sent().instance,this.validateAsyncId(r,o)?i?(this.sprites[e.gameObject.id].image=i[n.resource+E+n.spriteName],[3,5]):(console.error("GameObject:"+e.gameObject.name+"'s Sprite resource load error"),[2]):[2];case 4:e.type===t.OBSERVER_TYPE.REMOVE&&(this.increaseAsyncId(r),s=this.sprites[e.gameObject.id],this.containerManager.getContainer(e.gameObject.id).removeChild(s.sprite),s.sprite.destroy({children:!0}),delete this.sprites[e.gameObject.id]),a.label=5;case 5:return[2]}}))}))},n.systemName="Sprite",n=a([t.decorators.componentObserver({Sprite:["spriteName"]})],n)}(r.Renderer),S=O;return e.Sprite=g,e.SpriteSystem=S,Object.defineProperty(e,"__esModule",{value:!0}),e}({},EVA,EVA.plugin.renderer,PIXI);window.EVA.plugin.renderer.sprite=window.EVA.plugin.renderer.sprite||_EVA_IIFE_sprite;

package/dist/plugin-renderer-sprite.cjs.js

@@ -36,6 +36,17 @@ function __extends(d, b) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 }
 
+var __assign = function() {
+    __assign = Object.assign || function __assign(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+
 function __decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -43,6 +54,10 @@ function __decorate(decorators, target, key, desc) {
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 
+function __metadata(metadataKey, metadataValue) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+}
+
 function __awaiter(thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -91,6 +106,7 @@ function __values(o) {
     };
 }
 
+var sleep = function (time) { return new Promise(function (resolve) { return setTimeout(resolve, time); }); };
 var Sprite$3 = (function (_super) {
     __extends(Sprite, _super);
     function Sprite() {
@@ -107,10 +123,42 @@ var Sprite$3 = (function (_super) {
     };
     Sprite.componentName = 'Sprite';
     __decorate([
-        inspectorDecorator.type('string')
+        inspectorDecorator.Field({ type: 'resource' }),
+        __metadata("design:type", String)
     ], Sprite.prototype, "resource", void 0);
     __decorate([
-        inspectorDecorator.type('string')
+        inspectorDecorator.Field({
+            type: 'selector',
+            options: function (instance) {
+                var _a, _b, _c;
+                return __awaiter(this, void 0, void 0, function () {
+                    var frames;
+                    return __generator(this, function (_d) {
+                        switch (_d.label) {
+                            case 0: return [4, sleep(0)];
+                            case 1:
+                                _d.sent();
+                                if (!instance.resource || !eva_js.resource.promiseMap[instance.resource]) {
+                                    return [2, {}];
+                                }
+                                return [4, eva_js.resource.promiseMap[instance.resource]];
+                            case 2:
+                                _d.sent();
+                                frames = (_c = (_b = (_a = eva_js.resource.resourcesMap[instance.resource]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.json) === null || _c === void 0 ? void 0 : _c.frames;
+                                return [2, frames
+                                        ? Object.values(frames)
+                                            .map(function (item) { return item.name; })
+                                            .reduce(function (prev, key) {
+                                            var _a;
+                                            return (__assign(__assign({}, prev), (_a = {}, _a[key] = key, _a)));
+                                        }, {})
+                                        : {}];
+                        }
+                    });
+                });
+            },
+        }),
+        __metadata("design:type", String)
     ], Sprite.prototype, "spriteName", void 0);
     return Sprite;
 }(eva_js.Component));
@@ -227,52 +275,54 @@ var Sprite = (function (_super) {
     };
     Sprite.prototype.componentChanged = function (changed) {
         return __awaiter(this, void 0, void 0, function () {
-            var component_1, sprite_1, instance, sprite;
-            var _this = this;
+            var gameObjectId, component, sprite, asyncId, instance, asyncId, instance, sprite;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(changed.componentName === 'Sprite')) return [3, 4];
-                        component_1 = changed.component;
-                        if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 1];
-                        sprite_1 = new SpriteEngine(null);
-                        eva_js.resource.getResource(component_1.resource).then(function (_a) {
-                            var instance = _a.instance;
-                            return __awaiter(_this, void 0, void 0, function () {
-                                return __generator(this, function (_b) {
-                                    if (!instance) {
-                                        console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
-                                        return [2];
-                                    }
-                                    sprite_1.image = instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-                                    return [2];
-                                });
-                            });
-                        });
-                        this.sprites[changed.gameObject.id] = sprite_1;
-                        this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite_1.sprite, 0);
-                        return [3, 4];
+                        if (!(changed.componentName === 'Sprite')) return [3, 5];
+                        gameObjectId = changed.gameObject.id;
+                        component = changed.component;
+                        if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 2];
+                        sprite = new SpriteEngine(null);
+                        this.sprites[changed.gameObject.id] = sprite;
+                        this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite.sprite, 0);
+                        asyncId = this.increaseAsyncId(gameObjectId);
+                        return [4, eva_js.resource.getResource(component.resource)];
                     case 1:
-                        if (!(changed.type === eva_js.OBSERVER_TYPE.CHANGE)) return [3, 3];
-                        return [4, eva_js.resource.getResource(component_1.resource)];
+                        instance = (_a.sent()).instance;
+                        if (!this.validateAsyncId(gameObjectId, asyncId))
+                            return [2];
+                        if (!instance) {
+                            console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
+                            return [2];
+                        }
+                        sprite.image = instance[component.resource + resourceKeySplit + component.spriteName];
+                        return [3, 5];
                     case 2:
+                        if (!(changed.type === eva_js.OBSERVER_TYPE.CHANGE)) return [3, 4];
+                        asyncId = this.increaseAsyncId(gameObjectId);
+                        return [4, eva_js.resource.getResource(component.resource)];
+                    case 3:
                         instance = (_a.sent()).instance;
+                        if (!this.validateAsyncId(gameObjectId, asyncId))
+                            return [2];
                         if (!instance) {
                             console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
                             return [2];
                         }
                         this.sprites[changed.gameObject.id].image =
-                            instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-                        return [3, 4];
-                    case 3:
+                            instance[component.resource + resourceKeySplit + component.spriteName];
+                        return [3, 5];
+                    case 4:
                         if (changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
+                            this.increaseAsyncId(gameObjectId);
                             sprite = this.sprites[changed.gameObject.id];
                             this.containerManager.getContainer(changed.gameObject.id).removeChild(sprite.sprite);
                             sprite.sprite.destroy({ children: true });
                             delete this.sprites[changed.gameObject.id];
                         }
-                        _a.label = 4;
-                    case 4: return [2];
+                        _a.label = 5;
+                    case 5: return [2];
                 }
             });
         });

package/dist/plugin-renderer-sprite.cjs.prod.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/inspector-decorator"),r=require("@eva/plugin-renderer"),n=require("pixi.js"),i=function(e,t){return(i=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])})(e,t)};function o(e,t){function r(){this.constructor=e}i(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}function s(e,t,r,n){var i,o=arguments.length,s=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n);else for(var a=e.length-1;a>=0;a--)(i=e[a])&&(s=(o<3?i(s):o>3?i(t,r,s):i(t,r))||s);return o>3&&s&&Object.defineProperty(t,r,s),s}function a(e,t,r,n){return new(r||(r=Promise))((function(i,o){function s(e){try{c(n.next(e))}catch(e){o(e)}}function a(e){try{c(n.throw(e))}catch(e){o(e)}}function c(e){e.done?i(e.value):new r((function(t){t(e.value)})).then(s,a)}c((n=n.apply(e,t||[])).next())}))}function c(e,t){var r,n,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=s.trys,(i=i.length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue}o=t.call(e,s)}catch(e){o=[6,e],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}function u(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}}}}var p=function(e){function r(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t.spriteName="",t}return o(r,e),r.prototype.init=function(e){e&&e.resource&&(this.resource=e.resource,this.spriteName=e.spriteName)},r.componentName="Sprite",s([t.type("string")],r.prototype,"resource",void 0),s([t.type("string")],r.prototype,"spriteName",void 0),r}(e.Component),f=function(){function e(e){this._image=null,this._image=e,e?e instanceof HTMLImageElement?this.sprite=n.Sprite.from(e):e instanceof n.Texture&&(this.sprite=new n.Sprite(e)):this.sprite=new n.Sprite}return Object.defineProperty(e.prototype,"image",{get:function(){return this._image},set:function(e){this._image!==e&&(e instanceof HTMLImageElement?(this.sprite.texture&&this.sprite.texture.destroy(!1),this.sprite.texture=n.Texture.from(e)):e instanceof n.Texture&&(this.sprite.texture=e),this._image=e)},enumerable:!1,configurable:!0}),e}();e.resource.registerInstance(e.RESOURCE_TYPE.SPRITE,(function(e){var t=e.name,r=e.data;return new Promise((function(e){var i,o,s=r.json,a=n.BaseTexture.from(r.image),c=s.frames||{},p=s.animations||{},f={};for(var l in c){f[t+"_s|r|c_"+l]=c[l]}for(var l in p){var h=[];if(p[l]&&p[l].length>=0)try{for(var m=(i=void 0,u(p[l])),d=m.next();!d.done;d=m.next()){var y=d.value,g=t+"_s|r|c_"+y;h.push(g)}}catch(e){i={error:e}}finally{try{d&&!d.done&&(o=m.return)&&o.call(m)}finally{if(i)throw i.error}}p[l]=h}s.frames=f;var v=new n.Spritesheet(a,s);v.parse((function(){var t=v.textures;e(t)}))}))})),e.resource.registerDestroy(e.RESOURCE_TYPE.SPRITE,(function(e){var t=e.instance;if(t)for(var r in t)t[r].destroy(!0)}));var l=function(t){function n(){var e=null!==t&&t.apply(this,arguments)||this;return e.name="Sprite",e.sprites={},e}return o(n,t),n.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},n.prototype.rendererUpdate=function(e){var t=e.transform.size,r=t.width,n=t.height;this.sprites[e.id]&&(this.sprites[e.id].sprite.width=r,this.sprites[e.id].sprite.height=n)},n.prototype.componentChanged=function(t){return a(this,void 0,void 0,(function(){var r,n,i,o,s=this;return c(this,(function(u){switch(u.label){case 0:return"Sprite"!==t.componentName?[3,4]:(r=t.component,t.type!==e.OBSERVER_TYPE.ADD?[3,1]:(n=new f(null),e.resource.getResource(r.resource).then((function(e){var i=e.instance;return a(s,void 0,void 0,(function(){return c(this,(function(e){return i?(n.image=i[r.resource+"_s|r|c_"+r.spriteName],[2]):(console.error("GameObject:"+t.gameObject.name+"'s Sprite resource load error"),[2])}))}))})),this.sprites[t.gameObject.id]=n,this.containerManager.getContainer(t.gameObject.id).addChildAt(n.sprite,0),[3,4]));case 1:return t.type!==e.OBSERVER_TYPE.CHANGE?[3,3]:[4,e.resource.getResource(r.resource)];case 2:return(i=u.sent().instance)?(this.sprites[t.gameObject.id].image=i[r.resource+"_s|r|c_"+r.spriteName],[3,4]):(console.error("GameObject:"+t.gameObject.name+"'s Sprite resource load error"),[2]);case 3:t.type===e.OBSERVER_TYPE.REMOVE&&(o=this.sprites[t.gameObject.id],this.containerManager.getContainer(t.gameObject.id).removeChild(o.sprite),o.sprite.destroy({children:!0}),delete this.sprites[t.gameObject.id]),u.label=4;case 4:return[2]}}))}))},n.systemName="Sprite",n=s([e.decorators.componentObserver({Sprite:["spriteName"]})],n)}(r.Renderer);exports.Sprite=p,exports.SpriteSystem=l;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/inspector-decorator"),r=require("@eva/plugin-renderer"),n=require("pixi.js"),i=function(e,t){return i=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])},i(e,t)};function o(e,t){function r(){this.constructor=e}i(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}var s=function(){return s=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var i in t=arguments[r])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e},s.apply(this,arguments)};function a(e,t,r,n){var i,o=arguments.length,s=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n);else for(var a=e.length-1;a>=0;a--)(i=e[a])&&(s=(o<3?i(s):o>3?i(t,r,s):i(t,r))||s);return o>3&&s&&Object.defineProperty(t,r,s),s}function c(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function u(e,t,r,n){return new(r||(r=Promise))((function(i,o){function s(e){try{c(n.next(e))}catch(e){o(e)}}function a(e){try{c(n.throw(e))}catch(e){o(e)}}function c(e){e.done?i(e.value):new r((function(t){t(e.value)})).then(s,a)}c((n=n.apply(e,t||[])).next())}))}function p(e,t){var r,n,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=s.trys,(i=i.length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue}o=t.call(e,s)}catch(e){o=[6,e],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}function l(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}}}}var f=function(r){function n(){var e=null!==r&&r.apply(this,arguments)||this;return e.resource="",e.spriteName="",e}return o(n,r),n.prototype.init=function(e){e&&e.resource&&(this.resource=e.resource,this.spriteName=e.spriteName)},n.componentName="Sprite",a([t.Field({type:"resource"}),c("design:type",String)],n.prototype,"resource",void 0),a([t.Field({type:"selector",options:function(t){var r,n,i;return u(this,void 0,void 0,(function(){var o;return p(this,(function(a){switch(a.label){case 0:return[4,(c=0,new Promise((function(e){return setTimeout(e,c)})))];case 1:return a.sent(),t.resource&&e.resource.promiseMap[t.resource]?[4,e.resource.promiseMap[t.resource]]:[2,{}];case 2:return a.sent(),[2,(o=null===(i=null===(n=null===(r=e.resource.resourcesMap[t.resource])||void 0===r?void 0:r.data)||void 0===n?void 0:n.json)||void 0===i?void 0:i.frames)?Object.values(o).map((function(e){return e.name})).reduce((function(e,t){var r;return s(s({},e),((r={})[t]=t,r))}),{}):{}]}var c}))}))}}),c("design:type",String)],n.prototype,"spriteName",void 0),n}(e.Component),d=f,h=function(){function e(e){this._image=null,this._image=e,e?e instanceof HTMLImageElement?this.sprite=n.Sprite.from(e):e instanceof n.Texture&&(this.sprite=new n.Sprite(e)):this.sprite=new n.Sprite}return Object.defineProperty(e.prototype,"image",{get:function(){return this._image},set:function(e){this._image!==e&&(e instanceof HTMLImageElement?(this.sprite.texture&&this.sprite.texture.destroy(!1),this.sprite.texture=n.Texture.from(e)):e instanceof n.Texture&&(this.sprite.texture=e),this._image=e)},enumerable:!1,configurable:!0}),e}(),m=h;e.resource.registerInstance(e.RESOURCE_TYPE.SPRITE,(function(e){var t=e.name,r=e.data;return new Promise((function(e){var i,o,s=r.json,a=n.BaseTexture.from(r.image),c=s.frames||{},u=s.animations||{},p={};for(var f in c){p[t+"_s|r|c_"+f]=c[f]}for(var f in u){var d=[];if(u[f]&&u[f].length>=0)try{for(var h=(i=void 0,l(u[f])),m=h.next();!m.done;m=h.next()){var y=m.value,v=t+"_s|r|c_"+y;d.push(v)}}catch(e){i={error:e}}finally{try{m&&!m.done&&(o=h.return)&&o.call(h)}finally{if(i)throw i.error}}u[f]=d}s.frames=p;var g=new n.Spritesheet(a,s);g.parse((function(){var t=g.textures;e(t)}))}))})),e.resource.registerDestroy(e.RESOURCE_TYPE.SPRITE,(function(e){var t=e.instance;if(t)for(var r in t)t[r].destroy(!0)}));var y=function(t){function n(){var e=null!==t&&t.apply(this,arguments)||this;return e.name="Sprite",e.sprites={},e}return o(n,t),n.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},n.prototype.rendererUpdate=function(e){var t=e.transform.size,r=t.width,n=t.height;this.sprites[e.id]&&(this.sprites[e.id].sprite.width=r,this.sprites[e.id].sprite.height=n)},n.prototype.componentChanged=function(t){return u(this,void 0,void 0,(function(){var r,n,i,o,s;return p(this,(function(a){switch(a.label){case 0:return"Sprite"!==t.componentName?[3,5]:(r=t.gameObject.id,n=t.component,t.type!==e.OBSERVER_TYPE.ADD?[3,2]:(s=new m(null),this.sprites[t.gameObject.id]=s,this.containerManager.getContainer(t.gameObject.id).addChildAt(s.sprite,0),i=this.increaseAsyncId(r),[4,e.resource.getResource(n.resource)]));case 1:return o=a.sent().instance,this.validateAsyncId(r,i)?o?(s.image=o[n.resource+"_s|r|c_"+n.spriteName],[3,5]):(console.error("GameObject:"+t.gameObject.name+"'s Sprite resource load error"),[2]):[2];case 2:return t.type!==e.OBSERVER_TYPE.CHANGE?[3,4]:(i=this.increaseAsyncId(r),[4,e.resource.getResource(n.resource)]);case 3:return o=a.sent().instance,this.validateAsyncId(r,i)?o?(this.sprites[t.gameObject.id].image=o[n.resource+"_s|r|c_"+n.spriteName],[3,5]):(console.error("GameObject:"+t.gameObject.name+"'s Sprite resource load error"),[2]):[2];case 4:t.type===e.OBSERVER_TYPE.REMOVE&&(this.increaseAsyncId(r),s=this.sprites[t.gameObject.id],this.containerManager.getContainer(t.gameObject.id).removeChild(s.sprite),s.sprite.destroy({children:!0}),delete this.sprites[t.gameObject.id]),a.label=5;case 5:return[2]}}))}))},n.systemName="Sprite",n=a([e.decorators.componentObserver({Sprite:["spriteName"]})],n)}(r.Renderer);exports.Sprite=d,exports.SpriteSystem=y;

package/dist/plugin-renderer-sprite.esm.js

@@ -1,5 +1,5 @@
 import { Component, resource, RESOURCE_TYPE, decorators, OBSERVER_TYPE } from '@eva/eva.js';
-import { type } from '@eva/inspector-decorator';
+import { Field } from '@eva/inspector-decorator';
 import { RendererSystem, Renderer } from '@eva/plugin-renderer';
 import { Texture, Sprite as Sprite$5, BaseTexture, Spritesheet } from 'pixi.js';
 
@@ -32,6 +32,17 @@ function __extends(d, b) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 }
 
+var __assign = function() {
+    __assign = Object.assign || function __assign(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+
 function __decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -39,6 +50,10 @@ function __decorate(decorators, target, key, desc) {
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 
+function __metadata(metadataKey, metadataValue) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+}
+
 function __awaiter(thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -87,6 +102,7 @@ function __values(o) {
     };
 }
 
+var sleep = function (time) { return new Promise(function (resolve) { return setTimeout(resolve, time); }); };
 var Sprite$3 = (function (_super) {
     __extends(Sprite, _super);
     function Sprite() {
@@ -103,10 +119,42 @@ var Sprite$3 = (function (_super) {
     };
     Sprite.componentName = 'Sprite';
     __decorate([
-        type('string')
+        Field({ type: 'resource' }),
+        __metadata("design:type", String)
     ], Sprite.prototype, "resource", void 0);
     __decorate([
-        type('string')
+        Field({
+            type: 'selector',
+            options: function (instance) {
+                var _a, _b, _c;
+                return __awaiter(this, void 0, void 0, function () {
+                    var frames;
+                    return __generator(this, function (_d) {
+                        switch (_d.label) {
+                            case 0: return [4, sleep(0)];
+                            case 1:
+                                _d.sent();
+                                if (!instance.resource || !resource.promiseMap[instance.resource]) {
+                                    return [2, {}];
+                                }
+                                return [4, resource.promiseMap[instance.resource]];
+                            case 2:
+                                _d.sent();
+                                frames = (_c = (_b = (_a = resource.resourcesMap[instance.resource]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.json) === null || _c === void 0 ? void 0 : _c.frames;
+                                return [2, frames
+                                        ? Object.values(frames)
+                                            .map(function (item) { return item.name; })
+                                            .reduce(function (prev, key) {
+                                            var _a;
+                                            return (__assign(__assign({}, prev), (_a = {}, _a[key] = key, _a)));
+                                        }, {})
+                                        : {}];
+                        }
+                    });
+                });
+            },
+        }),
+        __metadata("design:type", String)
     ], Sprite.prototype, "spriteName", void 0);
     return Sprite;
 }(Component));
@@ -223,52 +271,54 @@ var Sprite = (function (_super) {
     };
     Sprite.prototype.componentChanged = function (changed) {
         return __awaiter(this, void 0, void 0, function () {
-            var component_1, sprite_1, instance, sprite;
-            var _this = this;
+            var gameObjectId, component, sprite, asyncId, instance, asyncId, instance, sprite;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(changed.componentName === 'Sprite')) return [3, 4];
-                        component_1 = changed.component;
-                        if (!(changed.type === OBSERVER_TYPE.ADD)) return [3, 1];
-                        sprite_1 = new SpriteEngine(null);
-                        resource.getResource(component_1.resource).then(function (_a) {
-                            var instance = _a.instance;
-                            return __awaiter(_this, void 0, void 0, function () {
-                                return __generator(this, function (_b) {
-                                    if (!instance) {
-                                        console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
-                                        return [2];
-                                    }
-                                    sprite_1.image = instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-                                    return [2];
-                                });
-                            });
-                        });
-                        this.sprites[changed.gameObject.id] = sprite_1;
-                        this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite_1.sprite, 0);
-                        return [3, 4];
+                        if (!(changed.componentName === 'Sprite')) return [3, 5];
+                        gameObjectId = changed.gameObject.id;
+                        component = changed.component;
+                        if (!(changed.type === OBSERVER_TYPE.ADD)) return [3, 2];
+                        sprite = new SpriteEngine(null);
+                        this.sprites[changed.gameObject.id] = sprite;
+                        this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite.sprite, 0);
+                        asyncId = this.increaseAsyncId(gameObjectId);
+                        return [4, resource.getResource(component.resource)];
                     case 1:
-                        if (!(changed.type === OBSERVER_TYPE.CHANGE)) return [3, 3];
-                        return [4, resource.getResource(component_1.resource)];
+                        instance = (_a.sent()).instance;
+                        if (!this.validateAsyncId(gameObjectId, asyncId))
+                            return [2];
+                        if (!instance) {
+                            console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
+                            return [2];
+                        }
+                        sprite.image = instance[component.resource + resourceKeySplit + component.spriteName];
+                        return [3, 5];
                     case 2:
+                        if (!(changed.type === OBSERVER_TYPE.CHANGE)) return [3, 4];
+                        asyncId = this.increaseAsyncId(gameObjectId);
+                        return [4, resource.getResource(component.resource)];
+                    case 3:
                         instance = (_a.sent()).instance;
+                        if (!this.validateAsyncId(gameObjectId, asyncId))
+                            return [2];
                         if (!instance) {
                             console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
                             return [2];
                         }
                         this.sprites[changed.gameObject.id].image =
-                            instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-                        return [3, 4];
-                    case 3:
+                            instance[component.resource + resourceKeySplit + component.spriteName];
+                        return [3, 5];
+                    case 4:
                         if (changed.type === OBSERVER_TYPE.REMOVE) {
+                            this.increaseAsyncId(gameObjectId);
                             sprite = this.sprites[changed.gameObject.id];
                             this.containerManager.getContainer(changed.gameObject.id).removeChild(sprite.sprite);
                             sprite.sprite.destroy({ children: true });
                             delete this.sprites[changed.gameObject.id];
                         }
-                        _a.label = 4;
-                    case 4: return [2];
+                        _a.label = 5;
+                    case 5: return [2];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/plugin-renderer-sprite",
-  "version": "1.2.6",
+  "version": "1.2.7-editor.10",
   "description": "@eva/plugin-renderer-sprite",
   "main": "index.js",
   "module": "dist/plugin-renderer-sprite.esm.js",
@@ -18,9 +18,9 @@
   "license": "MIT",
   "homepage": "https://eva.js.org",
   "dependencies": {
-    "@eva/inspector-decorator": "^0.0.5",
-    "@eva/plugin-renderer": "1.2.6",
-    "@eva/eva.js": "1.2.6",
+    "@eva/inspector-decorator": "0.1.0-alpha.2",
+    "@eva/plugin-renderer": "1.2.7-editor.10",
+    "@eva/eva.js": "1.2.7-editor.10",
     "pixi.js": "^4.8.7"
   }
 }

package/dist/miniprogram.js

@@ -1,197 +0,0 @@
-import { __extends, __decorate, __values, __awaiter, __generator } from 'tslib';
-import { Component, resource, RESOURCE_TYPE, OBSERVER_TYPE, decorators } from '@eva/eva.js/dist/miniprogram';
-import { type } from '@eva/inspector-decorator';
-import { RendererSystem, Renderer } from '@eva/plugin-renderer/dist/miniprogram';
-import { Sprite as Sprite$4 } from '@eva/renderer-adapter/dist/miniprogram';
-import { BaseTexture, Spritesheet } from '@eva/miniprogram-pixi';
-
-var Sprite$2 = function (_super) {
-  __extends(Sprite, _super);
-
-  function Sprite() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
-
-    _this.resource = '';
-    _this.spriteName = '';
-    return _this;
-  }
-
-  Sprite.prototype.init = function (obj) {
-    if (obj && obj.resource) {
-      this.resource = obj.resource;
-      this.spriteName = obj.spriteName;
-    }
-  };
-
-  Sprite.componentName = 'Sprite';
-
-  __decorate([type('string')], Sprite.prototype, "resource", void 0);
-
-  __decorate([type('string')], Sprite.prototype, "spriteName", void 0);
-
-  return Sprite;
-}(Component);
-
-var Sprite$3 = Sprite$2;
-var resourceKeySplit = '_s|r|c_';
-resource.registerInstance(RESOURCE_TYPE.SPRITE, function (_a) {
-  var name = _a.name,
-      data = _a.data;
-  return new Promise(function (r) {
-    var e_1, _a;
-
-    var textureObj = data.json;
-    var texture = BaseTexture.from(data.image);
-    var frames = textureObj.frames || {};
-    var animations = textureObj.animations || {};
-    var newFrames = {};
-
-    for (var key in frames) {
-      var newKey = name + resourceKeySplit + key;
-      newFrames[newKey] = frames[key];
-    }
-
-    for (var key in animations) {
-      var spriteList = [];
-
-      if (animations[key] && animations[key].length >= 0) {
-        try {
-          for (var _b = (e_1 = void 0, __values(animations[key])), _c = _b.next(); !_c.done; _c = _b.next()) {
-            var spriteName = _c.value;
-            var newSpriteName = name + resourceKeySplit + spriteName;
-            spriteList.push(newSpriteName);
-          }
-        } catch (e_1_1) {
-          e_1 = {
-            error: e_1_1
-          };
-        } finally {
-          try {
-            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-          } finally {
-            if (e_1) throw e_1.error;
-          }
-        }
-      }
-
-      animations[key] = spriteList;
-    }
-
-    textureObj.frames = newFrames;
-    var spriteSheet = new Spritesheet(texture, textureObj);
-    spriteSheet.parse(function () {
-      var textures = spriteSheet.textures;
-      r(textures);
-    });
-  });
-});
-resource.registerDestroy(RESOURCE_TYPE.SPRITE, function (_a) {
-  var instance = _a.instance;
-  if (!instance) return;
-
-  for (var key in instance) {
-    instance[key].destroy(true);
-  }
-});
-
-var Sprite = function (_super) {
-  __extends(Sprite, _super);
-
-  function Sprite() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
-
-    _this.name = 'Sprite';
-    _this.sprites = {};
-    return _this;
-  }
-
-  Sprite.prototype.init = function () {
-    this.renderSystem = this.game.getSystem(RendererSystem);
-    this.renderSystem.rendererManager.register(this);
-  };
-
-  Sprite.prototype.rendererUpdate = function (gameObject) {
-    var _a = gameObject.transform.size,
-        width = _a.width,
-        height = _a.height;
-
-    if (this.sprites[gameObject.id]) {
-      this.sprites[gameObject.id].sprite.width = width;
-      this.sprites[gameObject.id].sprite.height = height;
-    }
-  };
-
-  Sprite.prototype.componentChanged = function (changed) {
-    return __awaiter(this, void 0, void 0, function () {
-      var component_1, sprite_1, instance, sprite;
-
-      var _this = this;
-
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            if (!(changed.componentName === 'Sprite')) return [3, 4];
-            component_1 = changed.component;
-            if (!(changed.type === OBSERVER_TYPE.ADD)) return [3, 1];
-            sprite_1 = new Sprite$4(null);
-            resource.getResource(component_1.resource).then(function (_a) {
-              var instance = _a.instance;
-              return __awaiter(_this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
-                  if (!instance) {
-                    console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
-                    return [2];
-                  }
-
-                  sprite_1.image = instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-                  return [2];
-                });
-              });
-            });
-            this.sprites[changed.gameObject.id] = sprite_1;
-            this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite_1.sprite, 0);
-            return [3, 4];
-
-          case 1:
-            if (!(changed.type === OBSERVER_TYPE.CHANGE)) return [3, 3];
-            return [4, resource.getResource(component_1.resource)];
-
-          case 2:
-            instance = _a.sent().instance;
-
-            if (!instance) {
-              console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
-              return [2];
-            }
-
-            this.sprites[changed.gameObject.id].image = instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-            return [3, 4];
-
-          case 3:
-            if (changed.type === OBSERVER_TYPE.REMOVE) {
-              sprite = this.sprites[changed.gameObject.id];
-              this.containerManager.getContainer(changed.gameObject.id).removeChild(sprite.sprite);
-              sprite.sprite.destroy({
-                children: true
-              });
-              delete this.sprites[changed.gameObject.id];
-            }
-
-            _a.label = 4;
-
-          case 4:
-            return [2];
-        }
-      });
-    });
-  };
-
-  Sprite.systemName = 'Sprite';
-  Sprite = __decorate([decorators.componentObserver({
-    Sprite: ['spriteName']
-  })], Sprite);
-  return Sprite;
-}(Renderer);
-
-var Sprite$1 = Sprite;
-export { Sprite$3 as Sprite, Sprite$1 as SpriteSystem };