@eva/plugin-renderer-sprite-animation 2.0.0-beta.1 → 2.0.0-beta.3

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

@@ -1,7 +1,7 @@
 import { Component, resource, RESOURCE_TYPE, decorators, OBSERVER_TYPE } from '@eva/eva.js';
 import { type, step } from '@eva/inspector-decorator';
-import { RendererSystem, Renderer } from '@eva/plugin-renderer';
-import { SpriteAnimation as SpriteAnimation$4 } from '@eva/renderer-adapter';
+import { Renderer, RendererSystem } from '@eva/plugin-renderer';
+import { SpriteAnimation as SpriteAnimation$3 } from '@eva/renderer-adapter';
 import { Texture, Spritesheet } from 'pixi.js';
 
 /*! *****************************************************************************
@@ -18,20 +18,6 @@ MERCHANTABLITY OR NON-INFRINGEMENT.
 See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
-/* global Reflect, Promise */
-
-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]; };
-    return extendStatics(d, b);
-};
-
-function __extends(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;
@@ -47,80 +33,37 @@ function __awaiter(thisArg, _arguments, P, generator) {
         function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
-}
-
-function __generator(thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, 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: 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 (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-}
-
-function __values(o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
-    if (m) return m.call(o);
-    return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
 }
 
-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;
+class SpriteAnimation$2 extends Component {
+    constructor() {
+        super(...arguments);
+        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;
     }
-    SpriteAnimation.prototype.init = function (obj) {
-        var _this = this;
+    init(obj) {
         obj && Object.assign(this, obj);
-        this.on('loop', function () {
-            if (++_this.count >= _this.times) {
-                if (_this.forwards) {
-                    _this.gotoAndStop(_this.totalFrames - 1);
+        this.on('loop', () => {
+            if (++this.count >= this.times) {
+                if (this.forwards) {
+                    this.gotoAndStop(this.totalFrames - 1);
                 }
                 else {
-                    _this.animate.stop();
+                    this.animate.stop();
                 }
-                _this.complete = true;
-                _this.emit('complete');
+                this.complete = true;
+                this.emit('complete');
             }
         });
-    };
-    SpriteAnimation.prototype.play = function (times) {
-        if (times === void 0) { times = Infinity; }
+    }
+    play(times = Infinity) {
         if (times === 0) {
             return;
         }
@@ -136,229 +79,175 @@ var SpriteAnimation$2 = (function (_super) {
             this.count = 0;
             this.complete = false;
         }
-    };
-    SpriteAnimation.prototype.stop = function () {
+    }
+    stop() {
         if (!this.animate) {
             this.waitStop = true;
         }
         else {
             this.animate.stop();
         }
-    };
-    Object.defineProperty(SpriteAnimation.prototype, "animate", {
-        get: function () {
-            return this._animate;
-        },
-        set: function (val) {
-            this._animate = val;
-            if (this.waitPlay) {
-                this.waitPlay = false;
-                this.play(this.times);
-            }
-            if (this.waitStop) {
-                this.waitStop = false;
-                this.stop();
-            }
-        },
-        enumerable: false,
-        configurable: true
-    });
-    SpriteAnimation.prototype.gotoAndPlay = function (frameNumber) {
+    }
+    set animate(val) {
+        this._animate = val;
+        if (this.waitPlay) {
+            this.waitPlay = false;
+            this.play(this.times);
+        }
+        if (this.waitStop) {
+            this.waitStop = false;
+            this.stop();
+        }
+    }
+    get animate() {
+        return this._animate;
+    }
+    gotoAndPlay(frameNumber) {
         this.animate.gotoAndPlay(frameNumber);
-    };
-    SpriteAnimation.prototype.gotoAndStop = function (frameNumber) {
+    }
+    gotoAndStop(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;
-}(Component));
-var SpriteAnimation$3 = SpriteAnimation$2;
+    }
+    get currentFrame() {
+        var _a, _b;
+        return (_b = (_a = this.animate) === null || _a === void 0 ? void 0 : _a.animatedSprite) === null || _b === void 0 ? void 0 : _b.currentFrame;
+    }
+    get totalFrames() {
+        var _a, _b;
+        return (_b = (_a = this.animate) === null || _a === void 0 ? void 0 : _a.animatedSprite) === null || _b === void 0 ? void 0 : _b.totalFrames;
+    }
+}
+SpriteAnimation$2.componentName = 'SpriteAnimation';
+__decorate([
+    type('string')
+], SpriteAnimation$2.prototype, "resource", void 0);
+__decorate([
+    type('boolean')
+], SpriteAnimation$2.prototype, "autoPlay", void 0);
+__decorate([
+    type('number'),
+    step(10)
+], SpriteAnimation$2.prototype, "speed", void 0);
+__decorate([
+    type('boolean')
+], SpriteAnimation$2.prototype, "forwards", void 0);
 
-var resourceKeySplit = '_s|r|c_';
-resource.registerInstance(RESOURCE_TYPE.SPRITE_ANIMATION, function (_a) {
-    var name = _a.name, data = _a.data;
-    return new Promise(function (r) {
-        var e_1, _a;
-        var textureObj = data.json.data;
-        var texture = data.image instanceof Texture ? data.image : Texture.from(data.image);
-        var frames = textureObj.frames || {};
-        var animations = textureObj.animations || {};
-        var newFrames = {};
-        for (var key in frames) {
-            var newKey = name + resourceKeySplit + key;
+const resourceKeySplit = '_s|r|c_';
+resource.registerInstance(RESOURCE_TYPE.SPRITE_ANIMATION, ({ name, data }) => {
+    return new Promise(r => {
+        const textureObj = data.json.data;
+        const texture = data.image instanceof Texture ? data.image : Texture.from(data.image);
+        const frames = textureObj.frames || {};
+        const animations = textureObj.animations || {};
+        const newFrames = {};
+        for (const key in frames) {
+            const newKey = name + resourceKeySplit + key;
             newFrames[newKey] = frames[key];
         }
-        for (var key in animations) {
-            var spriteList = [];
+        for (const key in animations) {
+            const 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; }
+                for (const spriteName of animations[key]) {
+                    const newSpriteName = name + resourceKeySplit + spriteName;
+                    spriteList.push(newSpriteName);
                 }
             }
             animations[key] = spriteList;
         }
         textureObj.frames = newFrames;
-        var spriteSheet = new Spritesheet(texture, textureObj);
-        spriteSheet.parse().then(function () {
-            var textures = spriteSheet.textures;
-            var spriteFrames = [];
-            for (var key in textures) {
+        const spriteSheet = new Spritesheet(texture, textureObj);
+        spriteSheet.parse().then(() => {
+            const { textures } = spriteSheet;
+            const spriteFrames = [];
+            for (const key in textures) {
                 spriteFrames.push(textures[key]);
             }
             r(spriteFrames);
         });
     });
 });
-resource.registerDestroy(RESOURCE_TYPE.SPRITE_ANIMATION, function (_a) {
-    var e_2, _b;
-    var instance = _a.instance;
+resource.registerDestroy(RESOURCE_TYPE.SPRITE_ANIMATION, ({ 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;
-            texture.destroy(true);
-        }
-    }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-    finally {
-        try {
-            if (instance_1_1 && !instance_1_1.done && (_b = instance_1.return)) _b.call(instance_1);
-        }
-        finally { if (e_2) throw e_2.error; }
+    for (const texture of instance) {
+        texture.destroy(true);
     }
 });
-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;
+let SpriteAnimation = class SpriteAnimation extends Renderer {
+    constructor() {
+        super(...arguments);
+        this.name = 'SpriteAnimation';
+        this.animates = {};
+        this.autoPlay = {};
     }
-    SpriteAnimation.prototype.init = function () {
+    init() {
         this.renderSystem = this.game.getSystem(RendererSystem);
         this.renderSystem.rendererManager.register(this);
-    };
-    SpriteAnimation.prototype.rendererUpdate = function (gameObject) {
-        var _a = gameObject.transform.size, width = _a.width, height = _a.height;
+    }
+    rendererUpdate(gameObject) {
+        const { width, height } = gameObject.transform.size;
         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 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 === OBSERVER_TYPE.ADD)) return [3, 2];
-                        asyncId = this.increaseAsyncId(gameObjectId);
-                        return [4, 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 === OBSERVER_TYPE.CHANGE)) return [3, 6];
-                        if (!(changed.prop && changed.prop.prop[0] === 'speed')) return [3, 3];
+    }
+    componentChanged(changed) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const gameObjectId = changed.gameObject.id;
+            if (changed.componentName === 'SpriteAnimation') {
+                const component = changed.component;
+                this.autoPlay[changed.gameObject.id] = component.autoPlay;
+                if (changed.type === OBSERVER_TYPE.ADD) {
+                    const asyncId = this.increaseAsyncId(gameObjectId);
+                    const { instance: frames } = yield resource.getResource(component.resource);
+                    if (!this.validateAsyncId(gameObjectId, asyncId))
+                        return;
+                    if (!frames) {
+                        console.error(`GameObject:${changed.gameObject.name}'s Img resource load error`);
+                    }
+                    this.add({
+                        frames: frames,
+                        id: changed.gameObject.id,
+                        component,
+                    });
+                }
+                else if (changed.type === OBSERVER_TYPE.CHANGE) {
+                    if (changed.prop && changed.prop.prop[0] === 'speed') {
                         this.animates[changed.gameObject.id].speed = 1000 / 60 / component.speed;
-                        return [3, 5];
-                    case 3:
-                        asyncId = this.increaseAsyncId(gameObjectId);
-                        return [4, resource.getResource(component.resource)];
-                    case 4:
-                        frames_2 = (_a.sent()).instance;
+                    }
+                    else {
+                        const asyncId = this.increaseAsyncId(gameObjectId);
+                        const { instance: frames } = yield resource.getResource(component.resource);
                         if (!this.validateAsyncId(gameObjectId, asyncId))
-                            return [2];
-                        if (!frames_2) {
-                            console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
+                            return;
+                        if (!frames) {
+                            console.error(`GameObject:${changed.gameObject.name}'s Img resource load error`);
                         }
                         this.change({
-                            frames: frames_2,
+                            frames: frames,
                             id: changed.gameObject.id,
-                            component: component,
+                            component,
                         });
-                        _a.label = 5;
-                    case 5: return [3, 7];
-                    case 6:
-                        if (changed.type === OBSERVER_TYPE.REMOVE) {
-                            this.increaseAsyncId(gameObjectId);
-                            this.remove(changed.gameObject.id);
-                        }
-                        _a.label = 7;
-                    case 7: return [2];
+                    }
+                }
+                else if (changed.type === OBSERVER_TYPE.REMOVE) {
+                    this.increaseAsyncId(gameObjectId);
+                    this.remove(changed.gameObject.id);
                 }
-            });
+            }
         });
-    };
-    SpriteAnimation.prototype.add = function (_a) {
-        var frames = _a.frames, id = _a.id, component = _a.component;
-        var animate = new SpriteAnimation$4({ frames: frames });
+    }
+    add({ frames, id, component }) {
+        const animate = new SpriteAnimation$3({ frames });
         this.animates[id] = animate;
         this.containerManager.getContainer(id).addChildAt(animate.animatedSprite, 0);
-        animate.animatedSprite.onComplete = function () {
+        animate.animatedSprite.onComplete = () => {
             component.emit('complete');
         };
-        animate.animatedSprite.onFrameChange = function () {
+        animate.animatedSprite.onFrameChange = () => {
             component.emit('frameChange');
         };
-        animate.animatedSprite.onLoop = function () {
+        animate.animatedSprite.onLoop = () => {
             component.emit('loop');
         };
         component.animate = this.animates[id];
@@ -366,14 +255,13 @@ var SpriteAnimation = (function (_super) {
         if (this.autoPlay[id]) {
             animate.animatedSprite.play();
         }
-    };
-    SpriteAnimation.prototype.change = function (_a) {
-        var frames = _a.frames, id = _a.id, component = _a.component;
+    }
+    change({ frames, id, component }) {
         this.remove(id, true);
-        this.add({ frames: frames, id: id, component: component });
-    };
-    SpriteAnimation.prototype.remove = function (id, isChange) {
-        var animate = this.animates[id];
+        this.add({ frames, id, component });
+    }
+    remove(id, isChange) {
+        const animate = this.animates[id];
         if (!animate)
             return;
         this.autoPlay[id] = animate.animatedSprite.playing;
@@ -383,15 +271,14 @@ var SpriteAnimation = (function (_super) {
         if (!isChange) {
             delete this.autoPlay[id];
         }
-    };
-    SpriteAnimation.systemName = 'SpriteAnimation';
-    SpriteAnimation = __decorate([
-        decorators.componentObserver({
-            SpriteAnimation: ['speed', 'resource'],
-        })
-    ], SpriteAnimation);
-    return SpriteAnimation;
-}(Renderer));
+    }
+};
+SpriteAnimation.systemName = 'SpriteAnimation';
+SpriteAnimation = __decorate([
+    decorators.componentObserver({
+        SpriteAnimation: ['speed', 'resource'],
+    })
+], SpriteAnimation);
 var SpriteAnimation$1 = SpriteAnimation;
 
-export { SpriteAnimation$3 as SpriteAnimation, SpriteAnimation$1 as SpriteAnimationSystem };
+export { SpriteAnimation$2 as SpriteAnimation, SpriteAnimation$1 as SpriteAnimationSystem };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/plugin-renderer-sprite-animation",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.3",
   "description": "@eva/plugin-renderer-sprite-animation",
   "main": "index.js",
   "module": "dist/plugin-renderer-sprite-animation.esm.js",
@@ -19,9 +19,9 @@
   "homepage": "https://eva.js.org",
   "dependencies": {
     "@eva/inspector-decorator": "^0.0.5",
-    "@eva/plugin-renderer": "2.0.0-beta.1",
-    "@eva/renderer-adapter": "2.0.0-beta.1",
-    "@eva/eva.js": "2.0.0-beta.1",
+    "@eva/plugin-renderer": "2.0.0-beta.3",
+    "@eva/renderer-adapter": "2.0.0-beta.3",
+    "@eva/eva.js": "2.0.0-beta.3",
     "pixi.js": "^8.6.3"
   }
 }