@eva/plugin-renderer-sprite-animation 1.3.0-alpha.1 → 2.0.0-beta.0

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

@@ -1,53 +1,39 @@
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-this.EVA = this.EVA || {};
-this.EVA.plugin = this.EVA.plugin || {};
-this.EVA.plugin.renderer = this.EVA.plugin.renderer || {};
-
-this.EVA.plugin.renderer.spriteAnimation = function (exports, eva_js, pluginRenderer, rendererAdapter, pixi_js) {
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+window.EVA = window.EVA || {};
+window.EVA.plugin = window.EVA.plugin || {};
+window.EVA.plugin.renderer = window.EVA.plugin.renderer || {};
+var _EVA_IIFE_spriteAnimation = function (exports, eva_js, pluginRenderer, rendererAdapter, pixi_js) {
   'use strict';
-
-  var _extendStatics = function extendStatics(d, b) {
-    _extendStatics = Object.setPrototypeOf || {
+  var extendStatics = function (d, b) {
+    extendStatics = Object.setPrototypeOf || {
       __proto__: []
     } instanceof Array && function (d, b) {
       d.__proto__ = b;
     } || function (d, b) {
-      for (var p in b) {
-        if (b.hasOwnProperty(p)) d[p] = b[p];
-      }
+      for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     };
-
-    return _extendStatics(d, b);
+    return extendStatics(d, b);
   };
-
   function __extends(d, b) {
-    _extendStatics(d, b);
-
+    extendStatics(d, b);
     function __() {
       this.constructor = d;
     }
-
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
   }
-
   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);else for (var i = decorators.length - 1; i >= 0; i--) {
-      if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    }
+      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);else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
   }
-
   function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) {
       return value instanceof P ? value : new P(function (resolve) {
         resolve(value);
       });
     }
-
     return new (P || (P = Promise))(function (resolve, reject) {
       function fulfilled(value) {
         try {
@@ -56,7 +42,6 @@ this.EVA.plugin.renderer.spriteAnimation = function (exports, eva_js, pluginRend
           reject(e);
         }
       }
-
       function rejected(value) {
         try {
           step(generator["throw"](value));
@@ -64,29 +49,26 @@ this.EVA.plugin.renderer.spriteAnimation = function (exports, eva_js, pluginRend
           reject(e);
         }
       }
-
       function step(result) {
         result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
-
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
   }
-
   function __generator(thisArg, body) {
     var _ = {
-      label: 0,
-      sent: function sent() {
-        if (t[0] & 1) throw t[1];
-        return t[1];
+        label: 0,
+        sent: function () {
+          if (t[0] & 1) throw t[1];
+          return t[1];
+        },
+        trys: [],
+        ops: []
       },
-      trys: [],
-      ops: []
-    },
-        f,
-        y,
-        t,
-        g;
+      f,
+      y,
+      t,
+      g;
     return g = {
       next: verb(0),
       "throw": verb(1),
@@ -94,88 +76,66 @@ this.EVA.plugin.renderer.spriteAnimation = function (exports, eva_js, pluginRend
     }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
       return this;
     }), g;
-
     function verb(n) {
       return function (v) {
         return step([n, v]);
       };
     }
-
     function step(op) {
       if (f) throw new TypeError("Generator is already executing.");
-
-      while (_) {
-        try {
-          if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-          if (y = 0, t) op = [op[0] & 2, t.value];
-
-          switch (op[0]) {
-            case 0:
-            case 1:
+      while (_) try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+        if (y = 0, t) op = [op[0] & 2, t.value];
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+          case 5:
+            _.label++;
+            y = op[1];
+            op = [0];
+            continue;
+          case 7:
+            op = _.ops.pop();
+            _.trys.pop();
+            continue;
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
               t = op;
               break;
-
-            case 4:
-              _.label++;
-              return {
-                value: op[1],
-                done: false
-              };
-
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-
-            case 7:
-              op = _.ops.pop();
-
-              _.trys.pop();
-
-              continue;
-
-            default:
-              if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                _ = 0;
-                continue;
-              }
-
-              if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-                _.label = op[1];
-                break;
-              }
-
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-
-                _.ops.push(op);
-
-                break;
-              }
-
-              if (t[2]) _.ops.pop();
-
-              _.trys.pop();
-
-              continue;
-          }
-
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
+            }
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+              _.ops.push(op);
+              break;
+            }
+            if (t[2]) _.ops.pop();
+            _.trys.pop();
+            continue;
         }
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [6, e];
+        y = 0;
+      } finally {
+        f = t = 0;
       }
-
       if (op[0] & 5) throw op[1];
       return {
         value: op[0] ? op[1] : void 0,
@@ -183,14 +143,13 @@ this.EVA.plugin.renderer.spriteAnimation = function (exports, eva_js, pluginRend
       };
     }
   }
-
   function __values(o) {
     var s = typeof Symbol === "function" && Symbol.iterator,
-        m = s && o[s],
-        i = 0;
+      m = s && o[s],
+      i = 0;
     if (m) return m.call(o);
     if (o && typeof o.length === "number") return {
-      next: function next() {
+      next: function () {
         if (o && i >= o.length) o = void 0;
         return {
           value: o && o[i++],
@@ -200,20 +159,16 @@ this.EVA.plugin.renderer.spriteAnimation = function (exports, eva_js, pluginRend
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
   }
-
   function getIDEPropsPropertyObj(target, propertyKey) {
     if (!target.constructor.IDEProps) {
       target.constructor.IDEProps = {};
     }
-
     if (!target.constructor.IDEProps[propertyKey]) {
       target.constructor.IDEProps[propertyKey] = {};
     }
-
     var propertyObj = target.constructor.IDEProps[propertyKey];
     return propertyObj;
   }
-
   function type(type) {
     return function (target, propertyKey) {
       var prop = getIDEPropsPropertyObj(target, propertyKey);
@@ -221,62 +176,61 @@ this.EVA.plugin.renderer.spriteAnimation = function (exports, eva_js, pluginRend
       prop.type = type;
     };
   }
-
   function step(step) {
     return function (target, propertyKey) {
       var prop = getIDEPropsPropertyObj(target, propertyKey);
       prop.step = step;
     };
   }
-
   var SpriteAnimation$2 = function (_super) {
     __extends(SpriteAnimation, _super);
-
     function SpriteAnimation() {
       var _this = _super !== null && _super.apply(this, arguments) || this;
-
       _this.resource = '';
       _this.autoPlay = true;
       _this.speed = 100;
+      _this.forwards = false;
       _this.waitPlay = false;
       _this.waitStop = false;
       _this.times = Infinity;
       _this.count = 0;
+      _this.complete = false;
       return _this;
     }
-
     SpriteAnimation.prototype.init = function (obj) {
       var _this = this;
-
       obj && _extends(this, obj);
       this.on('loop', function () {
         if (++_this.count >= _this.times) {
-          _this.animate.stop();
-
+          if (_this.forwards) {
+            _this.gotoAndStop(_this.totalFrames - 1);
+          } else {
+            _this.animate.stop();
+          }
+          _this.complete = true;
           _this.emit('complete');
         }
       });
     };
-
     SpriteAnimation.prototype.play = function (times) {
       if (times === void 0) {
         times = Infinity;
       }
-
       if (times === 0) {
         return;
       }
-
       this.times = times;
-
       if (!this.animate) {
         this.waitPlay = true;
       } else {
+        if (this.complete) {
+          this.gotoAndStop(0);
+        }
         this.animate.play();
         this.count = 0;
+        this.complete = false;
       }
     };
-
     SpriteAnimation.prototype.stop = function () {
       if (!this.animate) {
         this.waitStop = true;
@@ -284,19 +238,16 @@ this.EVA.plugin.renderer.spriteAnimation = function (exports, eva_js, pluginRend
         this.animate.stop();
       }
     };
-
     Object.defineProperty(SpriteAnimation.prototype, "animate", {
-      get: function get() {
+      get: function () {
         return this._animate;
       },
-      set: function set(val) {
+      set: function (val) {
         this._animate = val;
-
         if (this.waitPlay) {
           this.waitPlay = false;
           this.play(this.times);
         }
-
         if (this.waitStop) {
           this.waitStop = false;
           this.stop();
@@ -305,48 +256,53 @@ this.EVA.plugin.renderer.spriteAnimation = function (exports, eva_js, pluginRend
       enumerable: false,
       configurable: true
     });
-
     SpriteAnimation.prototype.gotoAndPlay = function (frameNumber) {
       this.animate.gotoAndPlay(frameNumber);
     };
-
     SpriteAnimation.prototype.gotoAndStop = function (frameNumber) {
       this.animate.gotoAndStop(frameNumber);
     };
-
+    Object.defineProperty(SpriteAnimation.prototype, "currentFrame", {
+      get: function () {
+        var _a, _b;
+        return (_b = (_a = this.animate) === null || _a === void 0 ? void 0 : _a.animatedSprite) === null || _b === void 0 ? void 0 : _b.currentFrame;
+      },
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(SpriteAnimation.prototype, "totalFrames", {
+      get: function () {
+        var _a, _b;
+        return (_b = (_a = this.animate) === null || _a === void 0 ? void 0 : _a.animatedSprite) === null || _b === void 0 ? void 0 : _b.totalFrames;
+      },
+      enumerable: false,
+      configurable: true
+    });
     SpriteAnimation.componentName = 'SpriteAnimation';
-
     __decorate([type('string')], SpriteAnimation.prototype, "resource", void 0);
-
     __decorate([type('boolean')], SpriteAnimation.prototype, "autoPlay", void 0);
-
     __decorate([type('number'), step(10)], SpriteAnimation.prototype, "speed", void 0);
-
+    __decorate([type('boolean')], SpriteAnimation.prototype, "forwards", void 0);
     return SpriteAnimation;
   }(eva_js.Component);
-
   var SpriteAnimation$3 = SpriteAnimation$2;
   var resourceKeySplit = '_s|r|c_';
   eva_js.resource.registerInstance(eva_js.RESOURCE_TYPE.SPRITE_ANIMATION, function (_a) {
     var name = _a.name,
-        data = _a.data;
+      data = _a.data;
     return new Promise(function (r) {
       var e_1, _a;
-
-      var textureObj = data.json;
-      var texture = pixi_js.BaseTexture.from(data.image);
+      var textureObj = data.json.data;
+      var texture = data.image instanceof pixi_js.Texture ? data.image : pixi_js.Texture.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()) {
@@ -366,30 +322,24 @@ this.EVA.plugin.renderer.spriteAnimation = function (exports, eva_js, pluginRend
             }
           }
         }
-
         animations[key] = spriteList;
       }
-
       textureObj.frames = newFrames;
       var spriteSheet = new pixi_js.Spritesheet(texture, textureObj);
-      spriteSheet.parse(function () {
+      spriteSheet.parse().then(function () {
         var textures = spriteSheet.textures;
         var spriteFrames = [];
-
         for (var key in textures) {
           spriteFrames.push(textures[key]);
         }
-
         r(spriteFrames);
       });
     });
   });
   eva_js.resource.registerDestroy(eva_js.RESOURCE_TYPE.SPRITE_ANIMATION, function (_a) {
     var e_2, _b;
-
     var instance = _a.instance;
     if (!instance) return;
-
     try {
       for (var instance_1 = __values(instance), instance_1_1 = instance_1.next(); !instance_1_1.done; instance_1_1 = instance_1.next()) {
         var texture = instance_1_1.value;
@@ -407,135 +357,115 @@ this.EVA.plugin.renderer.spriteAnimation = function (exports, eva_js, pluginRend
       }
     }
   });
-
   var SpriteAnimation = function (_super) {
     __extends(SpriteAnimation, _super);
-
     function SpriteAnimation() {
       var _this = _super !== null && _super.apply(this, arguments) || this;
-
       _this.name = 'SpriteAnimation';
       _this.animates = {};
       _this.autoPlay = {};
       return _this;
     }
-
     SpriteAnimation.prototype.init = function () {
       this.renderSystem = this.game.getSystem(pluginRenderer.RendererSystem);
       this.renderSystem.rendererManager.register(this);
     };
-
     SpriteAnimation.prototype.rendererUpdate = function (gameObject) {
       var _a = gameObject.transform.size,
-          width = _a.width,
-          height = _a.height;
-
+        width = _a.width,
+        height = _a.height;
       if (this.animates[gameObject.id]) {
         this.animates[gameObject.id].animatedSprite.width = width;
         this.animates[gameObject.id].animatedSprite.height = height;
       }
     };
-
     SpriteAnimation.prototype.componentChanged = function (changed) {
       return __awaiter(this, void 0, void 0, function () {
-        var component, frames_1, frames_2;
+        var gameObjectId, component, asyncId, frames_1, asyncId, frames_2;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
+              gameObjectId = changed.gameObject.id;
               if (!(changed.componentName === 'SpriteAnimation')) return [3, 7];
               component = changed.component;
               this.autoPlay[changed.gameObject.id] = component.autoPlay;
               if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 2];
+              asyncId = this.increaseAsyncId(gameObjectId);
               return [4, eva_js.resource.getResource(component.resource)];
-
             case 1:
               frames_1 = _a.sent().instance;
-
+              if (!this.validateAsyncId(gameObjectId, asyncId)) return [2];
               if (!frames_1) {
                 console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
               }
-
               this.add({
                 frames: frames_1,
                 id: changed.gameObject.id,
                 component: component
               });
               return [3, 7];
-
             case 2:
               if (!(changed.type === eva_js.OBSERVER_TYPE.CHANGE)) return [3, 6];
               if (!(changed.prop && changed.prop.prop[0] === 'speed')) return [3, 3];
               this.animates[changed.gameObject.id].speed = 1000 / 60 / component.speed;
               return [3, 5];
-
             case 3:
+              asyncId = this.increaseAsyncId(gameObjectId);
               return [4, eva_js.resource.getResource(component.resource)];
-
             case 4:
               frames_2 = _a.sent().instance;
-
+              if (!this.validateAsyncId(gameObjectId, asyncId)) return [2];
               if (!frames_2) {
                 console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
               }
-
               this.change({
                 frames: frames_2,
                 id: changed.gameObject.id,
                 component: component
               });
               _a.label = 5;
-
             case 5:
               return [3, 7];
-
             case 6:
               if (changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
+                this.increaseAsyncId(gameObjectId);
                 this.remove(changed.gameObject.id);
               }
-
               _a.label = 7;
-
             case 7:
               return [2];
           }
         });
       });
     };
-
     SpriteAnimation.prototype.add = function (_a) {
       var frames = _a.frames,
-          id = _a.id,
-          component = _a.component;
+        id = _a.id,
+        component = _a.component;
       var animate = new rendererAdapter.SpriteAnimation({
         frames: frames
       });
       this.animates[id] = animate;
       this.containerManager.getContainer(id).addChildAt(animate.animatedSprite, 0);
-
       animate.animatedSprite.onComplete = function () {
         component.emit('complete');
       };
-
       animate.animatedSprite.onFrameChange = function () {
         component.emit('frameChange');
       };
-
       animate.animatedSprite.onLoop = function () {
         component.emit('loop');
       };
-
       component.animate = this.animates[id];
       this.animates[id].speed = 1000 / 60 / component.speed;
-
       if (this.autoPlay[id]) {
         animate.animatedSprite.play();
       }
     };
-
     SpriteAnimation.prototype.change = function (_a) {
       var frames = _a.frames,
-          id = _a.id,
-          component = _a.component;
+        id = _a.id,
+        component = _a.component;
       this.remove(id, true);
       this.add({
         frames: frames,
@@ -543,28 +473,23 @@ this.EVA.plugin.renderer.spriteAnimation = function (exports, eva_js, pluginRend
         component: component
       });
     };
-
     SpriteAnimation.prototype.remove = function (id, isChange) {
       var animate = this.animates[id];
+      if (!animate) return;
       this.autoPlay[id] = animate.animatedSprite.playing;
       this.containerManager.getContainer(id).removeChild(animate.animatedSprite);
-      animate.animatedSprite.destroy({
-        children: true
-      });
+      animate.animatedSprite.destroy();
       delete this.animates[id];
-
       if (!isChange) {
         delete this.autoPlay[id];
       }
     };
-
     SpriteAnimation.systemName = 'SpriteAnimation';
     SpriteAnimation = __decorate([eva_js.decorators.componentObserver({
       SpriteAnimation: ['speed', 'resource']
     })], SpriteAnimation);
     return SpriteAnimation;
   }(pluginRenderer.Renderer);
-
   var SpriteAnimation$1 = SpriteAnimation;
   exports.SpriteAnimation = SpriteAnimation$3;
   exports.SpriteAnimationSystem = SpriteAnimation$1;
@@ -573,3 +498,4 @@ this.EVA.plugin.renderer.spriteAnimation = function (exports, eva_js, pluginRend
   });
   return exports;
 }({}, EVA, EVA.plugin.renderer, EVA.rendererAdapter, PIXI);
+window.EVA.plugin.renderer.spriteAnimation = window.EVA.plugin.renderer.spriteAnimation || _EVA_IIFE_spriteAnimation;