@safe-engine/pixi 8.4.1 → 8.4.3

package/dist/index.js

@@ -1,6 +1,5 @@
 export * from 'pixi-action-ease';
 export * from 'pixi.js';
-export { Vec2 } from 'planck';
 export * from './app';
 export * from './base';
 export * from './collider';
@@ -8,15 +7,13 @@ export * from './collider/helper/Intersection';
 export * from './components/BaseComponent';
 export * from './components/NodeComp';
 export * from './components/Scene';
-export * from './core/Color';
-export * from './core/director';
-export * from './core/math';
-export * from './core/NodePool';
+export * from './core';
 export * from './dragonbones';
 export * from './gui/GUIComponent';
 export * from './gui/GUISystem';
 export * from './helper/utils';
 export * from './norender/NoRenderComponent';
+export * from './norender/Touch';
 export * from './render/RenderComponent';
 export * from './render/RenderSystem';
 export * from './richtext';

package/dist/norender/NoRenderComponent.d.ts

@@ -1,7 +1,7 @@
-import { FederatedPointerEvent } from 'pixi.js';
 import { NoRenderComponentX } from '../components/BaseComponent';
 import { EventCallbackType, EventMap, NodeComp } from '../components/NodeComp';
-export type TouchEventCallback = (touch?: FederatedPointerEvent, node?: NodeComp) => void;
+import { Touch } from './Touch';
+export type TouchEventCallback = (touch?: Touch, node?: NodeComp) => void;
 export declare class EventRegister extends NoRenderComponentX {
     events: EventMap;
     on(name: string, callback: EventCallbackType, target?: any): void;

package/dist/norender/NoRenderComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NoRenderComponent.d.ts","sourceRoot":"","sources":["../../src/norender/NoRenderComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAO9E,MAAM,MAAM,kBAAkB,GAAG,CAAC,KAAK,CAAC,EAAE,qBAAqB,EAAE,IAAI,CAAC,EAAE,QAAQ,KAAK,IAAI,CAAA;AAEzF,qBAAa,aAAc,SAAQ,kBAAkB;IACnD,MAAM,EAAE,QAAQ,CAAK;IAErB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,GAAG;IAS1D,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,GAAG;IAK5D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG;CAKlC;AAED,UAAU,eAAe;IACvB,YAAY,CAAC,EAAE,kBAAkB,CAAA;IACjC,WAAW,CAAC,EAAE,kBAAkB,CAAA;IAChC,UAAU,CAAC,EAAE,kBAAkB,CAAA;IAC/B,aAAa,CAAC,EAAE,kBAAkB,CAAA;CACnC;AACD,qBAAa,kBAAmB,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACzE,QAAQ,EAAE,aAAa,CAAA;IACvB,KAAK,EAAE,KAAK,CAAA;CACb;AAED,UAAU,cAAc;IACtB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,GAAG,CAAA;CACX;AACD,qBAAa,aAAc,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IACnE,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAK;IAEjC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC;IAG1B,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;CAG/B"}
+{"version":3,"file":"NoRenderComponent.d.ts","sourceRoot":"","sources":["../../src/norender/NoRenderComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAO/B,MAAM,MAAM,kBAAkB,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,QAAQ,KAAK,IAAI,CAAA;AAEzE,qBAAa,aAAc,SAAQ,kBAAkB;IACnD,MAAM,EAAE,QAAQ,CAAK;IAErB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,GAAG;IAS1D,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,GAAG;IAK5D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG;CAKlC;AAED,UAAU,eAAe;IACvB,YAAY,CAAC,EAAE,kBAAkB,CAAA;IACjC,WAAW,CAAC,EAAE,kBAAkB,CAAA;IAChC,UAAU,CAAC,EAAE,kBAAkB,CAAA;IAC/B,aAAa,CAAC,EAAE,kBAAkB,CAAA;CACnC;AACD,qBAAa,kBAAmB,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACzE,QAAQ,EAAE,aAAa,CAAA;IACvB,KAAK,EAAE,KAAK,CAAA;CACb;AAED,UAAU,cAAc;IACtB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,GAAG,CAAA;CACX;AACD,qBAAa,aAAc,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IACnE,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAK;IAEjC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC;IAG1B,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;CAG/B"}

package/dist/norender/NoRenderSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NoRenderSystem.d.ts","sourceRoot":"","sources":["../../src/norender/NoRenderSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAO7D,qBAAa,cAAe,YAAW,MAAM;IAC3C,SAAS,CAAC,aAAa,EAAE,YAAY;CAyDtC"}
+{"version":3,"file":"NoRenderSystem.d.ts","sourceRoot":"","sources":["../../src/norender/NoRenderSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAQ7D,qBAAa,cAAe,YAAW,MAAM;IAC3C,SAAS,CAAC,aAAa,EAAE,YAAY;CAyDtC"}

package/dist/norender/NoRenderSystem.js

@@ -1,9 +1,10 @@
 import { EventTypes } from 'entityx-ts';
 import { NodeComp } from '../components/NodeComp';
 import { ExtraDataComp, TouchEventRegister } from './NoRenderComponent';
+import { Touch } from './Touch';
 export class NoRenderSystem {
     configure(event_manager) {
-        event_manager.subscribe(EventTypes.ComponentAdded, ExtraDataComp, ({ entity, component }) => {
+        event_manager.subscribe(EventTypes.ComponentAdded, ExtraDataComp, ({ component }) => {
             const { key, value } = component.props;
             component.data[key] = value;
         });
@@ -15,26 +16,26 @@ export class NoRenderSystem {
             const container = nodeComp.instance;
             if (touchComp.props.onTouchStart) {
                 container.on('pointerdown', (event) => {
-                    touchComp.props.onTouchStart(event, nodeComp);
+                    touchComp.props.onTouchStart(new Touch(event), nodeComp);
                 });
             }
             if (touchComp.props.onTouchMove) {
                 container.on('pointermove', (event) => {
-                    touchComp.props.onTouchMove(event, nodeComp);
+                    touchComp.props.onTouchMove(new Touch(event), nodeComp);
                 });
             }
             if (touchComp.props.onTouchEnd) {
                 container.on('pointerup', (event) => {
-                    touchComp.props.onTouchEnd(event, nodeComp);
+                    touchComp.props.onTouchEnd(new Touch(event), nodeComp);
                 });
             }
             if (touchComp.props.onTouchEnd) {
                 container.on('pointercancel', (event) => {
-                    touchComp.props.onTouchEnd(event, nodeComp);
+                    touchComp.props.onTouchEnd(new Touch(event), nodeComp);
                 });
             }
         });
-        event_manager.subscribe(EventTypes.ComponentRemoved, TouchEventRegister, ({ entity, component }) => {
+        event_manager.subscribe(EventTypes.ComponentRemoved, TouchEventRegister, ({ component }) => {
             console.log('ComponentRemovedEvent TouchEventRegister', event);
             // const ett = event.entity
             // const nodeComp = ett.getComponent(NodeComp)

package/dist/norender/Touch.d.ts

@@ -0,0 +1,32 @@
+import { Vec2 } from '..';
+export declare class Touch {
+    private event;
+    constructor(event: any);
+    getLocation(): import("pixi.js").Point;
+    getLocationX(): number;
+    getLocationY(): number;
+    getDelta(): {
+        x: number;
+        y: number;
+        equals(other: /*elided*/ any): boolean;
+        add(value: import("pixi.js").Point | Vec2): /*elided*/ any;
+        addSelf(value: import("pixi.js").Point | Vec2): /*elided*/ any;
+        sub(value: import("pixi.js").Point | Vec2): /*elided*/ any;
+        mul(multiply: number): /*elided*/ any;
+        mulSelf(multiply: number): /*elided*/ any;
+        mag(): number;
+        normalizeSelf(): /*elided*/ any;
+        normalize(): /*elided*/ any;
+        cross(other: Vec2): number;
+        signAngle(other: Vec2): number;
+        lengthSqr(): number;
+        dot(other: Vec2): number;
+        angle(other: Vec2): number;
+        distance(other: /*elided*/ any): number;
+    };
+    getDeltaX(): number;
+    getDeltaY(): number;
+    getLocationInView(view: any): any;
+    getLocationInNode(node: any): any;
+}
+//# sourceMappingURL=Touch.d.ts.map

package/dist/norender/Touch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Touch.d.ts","sourceRoot":"","sources":["../../src/norender/Touch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAEzB,qBAAa,KAAK;IAChB,OAAO,CAAC,KAAK,CAAuB;gBACxB,KAAK,KAAA;IAIjB,WAAW;IAGX,YAAY;IAGZ,YAAY;IAGZ,QAAQ;;;;;;;;;;;;;;;;;;;IAGR,SAAS;IAGT,SAAS;IAGT,iBAAiB,CAAC,IAAI,EAAE,GAAG;IAI3B,iBAAiB,CAAC,IAAI,EAAE,GAAG;CAI5B"}

package/dist/norender/Touch.js

@@ -0,0 +1,32 @@
+import { Vec2 } from '..';
+export class Touch {
+    constructor(event) {
+        this.event = event;
+    }
+    getLocation() {
+        return this.event.global;
+    }
+    getLocationX() {
+        return this.event.globalX;
+    }
+    getLocationY() {
+        return this.event.globalY;
+    }
+    getDelta() {
+        return Vec2(this.event.movementX, this.event.movementY);
+    }
+    getDeltaX() {
+        return this.event.movementX;
+    }
+    getDeltaY() {
+        return this.event.movementY;
+    }
+    getLocationInView(view) {
+        const { x, y } = this.event.global;
+        return view.toLocal({ x, y });
+    }
+    getLocationInNode(node) {
+        const { x, y } = this.event.global;
+        return node.toLocal({ x, y });
+    }
+}

package/dist/render/RenderComponent.d.ts

@@ -1,4 +1,4 @@
-import { Graphics, Point, Sprite } from 'pixi.js';
+import { Graphics, Sprite } from 'pixi.js';
 import { Color4B, Vec2 } from '..';
 import { ComponentX } from '../components/BaseComponent';
 import { LoadingBarMode } from '../core/LoadingBar';
@@ -39,10 +39,10 @@ export declare class GraphicsRender extends ComponentX<GraphicsRenderProps & {
     drawCubicBezier(origin: Vec2, destination: Vec2, color: Color4B): void;
     drawCardinalSpline(points: Vec2[], color: Color4B): void;
     drawCatmullRom(points: Vec2[], color: Color4B): void;
-    drawPoly(points: Vec2[], closedPolygon: boolean, color: Color4B, thickness?: Float): void;
+    drawPoly(points: Vec2[], color?: Color4B, thickness?: Float): void;
     drawSolidPoly(points: Vec2[], color: Color4B): void;
     drawDot(points: Vec2[], color: Color4B): void;
-    drawSegment(from: Point, to: Point, color?: Color4B): void;
+    drawSegment(from: Vec2, to: Vec2, thickness?: Float, color?: Color4B): void;
     drawTriangle(p1: Vec2, p2: Vec2, p3: Vec2, color: Color4B): void;
     clear(): void;
 }

package/dist/render/RenderComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RenderComponent.d.ts","sourceRoot":"","sources":["../../src/render/RenderComponent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RenderComponent.d.ts","sourceRoot":"","sources":["../../src/render/RenderComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAW,MAAM,SAAS,CAAA;AAEnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,qBAAa,UAAW,SAAQ,UAAU;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,UAAU,iBAAiB;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB,QAAQ,CAAC,EAAE,cAAc,CAAA;CAI1B;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,iBAAiB,GAAG;IAAE,IAAI,CAAC,EAAE,YAAY,CAAA;CAAE,EAAE,MAAM,CAAC;IAc/F,IAAI,WAAW,WAEd;IAED,IAAI,WAAW,CAAC,KAAK,QAAA,EAkBpB;CACF;AACD,aAAK,SAAS;IACZ,MAAM,IAAA;IACN,IAAI,IAAA;CACL;AACD,UAAU,mBAAmB;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AACD,qBAAa,cAAe,SAAQ,UAAU,CAAC,mBAAmB,GAAG;IAAE,IAAI,CAAC,EAAE,cAAc,CAAA;CAAE,EAAE,QAAQ,CAAC;IACvG,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,YAAiB;IAGtF,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK;IAC1E,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO;IAOxD,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO;IAC7D,UAAU,CACR,MAAM,EAAE,IAAI,EACZ,MAAM,EAAE,KAAK,EACb,KAAK,CAAC,EAAE,KAAK,EACb,QAAQ,CAAC,EAAE,OAAO,EAClB,gBAAgB,CAAC,EAAE,OAAO,EAC1B,MAAM,CAAC,EAAE,KAAK,EACd,MAAM,CAAC,EAAE,KAAK,EACd,KAAK,CAAC,EAAE,OAAO,EACf,SAAS,CAAC,EAAE,KAAK;IAMnB,eAAe,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO;IAC/D,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO;IAC9D,eAAe,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO;IAC/D,kBAAkB,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO;IACjD,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO;IAC7C,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,KAAK;IAI3D,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO;IAC5C,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO;IACtC,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO;IAWpE,YAAY,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO;IAIzD,KAAK;CAGN;AAED,UAAU,eAAe;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AACD,qBAAa,UAAW,SAAQ,UAAU,CAAC,eAAe,CAAC;CAAG"}

package/dist/render/RenderComponent.js

@@ -43,14 +43,11 @@ var PointType;
     PointType[PointType["Circle"] = 0] = "Circle";
     PointType[PointType["Rect"] = 1] = "Rect";
 })(PointType || (PointType = {}));
-;
 export class GraphicsRender extends ComponentX {
-    drawPoint(position, pointSize, color, pointType = PointType.Rect) {
-    }
+    drawPoint(position, pointSize, color, pointType = PointType.Rect) { }
     // drawPoints(points: Vec2[], color: Color4B) {
     // }
-    drawLine(origin, destination, color, thickness) {
-    }
+    drawLine(origin, destination, color, thickness) { }
     drawRect(origin, destination, color) {
         const { x, y } = origin;
         const width = destination.x - x;
@@ -58,37 +55,30 @@ export class GraphicsRender extends ComponentX {
         this.node.instance.rect(x, y, width, height);
         this.node.instance.fill(color);
     }
-    drawSolidRect(origin, destination, color) {
-    }
+    drawSolidRect(origin, destination, color) { }
     drawCircle(center, radius, angle, segments, drawLineToCenter, scaleX, scaleY, color, thickness) {
         const { x, y } = center;
         this.node.instance.circle(x, y, radius);
         this.node.instance.fill(color);
     }
-    drawSolidCircle(origin, destination, color) {
-    }
-    drawQuadBezier(origin, destination, color) {
-    }
-    drawCubicBezier(origin, destination, color) {
-    }
-    drawCardinalSpline(points, color) {
-    }
-    drawCatmullRom(points, color) {
-    }
-    drawPoly(points, closedPolygon, color, thickness) {
-        this.node.instance.poly(points, closedPolygon);
-        this.node.instance.fill(color);
-    }
-    drawSolidPoly(points, color) {
-    }
-    drawDot(points, color) {
-    }
-    drawSegment(from, to, color) {
+    drawSolidCircle(origin, destination, color) { }
+    drawQuadBezier(origin, destination, color) { }
+    drawCubicBezier(origin, destination, color) { }
+    drawCardinalSpline(points, color) { }
+    drawCatmullRom(points, color) { }
+    drawPoly(points, color, thickness) {
+        this.node.instance.poly(points, true);
+        this.node.instance.fill(color || this.props.fillColor);
+    }
+    drawSolidPoly(points, color) { }
+    drawDot(points, color) { }
+    drawSegment(from, to, thickness, color) {
         this.node.instance.moveTo(from.x, from.y);
         this.node.instance.lineTo(to.x, to.y);
         this.node.instance.strokeStyle = {
-            cap: 'round', join: 'round',
-            width: this.props.lineWidth || 36,
+            cap: 'round',
+            join: 'round',
+            width: thickness || this.props.lineWidth || 36,
             color: color || this.props.strokeColor,
         };
         this.node.instance.stroke();

package/dist/render/RenderSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RenderSystem.d.ts","sourceRoot":"","sources":["../../src/render/RenderSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,MAAM,EACP,MAAM,YAAY,CAAA;AAMnB,oBAAY,WAAW;IACrB,MAAM,IAAA;IACN,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,IAAI,IAAA;IACJ,SAAS,IAAA;CACV;AAED,qBAAa,YAAa,YAAW,MAAM;IACzC,SAAS,CAAC,aAAa,EAAE,YAAY;CA8CtC"}
+{"version":3,"file":"RenderSystem.d.ts","sourceRoot":"","sources":["../../src/render/RenderSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAM7D,oBAAY,WAAW;IACrB,MAAM,IAAA;IACN,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,IAAI,IAAA;IACJ,SAAS,IAAA;CACV;AAED,qBAAa,YAAa,YAAW,MAAM;IACzC,SAAS,CAAC,aAAa,EAAE,YAAY;CA+CtC"}

package/dist/render/RenderSystem.js

@@ -20,7 +20,8 @@ export class RenderSystem {
         });
         event_manager.subscribe(EventTypes.ComponentAdded, SpriteRender, ({ entity, component }) => {
             const { spriteFrame } = component.props;
-            // console.log('SpriteRender ComponentAdded', component)
+            // const texture = GameWorld.Instance.assetManager.get<Texture>(spriteFrame)
+            // console.log('SpriteRender ComponentAdded', component, texture)
             const node = Sprite.from(spriteFrame);
             // if (type === SpriteTypes.FILLED) {
             //   // console.log('fillType', fillType)
@@ -43,7 +44,7 @@ export class RenderSystem {
             // maskComp.node = ett.assign(new NodeComp(node, ett))
         });
         event_manager.subscribe(EventTypes.ComponentAdded, GraphicsRender, ({ entity, component }) => {
-            // const { lineWidth, strokeColor, fillColor } = component
+            // const { lineWidth, strokeColor, fillColor } = component.props
             // console.log('GraphicsRender', component);
             const node = new Graphics();
             component.node = entity.assign(new NodeComp(node, entity));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@safe-engine/pixi",
-  "version": "8.4.1",
+  "version": "8.4.3",
   "description": "safex pixi plugin",
   "type": "module",
   "main": "dist/index.js",
@@ -19,6 +19,7 @@
     "@esotericsoftware/spine-core": "^4.2.84",
     "@pixi/ui": "^2.2.4",
     "@types/node": "^24.0.10",
+    "box2d-wasm": "^7.0.0",
     "copyfiles": "^2.4.1",
     "dragonbones-pixijs": "^1.0.5",
     "entityx-ts": "^2.2.1",

package/src/app.ts

@@ -1,5 +1,5 @@
 import { actionManager } from 'pixi-action-ease'
-import { Application } from 'pixi.js'
+import { Application, AssetsClass } from 'pixi.js'
 
 import { GameWorld } from './base'
 import { CollideSystem } from './collider'
@@ -7,7 +7,12 @@ import { GUISystem } from './gui/GUISystem'
 import { NoRenderSystem } from './norender/NoRenderSystem'
 import { RenderSystem } from './render/RenderSystem'
 
-export async function startGame(defaultFont, designedResolution = { width: 720, height: 1280 }, id = 'game') {
+export async function startGame(
+  defaultFont,
+  designedResolution = { width: 720, height: 1280 },
+  assetManager: AssetsClass,
+  id = 'gameCanvas',
+) {
   const app = new Application()
   await app.init({
     antialias: true,
@@ -20,7 +25,7 @@ export async function startGame(defaultFont, designedResolution = { width: 720,
       click: true,
       wheel: false,
     },
-    canvas: document.getElementById(id) as HTMLCanvasElement
+    canvas: document.getElementById(id) as HTMLCanvasElement,
   })
   // GameWorld.Instance.setup(NodeComp, app.stage)
   Object.assign(app.canvas.style, {
@@ -33,6 +38,7 @@ export async function startGame(defaultFont, designedResolution = { width: 720,
   // app.stage.position.y = app.renderer.height / app.renderer.resolution
   // app.stage.scale.y = -1
   GameWorld.Instance.app = app
+  GameWorld.Instance.assetManager = assetManager
   initWorld(defaultFont)
   startGameLoop(GameWorld.Instance)
   return app
@@ -82,4 +88,4 @@ function initWorld(defaultFont?: string) {
     guiSystem.defaultFont = defaultFont
   }
   // startGameLoop(world, app)
-}
+}

package/src/base/gworld.ts

@@ -1,9 +1,10 @@
 import { Constructor, System, World } from 'entityx-ts'
-import { Application } from 'pixi.js'
+import { Application, AssetsClass } from 'pixi.js'
 
 export class GameWorld extends World {
   listUpdate: (System | Constructor<System>)[] = []
   app: Application
+  assetManager: AssetsClass
   update(dt: number) {
     this.listUpdate.forEach((system: any) => {
       this.systems.update(system, dt)

package/src/base/index.ts

@@ -1,3 +1,14 @@
+import { NodeComp } from '../components/NodeComp'
+
 export * from './EnhancedComponent'
 export * from './gworld'
 export * from './utils'
+
+export interface BaseComponentProps<T> {
+  $ref?: T
+  $push?: T[]
+  $refNode?: NodeComp
+  $pushNode?: NodeComp[]
+  node?: Partial<NodeComp>
+  // [$key: `$${string}`]: string
+}

package/src/base/utils.ts

@@ -1,9 +1,9 @@
-import { Constructor } from 'entityx-ts';
+import { Constructor } from 'entityx-ts'
 
-import { GameWorld } from '..';
-import { ComponentX, NoRenderComponentX } from '../components/BaseComponent';
+import { GameWorld } from '..'
+import { ComponentX, NoRenderComponentX } from '../components/BaseComponent'
 
-export type GetProps<T> = T extends ComponentX<infer P> ? P : T extends NoRenderComponentX<infer Q> ? Q : never;
+export type GetProps<T> = T extends ComponentX<infer P> ? P : T extends NoRenderComponentX<infer Q> ? Q : never
 
 export function instantiate<T extends ComponentX>(ComponentType: Constructor<T>, data?: GetProps<T>): T {
   const instance = new ComponentType()

package/src/box2d-wasm/PhysicsSystem.ts

@@ -1,14 +1,10 @@
-import Box2DFactory from 'box2d-wasm';
-import {
-  EntityManager,
-  EventManager,
-  EventTypes,
-  System
-} from 'entityx-ts';
-import { GameWorld, Graphics, instantiate, NodeComp, Vec2 } from '..';
+import Box2DFactory from 'box2d-wasm'
+import { EntityManager, EventManager, EventTypes, System } from 'entityx-ts'
+import { Graphics } from 'pixi.js'
 
-import { makeContactListener } from './ContactListener';
-import { makeDebugDraw } from './debugDraw';
+import { GameWorld, instantiate, NodeComp, Vec2 } from '..'
+import { makeContactListener } from './ContactListener'
+import { makeDebugDraw } from './debugDraw'
 import {
   BoxColliderPhysics,
   CircleColliderPhysics,
@@ -16,8 +12,8 @@ import {
   PhysicsMaterial,
   PolygonColliderPhysics,
   RigidBody,
-} from './PhysicsComponent';
-import { PhysicsSprite } from './PhysicsSprite';
+} from './PhysicsComponent'
+import { PhysicsSprite } from './PhysicsSprite'
 
 // Box2D.b2Fixture.prototype.shouldCollide = function (other) {
 //   const nodeThis: NodeComp = this.getBody().getUserData()
@@ -27,18 +23,18 @@ import { PhysicsSprite } from './PhysicsSprite';
 // }
 export let box2D: typeof Box2D
 export async function initBox2d() {
-  box2D = await Box2DFactory();
+  box2D = await Box2DFactory()
 }
 
 export function setColliderMatrix(colliderMatrix = [[true]]) {
   const physicsSystem = GameWorld.Instance.systems.get(PhysicsSystem)
   physicsSystem.colliderMatrix = colliderMatrix
 }
-const maxTimeStep = 1 / 60;
-const velocityIterations = 1;
-const positionIterations = 1;
+const maxTimeStep = 1 / 60
+const velocityIterations = 1
+const positionIterations = 1
 const metadata: { [key: number]: NodeComp } = {}
-const pixelsPerMeter = 1;
+const pixelsPerMeter = 1
 
 export class PhysicsSystem implements System {
   world: Box2D.b2World
@@ -53,15 +49,16 @@ export class PhysicsSystem implements System {
   }
 
   configure(event_manager: EventManager) {
-    const { b2BodyDef, b2_dynamicBody, b2_staticBody, b2FixtureDef, b2PolygonShape, b2Vec2, b2World, getPointer, b2ContactListener } = box2D as typeof Box2D;
-    const gravity = new b2Vec2(0, 10);
-    this.world = new b2World(gravity);
+    const { b2BodyDef, b2_dynamicBody, b2_staticBody, b2FixtureDef, b2PolygonShape, b2Vec2, b2World, getPointer, b2ContactListener } =
+      box2D as typeof Box2D
+    const gravity = new b2Vec2(0, 10)
+    this.world = new b2World(gravity)
     console.log('configure world', (event_manager.world as GameWorld).app)
     // event_manager.world.physicsManager = this
-    const graphics = new Graphics();
+    const graphics = new Graphics()
     this.graphics = graphics
     graphics.zIndex = 1000
-      ; (event_manager.world as GameWorld).app.stage.addChild(graphics);
+    ;(event_manager.world as GameWorld).app.stage.addChild(graphics)
     // event_manager.subscribe(ComponentAddedEvent(RigidBody), this);
     event_manager.subscribe(EventTypes.ComponentAdded, BoxColliderPhysics, ({ entity, component }) => {
       console.log('ComponentAddedEvent BoxColliderPhysics', component)
@@ -70,7 +67,7 @@ export class PhysicsSystem implements System {
         rigidBody = instantiate(RigidBody)
         entity.assign(rigidBody)
       }
-      const { type = 'static', gravityScale = 1, } = rigidBody.props
+      const { type = 'static', gravityScale = 1 } = rigidBody.props
       const physicsMaterial = entity.getComponent(PhysicsMaterial)
       const { density = 1, friction = 0.5, restitution = 0.3 } = physicsMaterial?.props || {}
       const box = component
@@ -78,31 +75,31 @@ export class PhysicsSystem implements System {
       const { width, height, ...colliderProps } = box.props
       // ett.assign(instantiate(ColliderPhysics, { tag, offset }))
       const { x = 0, y = 0 } = colliderProps.offset || {}
-      const zero = new b2Vec2(0, 0);
-      const position = new b2Vec2(node.posX, node.posY);
-      const offset = new b2Vec2(x, y);
+      const zero = new b2Vec2(0, 0)
+      const position = new b2Vec2(node.posX, node.posY)
+      const offset = new b2Vec2(x, y)
 
-      const bd = new b2BodyDef();
-      bd.set_type(type === 'dynamic' ? b2_dynamicBody : b2_staticBody);
-      bd.set_position(zero);
+      const bd = new b2BodyDef()
+      bd.set_type(type === 'dynamic' ? b2_dynamicBody : b2_staticBody)
+      bd.set_position(zero)
       bd.set_gravityScale(gravityScale)
       const body = this.world.CreateBody(bd)
       rigidBody.body = body
       // console.log('body', type, b2_dynamicBody, b2_staticBody, getPointer(body));
       // body.setMassData({ mass: 1 } as any)
       const physicsNode = new PhysicsSprite(node.instance, body)
-      const square = new b2PolygonShape();
-      square.SetAsBox(width / 2, height / 2);
-      const fixtureDef = new b2FixtureDef();
-      fixtureDef.set_shape(square);
-      fixtureDef.set_density(density);
-      fixtureDef.set_friction(friction);
-      fixtureDef.set_restitution(restitution);
-      body.CreateFixture(fixtureDef);
-      body.SetTransform(position, 0);
-      body.SetLinearVelocity(zero);
-      body.SetAwake(true);
-      body.SetEnabled(true);
+      const square = new b2PolygonShape()
+      square.SetAsBox(width / 2, height / 2)
+      const fixtureDef = new b2FixtureDef()
+      fixtureDef.set_shape(square)
+      fixtureDef.set_density(density)
+      fixtureDef.set_friction(friction)
+      fixtureDef.set_restitution(restitution)
+      body.CreateFixture(fixtureDef)
+      body.SetTransform(position, 0)
+      body.SetLinearVelocity(zero)
+      body.SetAwake(true)
+      body.SetEnabled(true)
       metadata[getPointer(body)] = node
 
       const physicsCollide = entity.assign(instantiate(ColliderPhysics, colliderProps))
@@ -110,9 +107,9 @@ export class PhysicsSystem implements System {
       physicsCollide.node = node
       box.node = node
     })
-    event_manager.subscribe(EventTypes.ComponentAdded, (CircleColliderPhysics), () => { })
-    event_manager.subscribe(EventTypes.ComponentAdded, (PolygonColliderPhysics), () => { })
-    event_manager.subscribe(EventTypes.ComponentRemoved, (NodeComp), () => {
+    event_manager.subscribe(EventTypes.ComponentAdded, CircleColliderPhysics, () => {})
+    event_manager.subscribe(EventTypes.ComponentAdded, PolygonColliderPhysics, () => {})
+    event_manager.subscribe(EventTypes.ComponentRemoved, NodeComp, () => {
       // log('ComponentRemovedEvent NodeComp', event);
       // const node = event.entity.getComponent(NodeComp)
       // if (node.instance instanceof Sprite) {
@@ -127,11 +124,11 @@ export class PhysicsSystem implements System {
 
   update(entities: EntityManager, events: EventManager, dt: number) {
     if (this.world) {
-      const clampedDelta = Math.min(dt, maxTimeStep);
-      this.world.Step(clampedDelta, velocityIterations, positionIterations);
+      const clampedDelta = Math.min(dt, maxTimeStep)
+      this.world.Step(clampedDelta, velocityIterations, positionIterations)
       this.graphics.clear()
-      this.world.DebugDraw();
-      this.graphics.fill();
+      this.world.DebugDraw()
+      this.graphics.fill()
       // this.graphics.stroke();
       // console.log('GetBodyCount', this.world.GetBodyCount());
     }