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

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

@@ -1,7 +1,7 @@
 import { Component, resource, RESOURCE_TYPE, decorators, OBSERVER_TYPE } from '@eva/eva.js';
 import { type } from '@eva/inspector-decorator';
 import { RendererSystem, Renderer } from '@eva/plugin-renderer';
-import { Texture, Sprite as Sprite$5, BaseTexture, Spritesheet } from 'pixi.js';
+import { Sprite as Sprite$5, Texture, Spritesheet } from 'pixi.js';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -157,8 +157,8 @@ 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 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 = {};
@@ -188,9 +188,8 @@ resource.registerInstance(RESOURCE_TYPE.SPRITE, function (_a) {
         }
         textureObj.frames = newFrames;
         var spriteSheet = new Spritesheet(texture, textureObj);
-        spriteSheet.parse(function () {
-            var textures = spriteSheet.textures;
-            r(textures);
+        spriteSheet.parse().then(function () {
+            r(spriteSheet.textures);
         });
     });
 });
@@ -223,50 +222,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) {
-                                        throw new Error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
-                                    }
-                                    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) {
-                            throw new Error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
+                            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.3.0-alpha.1",
+  "version": "2.0.0-beta.0",
   "description": "@eva/plugin-renderer-sprite",
   "main": "index.js",
   "module": "dist/plugin-renderer-sprite.esm.js",
@@ -19,8 +19,8 @@
   "homepage": "https://eva.js.org",
   "dependencies": {
     "@eva/inspector-decorator": "^0.0.5",
-    "@eva/plugin-renderer": "1.3.0-alpha.1",
-    "@eva/eva.js": "1.3.0-alpha.1",
-    "pixi.js": "^4.8.7"
+    "@eva/plugin-renderer": "2.0.0-beta.0",
+    "@eva/eva.js": "2.0.0-beta.0",
+    "pixi.js": "^8.6.3"
   }
 }

package/dist/plugin-renderer-sprite.d.ts

@@ -1,36 +0,0 @@
-import { Component } from '@eva/eva.js';
-import { ComponentChanged } from '@eva/eva.js';
-import { ContainerManager } from '@eva/plugin-renderer';
-import { GameObject } from '@eva/eva.js';
-import { Renderer } from '@eva/plugin-renderer';
-import { RendererManager } from '@eva/plugin-renderer';
-import { RendererSystem } from '@eva/plugin-renderer';
-import { Sprite as Sprite_2 } from '@eva/renderer-adapter';
-
-export declare class Sprite extends Component<SpriteParams> {
-    static componentName: string;
-    resource: string;
-    spriteName: string;
-    init(obj?: SpriteParams): void;
-}
-
-export declare interface SpriteParams {
-    resource: string;
-    spriteName: string;
-}
-
-export declare class SpriteSystem extends Renderer {
-    static systemName: string;
-    name: string;
-    sprites: {
-        [propName: number]: Sprite_2;
-    };
-    renderSystem: RendererSystem;
-    rendererManager: RendererManager;
-    containerManager: ContainerManager;
-    init(): void;
-    rendererUpdate(gameObject: GameObject): void;
-    componentChanged(changed: ComponentChanged): Promise<void>;
-}
-
-export { }