@safe-engine/pixi 8.4.6 → 8.5.1

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.getContentSize();
+            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) {
         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/components/NodeComp.js

@@ -260,7 +260,7 @@ export class NodeComp {
     }
     setScale(scaleX, scaleY) {
         this.instance.scale.x = scaleX;
-        this.instance.scale.x = scaleY || scaleX;
+        this.instance.scale.y = scaleY || scaleX;
     }
     runAction(act) {
         const animation = actionManager.runAction(this.instance, act);

package/dist/helper/utils.d.ts

@@ -1,11 +1,5 @@
 import { Constructor, EntityManager, EventManager } from 'entityx-ts';
-import { Point } from 'pixi.js';
 import { EnhancedComponent, GameWorld } from '../base';
-export declare function v2(x?: number | {
-    x: number;
-    y: number;
-}, y?: number): Point;
-export declare function getDistance(point1: Point, point2: Point): number;
 export declare function registerSystem<T extends EnhancedComponent<any>>(component: Constructor<T>): {
     new (): {
         configure(event_manager: EventManager<GameWorld>): void;

package/dist/helper/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/helper/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,YAAY,CAAC;AACxG,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAIvD,wBAAgB,EAAE,CAAC,CAAC,GAAE,MAAM,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAM,EAAE,CAAC,SAAI,SAKjE;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,UAIvD;AAED,wBAAgB,cAAc,CAAC,CAAC,SAAS,iBAAiB,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;;iCAK7D,YAAY,CAAC,SAAS,CAAC;yBAU/B,aAAa,UAAU,YAAY,CAAC,SAAS,CAAC,MAAM,MAAM;;EAe9E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/helper/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,YAAY,CAAA;AACvG,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAItD,wBAAgB,cAAc,CAAC,CAAC,SAAS,iBAAiB,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;;iCAK7D,YAAY,CAAC,SAAS,CAAC;yBAU/B,aAAa,UAAU,YAAY,CAAC,SAAS,CAAC,MAAM,MAAM;;EAe9E"}

package/dist/helper/utils.js

@@ -1,18 +1,6 @@
 import { EventTypes } from 'entityx-ts';
-import { Point } from 'pixi.js';
 import { GameWorld } from '../base';
 import { NodeComp } from '../components/NodeComp';
-export function v2(x = 0, y = 0) {
-    if (typeof x === 'object' && 'x' in x && 'y' in x) {
-        return new Point(x.x, x.y);
-    }
-    return new Point(x, y);
-}
-export function getDistance(point1, point2) {
-    const dx = point2.x - point1.x;
-    const dy = point2.y - point1.y;
-    return Math.sqrt(dx * dx + dy * dy);
-}
 export function registerSystem(component) {
     if (GameWorld.Instance.systems.isRegistered(`${component.name}System`)) {
         return;

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+export * from 'pixi-action-ease';
 export * from 'pixi.js';
 export * from './app';
 export * from './base';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA;AACrB,cAAc,QAAQ,CAAA;AACtB,cAAc,YAAY,CAAA;AAC1B,cAAc,gCAAgC,CAAA;AAC9C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,QAAQ,CAAA;AACtB,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,8BAA8B,CAAA;AAC5C,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,uBAAuB,CAAA;AACrC,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA;AACrB,cAAc,QAAQ,CAAA;AACtB,cAAc,YAAY,CAAA;AAC1B,cAAc,gCAAgC,CAAA;AAC9C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,QAAQ,CAAA;AACtB,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,8BAA8B,CAAA;AAC5C,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,uBAAuB,CAAA;AACrC,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA"}

package/dist/index.js

@@ -1,3 +1,4 @@
+export * from 'pixi-action-ease';
 export * from 'pixi.js';
 export * from './app';
 export * from './base';

package/{src/spine/lib/require-shim.ts → dist/spine/lib/assets/atlasLoader.d.ts}

@@ -26,18 +26,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE
  * SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
-
-declare global {
-  // var require: any;
-  var PIXI: any;
+import { TextureSource } from 'pixi.js';
+export interface ISpineAtlasMetadata {
+    imageMetadata?: any;
+    images?: TextureSource | string | Record<string, TextureSource | string>;
 }
-
-if (typeof window !== 'undefined' && window.PIXI) {
-  const prevRequire = window.require;
-  (window as any).require = (x: string) => {
-    if (prevRequire) return prevRequire(x);
-    else if (x.startsWith("@pixi/") || x.startsWith("pixi.js")) return window.PIXI;
-  };
-}
-
-export { };
+//# sourceMappingURL=atlasLoader.d.ts.map

package/dist/spine/lib/assets/atlasLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"atlasLoader.d.ts","sourceRoot":"","sources":["../../../../src/spine/lib/assets/atlasLoader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;+EA2B+E;AAE/E,OAAO,EAQN,aAAa,EACb,MAAM,SAAS,CAAC;AAiHjB,MAAM,WAAW,mBAAmB;IAEnC,aAAa,CAAC,EAAE,GAAG,CAAC;IAGpB,MAAM,CAAC,EAAE,aAAa,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,CAAC,CAAC;CACzE"}