@safe-engine/pixi 8.4.7 → 8.5.4

package/dist/box2d-wasm/PhysicsSystem.js

@@ -7,24 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import Box2DFactory from 'box2d-wasm';
 import { EventTypes } from 'entityx-ts';
 import { Graphics } from 'pixi.js';
-import { GameWorld, instantiate, NodeComp } from '..';
+import { GameWorld, instantiate, NodeComp, Vec2 } from '..';
 import { makeContactListener } from './ContactListener';
 import { makeDebugDraw } from './debugDraw';
-import { BoxColliderPhysics, CircleColliderPhysics, ColliderPhysics, PhysicsMaterial, PolygonColliderPhysics, RigidBody, } from './PhysicsComponent';
+import { PhysicsBoxCollider, PhysicsCircleCollider, PhysicsPolygonCollider, RigidBody } from './PhysicsComponent';
 import { PhysicsSprite } from './PhysicsSprite';
 // Box2D.b2Fixture.prototype.shouldCollide = function (other) {
 //   const nodeThis: NodeComp = this.getBody().getUserData()
@@ -32,6 +21,9 @@ import { PhysicsSprite } from './PhysicsSprite';
 //   const { colliderMatrix } = GameWorld.Instance.systems.get(PhysicsSystem)
 //   return colliderMatrix[nodeOther.group][nodeThis.group]
 // }
+export const DynamicBody = 2;
+export const KinematicBody = 1;
+export const StaticBody = 0;
 export let box2D;
 export function initBox2d() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -50,7 +42,7 @@ const pixelsPerMeter = 1;
 export class PhysicsSystem {
     constructor() {
         this.listRemoveBody = [];
-        this.listRemoveShape = [];
+        // listRemoveShape: Box2D.b2Shape[] = []
         this.colliderMatrix = [[true]];
     }
     addDebug() {
@@ -58,7 +50,7 @@ export class PhysicsSystem {
         this.world.SetDebugDraw(debugDraw);
     }
     configure(event_manager) {
-        const { b2BodyDef, b2_dynamicBody, b2_staticBody, b2FixtureDef, b2PolygonShape, b2Vec2, b2World, getPointer, b2ContactListener } = box2D;
+        const { b2BodyDef, b2FixtureDef, b2PolygonShape, b2CircleShape, b2Vec2, b2World, pointsToVec2Array, getPointer } = box2D;
         const gravity = new b2Vec2(0, 10);
         this.world = new b2World(gravity);
         console.log('configure world', event_manager.world.app);
@@ -66,69 +58,167 @@ export class PhysicsSystem {
         const graphics = new Graphics();
         this.graphics = graphics;
         graphics.zIndex = 1000;
-        event_manager.world.app.stage.addChild(graphics);
+        const { app } = event_manager.world;
+        app.stage.addChild(graphics);
         // event_manager.subscribe(ComponentAddedEvent(RigidBody), this);
-        event_manager.subscribe(EventTypes.ComponentAdded, BoxColliderPhysics, ({ entity, component }) => {
-            console.log('ComponentAddedEvent BoxColliderPhysics', component);
+        event_manager.subscribe(EventTypes.ComponentAdded, PhysicsBoxCollider, ({ entity, component: box }) => {
+            console.log('ComponentAddedEvent BoxColliderPhysics', box);
             let rigidBody = entity.getComponent(RigidBody);
             if (!rigidBody) {
                 rigidBody = instantiate(RigidBody);
                 entity.assign(rigidBody);
             }
-            const { type = 'static', gravityScale = 1 } = rigidBody.props;
-            const physicsMaterial = entity.getComponent(PhysicsMaterial);
-            const { density = 1, friction = 0.5, restitution = 0.3 } = (physicsMaterial === null || physicsMaterial === void 0 ? void 0 : physicsMaterial.props) || {};
-            const box = component;
+            const { type = StaticBody, gravityScale = 1, density = 1, friction = 0.5, restitution = 0.3, isSensor } = rigidBody.props;
+            const { width, height, offset = [] } = box.props;
             const node = entity.getComponent(NodeComp);
-            const _a = box.props, { width, height } = _a, colliderProps = __rest(_a, ["width", "height"]);
-            // 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 bd = new b2BodyDef();
-            bd.set_type(type === 'dynamic' ? b2_dynamicBody : b2_staticBody);
+            bd.set_type(type);
             bd.set_position(zero);
             bd.set_gravityScale(gravityScale);
             const body = this.world.CreateBody(bd);
             rigidBody.body = body;
+            const physicsNode = new PhysicsSprite(node.instance, rigidBody.body);
+            rigidBody.physicSprite = physicsNode;
+            rigidBody.node = node;
             // console.log('body', type, b2_dynamicBody, b2_staticBody, getPointer(body));
             // body.setMassData({ mass: 1 } as any)
-            const physicsNode = new PhysicsSprite(node.instance, body);
+            const position = new b2Vec2(node.posX, node.posY);
             const square = new b2PolygonShape();
-            square.SetAsBox(width / 2, height / 2);
+            const [x = 0, y = 0] = offset;
+            square.SetAsBox(width / 2, height / 2, new b2Vec2(node.width / 2 + x, node.height / 2 + y), 0);
             const fixtureDef = new b2FixtureDef();
             fixtureDef.set_shape(square);
             fixtureDef.set_density(density);
             fixtureDef.set_friction(friction);
             fixtureDef.set_restitution(restitution);
+            fixtureDef.set_isSensor(isSensor);
+            rigidBody.body.CreateFixture(fixtureDef);
+            rigidBody.body.SetTransform(position, 0);
+            rigidBody.body.SetLinearVelocity(zero);
+            rigidBody.body.SetAwake(true);
+            rigidBody.body.SetEnabled(true);
+            metadata[getPointer(rigidBody.body)] = node;
+            box.node = node;
+        });
+        event_manager.subscribe(EventTypes.ComponentAdded, PhysicsCircleCollider, ({ entity, component }) => {
+            // console.log('ComponentAddedEvent PhysicsCircleCollider', component)
+            let rigidBody = entity.getComponent(RigidBody);
+            if (!rigidBody) {
+                rigidBody = instantiate(RigidBody);
+                entity.assign(rigidBody);
+            }
+            const { type = StaticBody, gravityScale = 1, density = 100, friction = 0.5, restitution = 0.3, isSensor = false } = rigidBody.props;
+            const node = entity.getComponent(NodeComp);
+            const { radius, offset = [] } = component.props;
+            const [x = 0, y = 0] = offset;
+            const zero = new b2Vec2(0, 0);
+            const position = new b2Vec2(node.posX, node.posY);
+            const bd = new b2BodyDef();
+            bd.set_type(type);
+            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 circleShape = new b2CircleShape();
+            circleShape.set_m_radius(radius);
+            circleShape.set_m_p(new b2Vec2(x, y));
+            const fixtureDef = new b2FixtureDef();
+            fixtureDef.set_shape(circleShape);
+            fixtureDef.set_density(density);
+            fixtureDef.set_isSensor(isSensor);
+            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));
-            physicsCollide.instance = physicsNode;
-            physicsCollide.node = node;
-            box.node = node;
+            rigidBody.physicSprite = physicsNode;
+            rigidBody.node = node;
+            component.node = node;
         });
-        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) {
-            //   const body = node.instance.getBody()
-            //   this.listRemoveShape.push(...body.shapeList)
-            //   this.listRemoveBody.push(body)
-            // }
+        event_manager.subscribe(EventTypes.ComponentAdded, PhysicsPolygonCollider, ({ entity, component }) => {
+            // console.log('ComponentAddedEvent PhysicsPolygonCollider', component)
+            let rigidBody = entity.getComponent(RigidBody);
+            if (!rigidBody) {
+                rigidBody = instantiate(RigidBody);
+                entity.assign(rigidBody);
+            }
+            const { type = StaticBody, gravityScale = 1, density = 1, friction = 0.5, restitution = 0.3, isSensor } = rigidBody.props;
+            const node = entity.getComponent(NodeComp);
+            const { points, offset = [] } = component.props;
+            const [x = 0, y = 0] = offset;
+            const zero = new b2Vec2(0, 0);
+            const position = new b2Vec2(node.posX, node.posY);
+            const { width, height } = node.contentSize;
+            const { scaleX, scaleY, anchorX, anchorY } = node;
+            const bd = new b2BodyDef();
+            bd.set_type(type);
+            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 polygonShape = new b2PolygonShape();
+            const fixedPoints = points.map((p) => {
+                if (p.x)
+                    return Vec2(p.x + x - width * anchorX * scaleX, -p.y + y + height * scaleY * anchorY);
+                return Vec2(p[0] + x - width * anchorX * scaleX, -p[1] + y + height * scaleY * anchorY);
+            });
+            const [vecArr, destroyVecArr] = pointsToVec2Array(fixedPoints);
+            // console.log('vecArr', vecArr, vecArr.Length())
+            polygonShape.Set(vecArr, points.length);
+            destroyVecArr();
+            const fixtureDef = new b2FixtureDef();
+            fixtureDef.set_shape(polygonShape);
+            fixtureDef.set_density(density);
+            fixtureDef.set_friction(friction);
+            fixtureDef.set_restitution(restitution);
+            fixtureDef.set_isSensor(isSensor);
+            body.CreateFixture(fixtureDef);
+            body.SetTransform(position, 0);
+            // body.SetLinearVelocity(zero)
+            body.SetAwake(true);
+            body.SetEnabled(true);
+            metadata[getPointer(body)] = node;
+            rigidBody.physicSprite = physicsNode;
+            rigidBody.node = node;
+            component.node = node;
+        });
+        event_manager.subscribe(EventTypes.ComponentRemoved, RigidBody, ({ component }) => {
+            // console.log('ComponentRemovedEvent NodeComp', component)
+            if (component.physicSprite instanceof PhysicsSprite) {
+                const body = component.physicSprite.getBody();
+                // this.listRemoveShape.push(...body.shapeList)
+                this.listRemoveBody.push(body);
+            }
         });
         const listener = makeContactListener(this.world, metadata, box2D);
         this.world.SetContactListener(listener);
     }
-    update(entities, events, dt) {
+    update(entities, _events, dt) {
         if (this.world) {
+            const { getPointer } = box2D;
+            for (const entt of entities.entities_with_components(RigidBody)) {
+                const comp = entt.getComponent(RigidBody);
+                if (comp.node.active && comp.enabled) {
+                    comp.physicSprite.update(dt);
+                }
+            }
+            // remove bodies and shapes
+            this.listRemoveBody.forEach((body) => {
+                if (body) {
+                    this.world.DestroyBody(getPointer(body));
+                }
+            });
+            this.listRemoveBody = [];
             const clampedDelta = Math.min(dt, maxTimeStep);
             this.world.Step(clampedDelta, velocityIterations, positionIterations);
             this.graphics.clear();

package/dist/collider/CollideComponent.d.ts

@@ -1,23 +1,40 @@
-import { Graphics, Point, Rectangle, Size } from 'pixi.js';
+import { Graphics, Rectangle, Size } from 'pixi.js';
+import { Vec2 } from '..';
 import { NoRenderComponentX } from '../components/BaseComponent';
 interface ColliderProps {
-    offset?: Point;
+    offset?: Vec2;
     tag?: number;
-    enabled?: boolean;
     onCollisionEnter?: (other: Collider) => void;
     onCollisionExit?: (other: Collider) => void;
     onCollisionStay?: (other: Collider) => void;
 }
 export declare class Collider<T = ColliderProps> extends NoRenderComponentX<T> {
-    _worldPoints: Point[];
-    _worldPosition: Point;
+    _worldPoints: Vec2[];
+    _worldPosition: Vec2;
     _worldRadius: any;
     _AABB: Rectangle;
     _preAabb: Rectangle;
-    update(dt: number, draw?: Graphics): void;
     getAABB(): Rectangle;
     get world(): {
-        points: Point[];
+        points: {
+            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;
+        }[];
         preAabb: Rectangle;
     };
 }
@@ -37,11 +54,11 @@ export declare class CircleCollider extends Collider<CircleColliderProps> {
     update(dt: any, draw: Graphics): void;
 }
 interface PolygonColliderProps extends ColliderProps {
-    points: Array<Point>;
+    points: Array<Vec2>;
 }
 export declare class PolygonCollider extends Collider<PolygonColliderProps> {
-    get points(): Point[];
-    set points(points: Point[]);
+    get points(): Vec2[];
+    set points(points: Vec2[]);
     update(dt: any, draw: Graphics): void;
 }
 export declare enum CollisionType {

package/dist/collider/CollideComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CollideComponent.d.ts","sourceRoot":"","sources":["../../src/collider/CollideComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAG1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAiBhE,UAAU,aAAa;IACrB,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;IAC5C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;IAC3C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;CAC5C;AAED,qBAAa,QAAQ,CAAC,CAAC,GAAG,aAAa,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IACpE,YAAY,EAAE,KAAK,EAAE,CAAK;IAC1B,cAAc,EAAE,KAAK,CAAA;IACrB,YAAY,MAAA;IACZ,KAAK,EAAE,SAAS,CAA4B;IAC5C,QAAQ,EAAE,SAAS,CAA4B;IAE/C,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ;IAClC,OAAO;IAGP,IAAI,KAAK;;;MAKR;CACF;AAED,UAAU,gBAAiB,SAAQ,aAAa;IAC9C,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,WAAY,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IAEzD,IAAI,IAAI,IAAI,IAAI,CAEf;IAED,IAAI,IAAI,CAAC,CAAC,EAAE,IAAI,EAGf;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,QAAQ;CAkC1B;AAED,UAAU,mBAAoB,SAAQ,aAAa;IACjD,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,cAAe,SAAQ,QAAQ,CAAC,mBAAmB,CAAC;IAE/D,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,QAAQ;CAuB1B;AAGD,UAAU,oBAAqB,SAAQ,aAAa;IAClD,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;CACrB;AACD,qBAAa,eAAgB,SAAQ,QAAQ,CAAC,oBAAoB,CAAC;IAEjE,IAAI,MAAM,IAAI,KAAK,EAAE,CAIpB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,EAEzB;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,QAAQ;CAsB1B;AAED,oBAAY,aAAa;IACvB,IAAI,IAAA;IACJ,KAAK,IAAA;IACL,IAAI,IAAA;IACJ,IAAI,IAAA;CACL;AASD,qBAAa,QAAQ;IACnB,UAAU,EAAE,QAAQ,CAAA;IACpB,UAAU,EAAE,QAAQ,CAAA;IACpB,SAAS,EAAE,OAAO,CAAA;IAClB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,eAAe,EAAE,OAAO,CAAA;IACxB,gBAAgB,EAAE,OAAO,CAAA;gBAEb,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ;IAsBpD,WAAW;IAiBX,IAAI;CAyBL"}
+{"version":3,"file":"CollideComponent.d.ts","sourceRoot":"","sources":["../../src/collider/CollideComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAEnD,OAAO,EAAa,IAAI,EAAE,MAAM,IAAI,CAAA;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAgBhE,UAAU,aAAa;IACrB,MAAM,CAAC,EAAE,IAAI,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;IAC5C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;IAC3C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;CAC5C;AAED,qBAAa,QAAQ,CAAC,CAAC,GAAG,aAAa,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IACpE,YAAY,EAAE,IAAI,EAAE,CAAK;IACzB,cAAc,EAAE,IAAI,CAAA;IACpB,YAAY,MAAA;IACZ,KAAK,EAAE,SAAS,CAA4B;IAC5C,QAAQ,EAAE,SAAS,CAA4B;IAG/C,OAAO;IAGP,IAAI,KAAK;;;;;;;;;;;;;;;;;;;;;MAKR;CACF;AAED,UAAU,gBAAiB,SAAQ,aAAa;IAC9C,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,WAAY,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IACzD,IAAI,IAAI,IAAI,IAAI,CAEf;IAED,IAAI,IAAI,CAAC,CAAC,EAAE,IAAI,EAGf;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,QAAQ;CAkC1B;AAED,UAAU,mBAAoB,SAAQ,aAAa;IACjD,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,cAAe,SAAQ,QAAQ,CAAC,mBAAmB,CAAC;IAC/D,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,QAAQ;CAuB1B;AAED,UAAU,oBAAqB,SAAQ,aAAa;IAClD,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;CACpB;AACD,qBAAa,eAAgB,SAAQ,QAAQ,CAAC,oBAAoB,CAAC;IACjE,IAAI,MAAM,IAAI,IAAI,EAAE,CAInB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAExB;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,QAAQ;CAsB1B;AAED,oBAAY,aAAa;IACvB,IAAI,IAAA;IACJ,KAAK,IAAA;IACL,IAAI,IAAA;IACJ,IAAI,IAAA;CACL;AASD,qBAAa,QAAQ;IACnB,UAAU,EAAE,QAAQ,CAAA;IACpB,UAAU,EAAE,QAAQ,CAAA;IACpB,SAAS,EAAE,OAAO,CAAA;IAClB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,eAAe,EAAE,OAAO,CAAA;IACxB,gBAAgB,EAAE,OAAO,CAAA;gBAEb,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ;IAsBpD,WAAW;IAiBX,IAAI;CAyBL"}

package/dist/collider/CollideComponent.js

@@ -1,7 +1,6 @@
 import { Rectangle } from 'pixi.js';
-import { GameWorld } from '..';
+import { GameWorld, Vec2 } from '..';
 import { NoRenderComponentX } from '../components/BaseComponent';
-import { v2 } from '../helper/utils';
 import { circleCircle, polygonCircle, polygonPolygon } from './helper/Intersection';
 import { getMax, getMin } from './helper/utils';
 function getNodeToWorldTransformAR(node) {
@@ -21,8 +20,7 @@ export class Collider extends NoRenderComponentX {
         this._AABB = new Rectangle(0, 0, 0, 0);
         this._preAabb = new Rectangle(0, 0, 0, 0);
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    update(dt, draw) { }
+    // update(dt: number, draw?: Graphics) { }
     getAABB() {
         return this._AABB;
     }
@@ -45,7 +43,7 @@ export class BoxCollider extends Collider {
         if (!this.node) {
             return;
         }
-        const { x, y } = this.props.offset || v2();
+        const { x, y } = this.props.offset || Vec2();
         // const hw = this.width * 0.5
         // const hh = this.height * 0.5
         const transform = getNodeToWorldTransformAR(this.node);
@@ -53,11 +51,11 @@ export class BoxCollider extends Collider {
         // const dy = y - hh
         const collider = this.getComponent(Collider);
         collider._worldPoints = [
-            v2(x, y),
-            v2(x, y + this.props.height),
-            v2(x + this.props.width, y + this.props.height),
-            v2(x + this.props.width, y)
-        ].map(p => transform.apply(p));
+            Vec2(x, y),
+            Vec2(x, y + this.props.height),
+            Vec2(x + this.props.width, y + this.props.height),
+            Vec2(x + this.props.width, y),
+        ].map((p) => transform.apply(p));
         // console.log("_worldPoints", collider._worldPoints, rectTrs)
         // collider._worldPoints = collider._worldPoints.map(p => transform.apply(p))
         const listX = collider._worldPoints.map(({ x }) => x);
@@ -104,7 +102,7 @@ export class CircleCollider extends Collider {
 export class PolygonCollider extends Collider {
     get points() {
         const { x, y } = this.props.offset;
-        const pointsList = this.props.points.map((p) => v2(p.x + x, p.y + y));
+        const pointsList = this.props.points.map((p) => Vec2(p.x + x, p.y + y));
         return pointsList;
     }
     set points(points) {
@@ -119,7 +117,7 @@ export class PolygonCollider extends Collider {
         collider._worldPoints = this.points.map((p) => transform.apply(p));
         // log(polyPoints);
         if (draw) {
-            const drawList = collider._worldPoints.map(({ x, y }) => v2(x, GameWorld.Instance.app.screen.height - y));
+            const drawList = collider._worldPoints.map(({ x, y }) => Vec2(x, GameWorld.Instance.app.screen.height - y));
             draw.poly(drawList);
         }
         const listX = collider._worldPoints.map(({ x }) => x);

package/dist/collider/helper/Intersection.d.ts

@@ -1,7 +1,7 @@
-import { Point } from 'pixi.js';
-export declare function pointInPolygon(pos: Point, polygon: Point[]): boolean;
-export declare function pointLineDistance(point: Point, start: Point, end: Point, isSegment: any): number;
-export declare function polygonPolygon(pts1: Point[], pts2: Point[]): boolean;
-export declare function circleCircle(p1: Point, r1: number, p2: Point, r2: number): boolean;
-export declare function polygonCircle(pts1: Point[], p2: Point, r2: number): boolean;
+import { Vec2 } from '../..';
+export declare function pointInPolygon(pos: Vec2, polygon: Vec2[]): boolean;
+export declare function pointLineDistance(point: Vec2, start: Vec2, end: Vec2, isSegment: any): number;
+export declare function polygonPolygon(pts1: Vec2[], pts2: Vec2[]): boolean;
+export declare function circleCircle(p1: Vec2, r1: number, p2: Vec2, r2: number): boolean;
+export declare function polygonCircle(pts1: Vec2[], p2: Vec2, r2: number): boolean;
 //# sourceMappingURL=Intersection.d.ts.map

package/dist/collider/helper/Intersection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Intersection.d.ts","sourceRoot":"","sources":["../../../src/collider/helper/Intersection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAG/B,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,WAuB1D;AAmCD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,KAAA,UAwBlF;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,WA6B1D;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,WAGxE;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,WAejE"}
+{"version":3,"file":"Intersection.d.ts","sourceRoot":"","sources":["../../../src/collider/helper/Intersection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAE5B,wBAAgB,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,WAuBxD;AAmCD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,KAAA,UAwB/E;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,WA6BxD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,WAGtE;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,WAe/D"}

package/dist/collider/helper/Intersection.js

@@ -1,4 +1,4 @@
-import { getDistance, v2 } from '../../helper/utils';
+import { Vec2 } from '../..';
 export function pointInPolygon(pos, polygon) {
     let inside = false;
     const x = pos.x;
@@ -48,7 +48,7 @@ export function pointLineDistance(point, start, end, isSegment) {
     const t = ((point.x - start.x) * dx + (point.y - start.y) * dy) / d;
     let p;
     if (!isSegment) {
-        p = v2(start.x + t * dx, start.y + t * dy);
+        p = Vec2(start.x + t * dx, start.y + t * dy);
     }
     else if (d) {
         if (t < 0) {
@@ -58,7 +58,7 @@ export function pointLineDistance(point, start, end, isSegment) {
             p = end;
         }
         else {
-            p = v2(start.x + t * dx, start.y + t * dy);
+            p = Vec2(start.x + t * dx, start.y + t * dy);
         }
     }
     else {
@@ -93,7 +93,7 @@ export function polygonPolygon(pts1, pts2) {
     return false;
 }
 export function circleCircle(p1, r1, p2, r2) {
-    const d = getDistance(p1, p2);
+    const d = p1.distance(p2);
     return d < r1 + r2;
 }
 export function polygonCircle(pts1, p2, r2) {

package/dist/collider/index.d.ts

@@ -1,4 +1,5 @@
 export * from './CollideComponent';
 export * from './CollideSystem';
+export * from './helper/Intersection';
 export declare function setupCollider(colliderMatrix?: any, debug?: boolean): void;
 //# sourceMappingURL=index.d.ts.map

package/dist/collider/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/collider/index.ts"],"names":[],"mappings":"AAGA,cAAc,oBAAoB,CAAA;AAClC,cAAc,iBAAiB,CAAA;AAE/B,wBAAgB,aAAa,CAAC,cAAc,CAAC,KAAA,EAAE,KAAK,UAAQ,QAS3D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/collider/index.ts"],"names":[],"mappings":"AAGA,cAAc,oBAAoB,CAAA;AAClC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AAErC,wBAAgB,aAAa,CAAC,cAAc,CAAC,KAAA,EAAE,KAAK,UAAQ,QAS3D"}

package/dist/collider/index.js

@@ -2,6 +2,7 @@ import { GameWorld } from '..';
 import { CollideSystem, enabledDebugDraw } from './CollideSystem';
 export * from './CollideComponent';
 export * from './CollideSystem';
+export * from './helper/Intersection';
 export function setupCollider(colliderMatrix, debug = false) {
     GameWorld.Instance.systems.add(CollideSystem);
     GameWorld.Instance.listUpdate.push(CollideSystem);

package/dist/components/NodeComp.d.ts

@@ -1,37 +1,18 @@
-import { Constructor, Entity } from 'entityx-ts';
+import { ComponentType, Constructor, Entity } from 'entityx-ts';
 import { Action, Animation } from 'pixi-action-ease';
-import { Color, ColorSource, Container, Point } from 'pixi.js';
-import { ComponentType, EnhancedComponent } from '../base';
+import { ColorSource, Container, Point } from 'pixi.js';
+import { EnhancedComponent } from '..';
 import { Vec2 } from '../core';
 import { Size } from '../core/Size';
-export type EventCallbackType = (...args: any[]) => void;
-export interface EventMap {
-    [key: string]: [EventCallbackType];
-}
-type TouchEventCallback = (target: {
-    location: Vec2;
-}) => void;
 export declare class NodeComp<C extends Container = Container> {
     entity: Entity;
     instance: C;
-    events: EventMap;
-    data: {
-        [key: string]: any;
-    };
     parent: NodeComp;
     children: NodeComp[];
     actionsList: Animation[];
     name: string;
     private _group;
     private _active;
-    onTouchStart?: TouchEventCallback;
-    onTouchMove?: TouchEventCallback;
-    onTouchEnd?: TouchEventCallback;
-    onTouchCancel?: TouchEventCallback;
-    setOnTouchStart(cb: TouchEventCallback): void;
-    setOnTouchMove(cb: TouchEventCallback): void;
-    setOnTouchEnd(cb: TouchEventCallback): void;
-    setOnTouchCancel(cb: TouchEventCallback): void;
     constructor(instance: C, entity: Entity);
     get uuid(): number;
     get position(): Vec2;
@@ -78,16 +59,65 @@ export declare class NodeComp<C extends Container = Container> {
     getComponent<T extends Constructor<ComponentType>>(component: T): InstanceType<T>;
     getComponentsInChildren<T extends ComponentType>(component: Constructor<T>): T[];
     getComponentInChildren<T extends ComponentType>(component: Constructor<T>): T;
-    convertToNodeSpace(point: Vec2): Point;
-    convertToNodeSpaceAR(point: Vec2): Point;
-    convertToWorldSpaceAR(point: Vec2): Point;
-    getPosition(): Vec2;
-    setPosition(x: number | Point, y?: number): void;
-    setRotation(deg: number): void;
-    getRotation(): number;
-    getContentSize(): Size;
-    setColor(color: Color): void;
-    setScale(scaleX: number, scaleY?: number): void;
+    convertToNodeSpace(point: Vec2): {
+        x: number;
+        y: number;
+        equals(other: /*elided*/ any): boolean;
+        add(value: Point | Vec2): /*elided*/ any;
+        addSelf(value: Point | Vec2): /*elided*/ any;
+        sub(value: 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;
+    };
+    convertToNodeSpaceAR(point: Vec2): {
+        x: number;
+        y: number;
+        equals(other: /*elided*/ any): boolean;
+        add(value: Point | Vec2): /*elided*/ any;
+        addSelf(value: Point | Vec2): /*elided*/ any;
+        sub(value: 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;
+    };
+    convertToWorldSpaceAR(point: Vec2): {
+        x: number;
+        y: number;
+        equals(other: /*elided*/ any): boolean;
+        add(value: Point | Vec2): /*elided*/ any;
+        addSelf(value: Point | Vec2): /*elided*/ any;
+        sub(value: 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;
+    };
+    get contentSize(): Size;
+    set contentSize(size: Size);
     runAction(act: Action): void;
     stopAllActions(): void;
     pauseAllActions(): void;
@@ -97,12 +127,8 @@ export declare class NodeComp<C extends Container = Container> {
     addChild(child: NodeComp, zOrder?: number): void;
     destroyAllChildren(): void;
     removeAllChildren(): void;
-    on(name: string, callback: EventCallbackType, target?: any): void;
-    off(name: string): void;
-    emit(name: string, ...params: any): void;
     resolveComponent(component: EnhancedComponent<object, NodeComp>): void;
     getData<T>(key: string): T;
     setData<T>(key: string, value: T): void;
 }
-export {};
 //# sourceMappingURL=NodeComp.d.ts.map

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":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAC/D,OAAO,EAAE,MAAM,EAAiB,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACnE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAgB,MAAM,SAAS,CAAA;AAErE,OAAO,EAAE,iBAAiB,EAAe,MAAM,IAAI,CAAA;AACnD,OAAO,EAAe,IAAI,EAAE,MAAM,SAAS,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAInC,qBAAa,QAAQ,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS;IACnD,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,CAAC,CAAA;IACX,MAAM,EAAE,QAAQ,CAAA;IAChB,QAAQ,EAAE,QAAQ,EAAE,CAAK;IACzB,WAAW,EAAE,SAAS,EAAE,CAAK;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,MAAM,CAAI;IAClB,OAAO,CAAC,OAAO,CAAO;gBAEV,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM;IAOvC,IAAI,IAAI,WAEP;IAED,IAAI,QAAQ,IAAI,IAAI,CAEnB;IAED,IAAI,QAAQ,CAAC,GAAG,EAAE,IAAI,EAErB;IAED,IAAI,IAAI,IAIM,MAAM,CAFnB;IAED,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,EAEnB;IAED,IAAI,IAAI,IAIM,MAAM,CAFnB;IAED,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,EAEnB;IAED,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAE3B;IAED,IAAI,KAAK,IAIM,MAAM,CAFpB;IAED,IAAI,KAAK,CAAC,GAAG,EAAE,MAAM,EAEpB;IAED,IAAI,MAAM,IAIM,MAAM,CAFrB;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAErB;IAED,IAAI,MAAM,IAIM,MAAM,CAFrB;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAErB;IAED,IAAI,OAAO,IAKM,MAAM,CAFtB;IAED,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,EAEtB;IAED,IAAI,OAAO,IAKM,MAAM,CAFtB;IAED,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,EAEtB;IAED,6BAA6B;IAC7B,IAAI,QAAQ,IAIM,MAAM,CAFvB;IACD,6BAA6B;IAC7B,IAAI,QAAQ,CAAC,GAAG,EAAE,MAAM,EAEvB;IAED,2BAA2B;IAC3B,IAAI,KAAK,IAIM,MAAM,CAFpB;IACD,2BAA2B;IAC3B,IAAI,KAAK,CAAC,GAAG,EAAE,MAAM,EAEpB;IAED,IAAI,KAAK,IAMM,WAAW,CAFzB;IAED,IAAI,KAAK,CAAC,GAAG,EAAE,WAAW,EAGzB;IAED,IAAI,OAAO,IAIM,MAAM,CAFtB;IAED,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,EAEtB;IAED,IAAI,MAAM,IAUM,OAAO,CAFtB;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,OAAO,EAGtB;IAED,IAAI,KAAK,IAIM,MAAM,CAFpB;IAED,IAAI,KAAK,CAAC,GAAG,EAAE,MAAM,EAEpB;IAED,IAAI,KAAK,WAER;IAED,IAAI,KAAK,CAAC,GAAG,QAAA,EAEZ;IAED,IAAI,MAAM,WAET;IAED,IAAI,MAAM,CAAC,GAAG,QAAA,EAEb;IAED,IAAI,MAAM,WAET;IAED,IAAI,MAAM,CAAC,GAAG,QAAA,EAEb;IAED,IAAI,aAAa,WAEhB;IAED,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,QAAQ,KAAA,GAAG,CAAC;IAIlD,YAAY,CAAC,CAAC,SAAS,WAAW,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAIjF,uBAAuB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;IAUhF,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAI7E,kBAAkB,CAAC,KAAK,EAAE,IAAI;;;;;;;;;;;;;;;;;;;IAI9B,oBAAoB,CAAC,KAAK,EAAE,IAAI;;;;;;;;;;;;;;;;;;;IAIhC,qBAAqB,CAAC,KAAK,EAAE,IAAI;;;;;;;;;;;;;;;;;;;IAoBjC,IAAI,WAAW,IAAI,IAAI,CAEtB;IAED,IAAI,WAAW,CAAC,IAAI,EAAE,IAAI,EAEzB;IAED,SAAS,CAAC,GAAG,EAAE,MAAM;IAKrB,cAAc;IAOd,eAAe;IAMf,gBAAgB;IAMhB,OAAO;IAaP,gBAAgB;IAMhB,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM;IAQzC,kBAAkB;IAMlB,iBAAiB;IAMjB,gBAAgB,CAAC,SAAS,EAAE,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC;IAY/D,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC;IAM1B,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;CASjC"}