@safe-engine/pixi 1.0.1 → 7.0.1

package/dist/app.d.ts

@@ -1,9 +1,10 @@
+import { Constructor, System } from 'entityx-ts';
 import { Application } from 'pixi.js';
-export declare const app: Application<import("pixi.js").Renderer>;
+export declare const app: Application<import("pixi.js").ICanvas>;
 export declare function setupResolution(designedResolution?: {
     width: number;
     height: number;
 }): void;
 export declare function addGameCanvasTo(id?: string): Promise<void>;
-export declare function initWorld(): void;
+export declare function startGameWithSystems(systemsList: Constructor<System>[]): void;
 //# sourceMappingURL=app.d.ts.map

package/dist/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAOrC,eAAO,MAAM,GAAG,yCAAoB,CAAA;AAEpC,wBAAgB,eAAe,CAAC,kBAAkB;;;CAA+B,QAKhF;AAED,wBAAsB,eAAe,CAAC,EAAE,SAAS,iBA2BhD;AAED,wBAAgB,SAAS,SAKxB"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAKrC,eAAO,MAAM,GAAG,wCAKd,CAAA;AAEF,wBAAgB,eAAe,CAAC,kBAAkB;;;CAA+B,QAGhF;AAED,wBAAsB,eAAe,CAAC,EAAE,SAAS,iBAUhD;AAYD,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,QAWtE"}

package/dist/app.js

@@ -8,95 +8,55 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["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 (g && (g = 0, op[0] && (_ = 0)), _) 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 };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.app = void 0;
 exports.setupResolution = setupResolution;
 exports.addGameCanvasTo = addGameCanvasTo;
-exports.initWorld = initWorld;
-var pixi_js_1 = require("pixi.js");
-var pixi_action_ease_1 = require("pixi-action-ease");
-var gworld_1 = require("./gworld");
-var GUISystem_1 = require("./systems/GUISystem");
-var RenderSystem_1 = require("./systems/RenderSystem");
-exports.app = new pixi_js_1.Application();
-function setupResolution(designedResolution) {
-    if (designedResolution === void 0) { designedResolution = { width: 720, height: 1280 }; }
-    var width = designedResolution.width, height = designedResolution.height;
+exports.startGameWithSystems = startGameWithSystems;
+const core_1 = require("@safe-engine/core");
+const pixi_js_1 = require("pixi.js");
+const pixi_action_ease_1 = require("pixi-action-ease");
+const NodeComp_1 = require("./components/NodeComp");
+exports.app = new pixi_js_1.Application({
+    width: 1080,
+    height: 1920,
+    antialias: true,
+    resolution: window.devicePixelRatio,
+});
+function setupResolution(designedResolution = { width: 720, height: 1280 }) {
+    const { width, height } = designedResolution;
     exports.app.renderer.resize(width, height);
-    // app.stage.position.y = app.renderer.height / app.renderer.resolution
-    // app.stage.scale.y = -1
 }
 function addGameCanvasTo() {
-    return __awaiter(this, arguments, void 0, function (id) {
-        var gameDiv;
-        if (id === void 0) { id = 'game'; }
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, exports.app.init({
-                        antialias: true,
-                        resolution: window.devicePixelRatio,
-                        eventFeatures: {
-                            move: true,
-                            /** disables the global move events which can be very expensive in large scenes */
-                            globalMove: false,
-                            click: true,
-                            wheel: false,
-                        },
-                    })
-                    // app.ticker.speed = 0.5
-                    // Listen for frame updates
-                ];
-                case 1:
-                    _a.sent();
-                    // app.ticker.speed = 0.5
-                    // Listen for frame updates
-                    exports.app.ticker.add(function () {
-                        var dt = exports.app.ticker.deltaMS * 0.001;
-                        pixi_action_ease_1.actionManager.update(dt);
-                        gworld_1.GameWorld.Instance.update(dt);
-                    });
-                    Object.assign(exports.app.canvas.style, {
-                        width: "".concat(window.innerWidth, "px"),
-                        // height: `${window.innerHeight}px`,
-                        overflow: 'hidden',
-                    });
-                    gameDiv = document.getElementById(id);
-                    gameDiv.appendChild(exports.app.canvas);
-                    return [2 /*return*/];
-            }
+    return __awaiter(this, arguments, void 0, function* (id = 'game') {
+        Object.assign(exports.app.view.style, {
+            width: `${window.innerWidth}px`,
+            // height: `${window.innerHeight}px`,
+            overflow: 'hidden',
         });
+        const gameDiv = document.getElementById(id);
+        gameDiv.appendChild(exports.app.view);
+        core_1.GameWorld.Instance.setup(NodeComp_1.NodeComp, exports.app.stage);
+    });
+}
+function startGameLoop(world) {
+    // Listen for frame updates
+    exports.app.ticker.add(() => {
+        const dt = exports.app.ticker.deltaMS * 0.001;
+        pixi_action_ease_1.actionManager.update(dt);
+        world.update(dt);
     });
+    // app.ticker.speed = 0.5
 }
-function initWorld() {
-    gworld_1.GameWorld.Instance.systems.add(RenderSystem_1.RenderSystem);
-    gworld_1.GameWorld.Instance.systems.add(GUISystem_1.GUISystem);
-    gworld_1.GameWorld.Instance.systems.configureOnce(RenderSystem_1.RenderSystem);
-    gworld_1.GameWorld.Instance.systems.configureOnce(GUISystem_1.GUISystem);
+function startGameWithSystems(systemsList) {
+    const world = core_1.GameWorld.Instance;
+    systemsList.forEach(system => {
+        world.systems.add(system);
+        const sys = world.systemsMap[system.name];
+        if (sys.update) {
+            world.listUpdate.push(system);
+        }
+    });
+    world.systems.configure();
+    startGameLoop(world);
 }

package/dist/components/GUIComponent.d.ts

@@ -1,7 +1,8 @@
-import { Point } from 'pixi.js';
+import { ComponentX, NoRenderComponentX } from '@safe-engine/core';
+import { Container, Point, Text } from 'pixi.js';
 import { Color4B } from '../core/Color';
-import { ComponentX, NoRenderComponentX } from '../core/decorator';
-import { LoadingBarMode } from '../core/LoadingBar';
+import { LoadingBar, LoadingBarMode, ProgressTimer } from '../core/LoadingBar';
+import { NodeComp } from './NodeComp';
 export declare const FillType: {
     HORIZONTAL: number;
     VERTICAL: number;
@@ -9,7 +10,7 @@ export declare const FillType: {
 };
 type Keys = keyof typeof FillType;
 type Values = (typeof FillType)[Keys];
-export declare class ButtonComp extends NoRenderComponentX {
+export declare class ButtonComp extends NoRenderComponentX<NodeComp> {
     normalImage: string;
     selectedImage: string;
     disableImage: string;
@@ -18,52 +19,52 @@ export declare class ButtonComp extends NoRenderComponentX {
     setOnPress(cb: (target: ButtonComp) => void): void;
     set enabled(val: any);
 }
-export declare class ProgressBarComp extends NoRenderComponentX {
+export declare class ProgressBarComp extends NoRenderComponentX<NodeComp<LoadingBar>> {
     mode: LoadingBarMode;
     private _progress;
     isReverse: boolean;
     get progress(): number;
     set progress(val: number);
 }
-export declare class LabelComp extends ComponentX {
+export declare class LabelComp extends ComponentX<NodeComp<Text>> {
     font: string;
     string: string;
     size: number;
     getString(): string;
     setString(val: string): void;
-    getSize(): number;
+    getSize(): string | number;
     setSize(val: any): void;
     getFont(): string;
     setFont(val: string): void;
 }
-export declare class ScrollView extends ComponentX {
+export declare class ScrollView extends ComponentX<NodeComp<Container>> {
     width: number;
     height: number;
 }
-export declare class BlockInputEventsComp extends NoRenderComponentX {
+export declare class BlockInputEventsComp extends NoRenderComponentX<NodeComp<Container>> {
 }
-export declare class ProgressTimerComp extends ComponentX {
+export declare class ProgressTimerComp extends ComponentX<NodeComp<ProgressTimer>> {
     spriteFrame: string;
     fillType: Values;
     fillRange: number;
     fillCenter: Point;
     isReverse: boolean;
-    getFillRange(): void;
+    getFillRange(): number;
     setFillStart(val: number): void;
     setFillRange(val: number): void;
 }
-export declare class RichTextComp extends ComponentX {
+export declare class RichTextComp extends ComponentX<NodeComp<Text>> {
     protected font: string;
     protected string: string;
     protected size: number;
     getString(): string;
     setString(val: string): void;
 }
-export declare class LabelOutlineComp extends NoRenderComponentX {
+export declare class LabelOutlineComp extends NoRenderComponentX<NodeComp> {
     color: typeof Color4B;
     width: number;
 }
-export declare class LabelShadowComp extends NoRenderComponentX {
+export declare class LabelShadowComp extends NoRenderComponentX<NodeComp> {
     color: typeof Color4B;
     blur: number;
     offset: Point;

package/dist/components/GUIComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GUIComponent.d.ts","sourceRoot":"","sources":["../../src/components/GUIComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAQ,MAAM,SAAS,CAAA;AAE7C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAc,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAI/D,eAAO,MAAM,QAAQ;;;;CAIpB,CAAA;AACD,KAAK,IAAI,GAAG,MAAM,OAAO,QAAQ,CAAA;AACjC,KAAK,MAAM,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAA;AAErC,qBAAa,UAAW,SAAQ,kBAAkB;IAChD,WAAW,EAAE,MAAM,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;IAErC,UAAU,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI;IAI3C,IAAI,OAAO,CAAC,GAAG,KAAA,EAEd;CACF;AAED,qBAAa,eAAgB,SAAQ,kBAAkB;IACrD,IAAI,iBAAqB;IACzB,OAAO,CAAC,SAAS,CAAQ;IACzB,SAAS,EAAE,OAAO,CAAA;IAElB,IAAI,QAAQ,IAIM,MAAM,CAFvB;IAED,IAAI,QAAQ,CAAC,GAAG,EAAE,MAAM,EAGvB;CACF;AAED,qBAAa,SAAU,SAAQ,UAAU;IACvC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,SAAK;IAET,SAAS;IAMT,SAAS,CAAC,GAAG,EAAE,MAAM;IAMrB,OAAO;IAKP,OAAO,CAAC,GAAG,KAAA;IAMX,OAAO,IAE2C,MAAM;IAIxD,OAAO,CAAC,GAAG,EAAE,MAAM;CAMpB;AAED,qBAAa,UAAW,SAAQ,UAAU;IACxC,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,oBAAqB,SAAQ,kBAAkB;CAAG;AAE/D,qBAAa,iBAAkB,SAAQ,UAAU;IAC/C,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,KAAK,CAAA;IACjB,SAAS,EAAE,OAAO,CAAA;IAElB,YAAY;IAMZ,YAAY,CAAC,GAAG,EAAE,MAAM;IAMxB,YAAY,CAAC,GAAG,EAAE,MAAM;CAKzB;AAED,qBAAa,YAAa,SAAQ,UAAU;IAC1C,SAAS,CAAC,IAAI,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,MAAM,EAAE,MAAM,CAAA;IACxB,SAAS,CAAC,IAAI,EAAE,MAAM,CAAA;IAEtB,SAAS;IAIT,SAAS,CAAC,GAAG,EAAE,MAAM;CAGtB;AAED,qBAAa,gBAAiB,SAAQ,kBAAkB;IACtD,KAAK,EAAE,OAAO,OAAO,CAAA;IACrB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,qBAAa,eAAgB,SAAQ,kBAAkB;IACrD,KAAK,EAAE,OAAO,OAAO,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,KAAK,CAAA;CACd"}
+{"version":3,"file":"GUIComponent.d.ts","sourceRoot":"","sources":["../../src/components/GUIComponent.ts"],"names":[],"mappings":"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"}

package/dist/components/GUIComponent.js

@@ -1,178 +1,108 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    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 (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (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 __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LabelShadowComp = exports.LabelOutlineComp = exports.RichTextComp = exports.ProgressTimerComp = exports.BlockInputEventsComp = exports.ScrollView = exports.LabelComp = exports.ProgressBarComp = exports.ButtonComp = exports.FillType = void 0;
-var pixi_js_1 = require("pixi.js");
-var decorator_1 = require("../core/decorator");
-var LoadingBar_1 = require("../core/LoadingBar");
-var html_text_parser_1 = require("../helper/html-text-parser");
-var _htmlTextParser = new html_text_parser_1.HtmlTextParser();
+const core_1 = require("@safe-engine/core");
+const pixi_js_1 = require("pixi.js");
+const LoadingBar_1 = require("../core/LoadingBar");
+// const _htmlTextParser = new HtmlTextParser()
 exports.FillType = {
     HORIZONTAL: 0,
     VERTICAL: 1,
     RADIAL: 2,
 };
-var ButtonComp = /** @class */ (function (_super) {
-    __extends(ButtonComp, _super);
-    function ButtonComp() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    ButtonComp.prototype.setOnPress = function (cb) {
+class ButtonComp extends core_1.NoRenderComponentX {
+    setOnPress(cb) {
         this.onPress = cb;
-    };
-    Object.defineProperty(ButtonComp.prototype, "enabled", {
-        set: function (val) {
-            this.node.instance.interactive = val;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return ButtonComp;
-}(decorator_1.NoRenderComponentX));
+    }
+    set enabled(val) {
+        this.node.instance.interactive = val;
+    }
+}
 exports.ButtonComp = ButtonComp;
-var ProgressBarComp = /** @class */ (function (_super) {
-    __extends(ProgressBarComp, _super);
-    function ProgressBarComp() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.mode = LoadingBar_1.LoadingBarMode.BAR;
-        return _this;
-    }
-    Object.defineProperty(ProgressBarComp.prototype, "progress", {
-        get: function () {
-            return this._progress;
-        },
-        set: function (val) {
-            this._progress = val;
-            this.node.instance.progress = val;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return ProgressBarComp;
-}(decorator_1.NoRenderComponentX));
+class ProgressBarComp extends core_1.NoRenderComponentX {
+    constructor() {
+        super(...arguments);
+        this.mode = LoadingBar_1.LoadingBarMode.BAR;
+    }
+    get progress() {
+        return this._progress;
+    }
+    set progress(val) {
+        this._progress = val;
+        this.node.instance.progress = val;
+    }
+}
 exports.ProgressBarComp = ProgressBarComp;
-var LabelComp = /** @class */ (function (_super) {
-    __extends(LabelComp, _super);
-    function LabelComp() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.size = 64;
-        return _this;
-    }
-    LabelComp.prototype.getString = function () {
+class LabelComp extends core_1.ComponentX {
+    constructor() {
+        super(...arguments);
+        this.size = 64;
+    }
+    getString() {
         if (this.node.instance instanceof pixi_js_1.Text) {
             return this.node.instance.text;
         }
-    };
-    LabelComp.prototype.setString = function (val) {
+    }
+    setString(val) {
         if (this.node.instance instanceof pixi_js_1.Text) {
             this.node.instance.text = val;
         }
-    };
-    LabelComp.prototype.getSize = function () {
+    }
+    getSize() {
         if (this.node.instance instanceof pixi_js_1.Text) {
             return this.node.instance.style.fontSize;
         }
-    };
-    LabelComp.prototype.setSize = function (val) {
+    }
+    setSize(val) {
         if (this.node.instance instanceof pixi_js_1.Text) {
             this.node.instance.style.fontSize = val;
         }
-    };
-    LabelComp.prototype.getFont = function () {
+    }
+    getFont() {
         if (this.node.instance instanceof pixi_js_1.Text) {
             return this.node.instance.style.fontFamily;
         }
-    };
-    LabelComp.prototype.setFont = function (val) {
+    }
+    setFont(val) {
         // console.log('set font', val, Assets.get(val))
         if (this.node.instance instanceof pixi_js_1.Text) {
             if (pixi_js_1.Assets.get(val))
                 this.node.instance.style.fontFamily = pixi_js_1.Assets.get(val).family;
         }
-    };
-    return LabelComp;
-}(decorator_1.ComponentX));
-exports.LabelComp = LabelComp;
-var ScrollView = /** @class */ (function (_super) {
-    __extends(ScrollView, _super);
-    function ScrollView() {
-        return _super !== null && _super.apply(this, arguments) || this;
     }
-    return ScrollView;
-}(decorator_1.ComponentX));
+}
+exports.LabelComp = LabelComp;
+class ScrollView extends core_1.ComponentX {
+}
 exports.ScrollView = ScrollView;
-var BlockInputEventsComp = /** @class */ (function (_super) {
-    __extends(BlockInputEventsComp, _super);
-    function BlockInputEventsComp() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return BlockInputEventsComp;
-}(decorator_1.NoRenderComponentX));
+class BlockInputEventsComp extends core_1.NoRenderComponentX {
+}
 exports.BlockInputEventsComp = BlockInputEventsComp;
-var ProgressTimerComp = /** @class */ (function (_super) {
-    __extends(ProgressTimerComp, _super);
-    function ProgressTimerComp() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    ProgressTimerComp.prototype.getFillRange = function () {
-        // if (this.node.instance instanceof cc.ProgressTimer) {
-        //   return this.node.instance.getPercentage() * 0.01
-        // }
-    };
-    ProgressTimerComp.prototype.setFillStart = function (val) {
-        // if (this.node.instance instanceof cc.ProgressTimer) {
-        //   this.node.instance.setMidpoint(Vec2(val, val))
-        // }
-    };
-    ProgressTimerComp.prototype.setFillRange = function (val) {
-        // if (this.node.instance instanceof cc.ProgressTimer) {
-        //   this.node.instance.setPercentage(val * 100)
-        // }
-    };
-    return ProgressTimerComp;
-}(decorator_1.ComponentX));
-exports.ProgressTimerComp = ProgressTimerComp;
-var RichTextComp = /** @class */ (function (_super) {
-    __extends(RichTextComp, _super);
-    function RichTextComp() {
-        return _super !== null && _super.apply(this, arguments) || this;
+class ProgressTimerComp extends core_1.ComponentX {
+    getFillRange() {
+        return this.node.instance.progress;
+    }
+    setFillStart(val) {
+        this.node.instance.fillCenter.x = val;
+    }
+    setFillRange(val) {
+        // console.log('setFillRange', this.node.instance);
+        this.node.instance.progress = val;
     }
-    RichTextComp.prototype.getString = function () {
+}
+exports.ProgressTimerComp = ProgressTimerComp;
+class RichTextComp extends core_1.ComponentX {
+    getString() {
         return this.string;
-    };
-    RichTextComp.prototype.setString = function (val) {
+    }
+    setString(val) {
         this.string = val;
-    };
-    return RichTextComp;
-}(decorator_1.ComponentX));
-exports.RichTextComp = RichTextComp;
-var LabelOutlineComp = /** @class */ (function (_super) {
-    __extends(LabelOutlineComp, _super);
-    function LabelOutlineComp() {
-        return _super !== null && _super.apply(this, arguments) || this;
     }
-    return LabelOutlineComp;
-}(decorator_1.NoRenderComponentX));
+}
+exports.RichTextComp = RichTextComp;
+class LabelOutlineComp extends core_1.NoRenderComponentX {
+}
 exports.LabelOutlineComp = LabelOutlineComp;
-var LabelShadowComp = /** @class */ (function (_super) {
-    __extends(LabelShadowComp, _super);
-    function LabelShadowComp() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return LabelShadowComp;
-}(decorator_1.NoRenderComponentX));
+class LabelShadowComp extends core_1.NoRenderComponentX {
+}
 exports.LabelShadowComp = LabelShadowComp;

package/dist/components/NodeComp.d.ts

@@ -1,8 +1,8 @@
+import { BaseNode, ComponentType, EnhancedComponent } from '@safe-engine/core';
 import { Constructor, Entity } from 'entityx-ts';
 import { Color, ColorSource, Container, Point } from 'pixi.js';
 import { Action, Animation } from 'pixi-action-ease';
-import { Size } from '../helper/utils';
-import { ComponentType, EnhancedComponent } from './EnhancedComponent';
+import { Size } from '../core/Size';
 export type EventCallbackType = (...args: any[]) => void;
 export interface EventMap {
     [key: string]: [EventCallbackType];
@@ -10,9 +10,9 @@ export interface EventMap {
 type TouchEVentCallback = (target: {
     location: Point;
 }) => void;
-export declare class NodeComp {
+export declare class NodeComp<C extends Container = Container> implements BaseNode<C> {
     entity: Entity;
-    instance: Container;
+    instance: C;
     events: EventMap;
     data: {
         [key: string]: any;
@@ -31,7 +31,7 @@ export declare class NodeComp {
     setOnTouchMove(cb: TouchEVentCallback): void;
     setOnTouchEnd(cb: TouchEVentCallback): void;
     setOnTouchCancel(cb: TouchEVentCallback): void;
-    constructor(instance: Container, entity: Entity);
+    constructor(instance: C, entity: Entity);
     get uuid(): number;
     get position(): Point;
     set position(val: Point);
@@ -47,6 +47,7 @@ export declare class NodeComp {
     get anchorX(): number;
     set anchorX(val: number);
     get anchorY(): number;
+    ß: any;
     set anchorY(val: number);
     /** rotation is in radians */
     get rotation(): number;
@@ -96,7 +97,7 @@ export declare class NodeComp {
     on(name: string, callback: EventCallbackType, target?: any): void;
     off(name: string): void;
     emit(name: string, ...params: any): void;
-    resolveComponent(component: EnhancedComponent): void;
+    resolveComponent(component: EnhancedComponent<NodeComp>): void;
     getData<T>(key: string): T;
     setData<T>(key: string, val: T): void;
 }

package/dist/components/NodeComp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../src/components/NodeComp.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../src/components/NodeComp.ts"],"names":[],"mappings":"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"}