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

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

@@ -152,11 +152,11 @@ var propertyForGraphics = {
     Polygon: ['paths'],
 };
 var functionForGraphics = {
-    Circle: 'drawCircle',
-    Ellipse: 'drawEllipse',
-    Rect: 'drawRect',
-    RoundedRect: 'drawRoundedRect',
-    Polygon: 'drawPolygon',
+    Circle: 'circle',
+    Ellipse: 'ellipse',
+    Rect: 'rect',
+    RoundedRect: 'roundRect',
+    Polygon: 'poly',
 };
 var MASK_TYPE;
 (function (MASK_TYPE) {
@@ -251,9 +251,10 @@ var Mask = (function (_super) {
         var component = changed.component;
         if (changed.prop.prop[0] === 'type') {
             this.changedCache[changed.gameObject.id] = true;
-            if ([MASK_TYPE.Sprite, MASK_TYPE.Img].indexOf(component.type) > -1) {
+            if ([MASK_TYPE.Sprite, MASK_TYPE.Img].indexOf(component.type) > -1 || component._lastType !== component.type) {
                 this.remove(changed);
                 this.add(changed);
+                component._lastType = component.type;
             }
             else {
                 this.redrawGraphics(changed);
@@ -303,9 +304,8 @@ var Mask = (function (_super) {
             }
             finally { if (e_1) throw e_1.error; }
         }
-        graphics.beginFill(0x000000, 1);
         graphics[functionForGraphics[component.type]].apply(graphics, __spread(params));
-        graphics.endFill();
+        graphics.fill(0x000000);
     };
     Mask.prototype.createSprite = function (component) {
         var sprite = new Sprite(null);
@@ -326,14 +326,17 @@ var Mask = (function (_super) {
     };
     Mask.prototype.setSprite = function (component, sprite) {
         return __awaiter(this, void 0, void 0, function () {
-            var res, img, texture;
+            var res, asyncId, img, texture;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
+                        asyncId = this.increaseAsyncId(component.gameObject.id);
                         return [4, resource.getResource(component.resource)];
                     case 1:
                         res = _a.sent();
+                        if (!this.validateAsyncId(component.gameObject.id, asyncId))
+                            return [2];
                         return [3, 3];
                     case 2:
                         _a.sent();

package/package.json

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

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

@@ -1,72 +0,0 @@
-/// <reference types="pixi.js" />
-
-import { Component } from '@eva/eva.js';
-import { ComponentChanged } from '@eva/eva.js';
-import { ContainerManager } from '@eva/plugin-renderer';
-import { Graphics } from '@eva/renderer-adapter';
-import { Renderer } from '@eva/plugin-renderer';
-import { RendererManager } from '@eva/plugin-renderer';
-import { RendererSystem } from '@eva/plugin-renderer';
-import { Sprite } from '@eva/renderer-adapter';
-
-export declare class Mask extends Component<MaskParams> {
-    static componentName: string;
-    type: MaskParams['type'];
-    style?: MaskParams['style'];
-    resource?: string;
-    spriteName?: string;
-    init(obj?: MaskParams): void;
-}
-
-export declare enum MASK_TYPE {
-    Circle = "Circle",
-    Ellipse = "Ellipse",
-    Rect = "Rect",
-    RoundedRect = "RoundedRect",
-    Polygon = "Polygon",
-    Img = "Img",
-    Sprite = "Sprite"
-}
-
-export declare interface MaskParams {
-    type: MASK_TYPE;
-    style?: {
-        x?: number;
-        y?: number;
-        radius?: number;
-        width?: number;
-        height?: number;
-        paths?: number[];
-    };
-    resource?: string;
-    spriteName?: string;
-}
-
-export declare class MaskSystem extends Renderer {
-    static systemName: string;
-    name: string;
-    changedCache: {
-        [propName: number]: boolean;
-    };
-    maskSpriteCache: {
-        [propName: number]: Sprite;
-    };
-    renderSystem: RendererSystem;
-    rendererManager: RendererManager;
-    containerManager: ContainerManager;
-    init(): void;
-    rendererUpdate(): void;
-    componentChanged(changed: ComponentChanged): void;
-    add(changed: ComponentChanged): void;
-    remove(changed: ComponentChanged): void;
-    change(changed: ComponentChanged): void;
-    createGraphics(component: Mask): Graphics;
-    redrawGraphics(changed: any): void;
-    draw(graphics: any, component: any): void;
-    createSprite(component: Mask): PIXI.Sprite;
-    changeSpriteStyle(component: Mask): void;
-    changeSprite(component: Mask): void;
-    setSprite(component: Mask, sprite: any): Promise<void>;
-}
-
-export { }