@safe-engine/cocos 1.5.5 → 1.5.8

package/dist/box2d-wasm/ContactListener.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContactListener.d.ts","sourceRoot":"","sources":["../../src/box2d-wasm/ContactListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAG7B,KAAK,IAAI,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA;CAAE,CAAA;AACvC,eAAO,MAAM,mBAAmB,GAAI,OAAO,KAAK,CAAC,OAAO,EAAE,UAAU,IAAI,EAAE,OAAO,OAAO,KAAK;0BAWnE,KAAK,CAAC,SAAS,GAAG,MAAM,GAAG,IAAI;wBAwBjC,KAAK,CAAC,SAAS,GAAG,MAAM,GAAG,IAAI;sBAmBjC,KAAK,CAAC,SAAS,GAAG,MAAM,eAAe,KAAK,CAAC,UAAU,GAAG,MAAM,GAAG,IAAI;uBAGtE,KAAK,CAAC,SAAS,GAAG,MAAM,WAAW,KAAK,CAAC,gBAAgB,GAAG,MAAM,GAAG,IAAI;CAK/F,CAAA"}
+{"version":3,"file":"ContactListener.d.ts","sourceRoot":"","sources":["../../src/box2d-wasm/ContactListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAG7B,KAAK,IAAI,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA;CAAE,CAAA;AACvC,eAAO,MAAM,mBAAmB,GAAI,OAAO,KAAK,CAAC,OAAO,EAAE,UAAU,IAAI,EAAE,OAAO,OAAO,KAAK;0BAWnE,KAAK,CAAC,SAAS,GAAG,MAAM,GAAG,IAAI;wBAwBjC,KAAK,CAAC,SAAS,GAAG,MAAM,GAAG,IAAI;sBAmBjC,KAAK,CAAC,SAAS,GAAG,MAAM,eAAe,KAAK,CAAC,UAAU,GAAG,MAAM,GAAG,IAAI;uBAmBtE,KAAK,CAAC,SAAS,GAAG,MAAM,WAAW,KAAK,CAAC,gBAAgB,GAAG,MAAM,GAAG,IAAI;CAqB/F,CAAA"}

package/dist/box2d-wasm/ContactListener.js

@@ -1,10 +1,10 @@
-import { ColliderPhysics } from './PhysicsComponent';
+import { PhysicsCollider } from './PhysicsComponent';
 export const makeContactListener = (world, metadata, box2D) => {
     const { JSContactListener, getPointer, NULL } = box2D;
     function getContactById(contact) {
         for (let contactList = world.GetContactList(); getPointer(contactList) !== getPointer(NULL); contactList = contactList.GetNext()) {
             if (getPointer(contactList) === contact) {
-                console.log('contactBegin', contact, getPointer(contactList), getPointer(NULL));
+                // console.log('contactBegin', contact, getPointer(contactList), getPointer(NULL))
                 return contactList;
             }
         }
@@ -17,20 +17,20 @@ export const makeContactListener = (world, metadata, box2D) => {
             const ett1 = metadata[getPointer(contact.GetFixtureA().GetBody())];
             const ett2 = metadata[getPointer(contact.GetFixtureB().GetBody())];
             // world.addPostStepCallback(() => {
-            //   // log('addPostStepCallback');
             //   listRemoveShape.forEach((s) => world.removeShape(s))
             //   listRemoveBody.forEach((b) => world.removeBody(b))
             //   listRemoveBody = []
             //   listRemoveShape = []
             // })
-            const phys1 = ett1.getComponent(ColliderPhysics);
-            const phys2 = ett2.getComponent(ColliderPhysics);
+            const phys1 = ett1.getComponent(PhysicsCollider);
+            const phys2 = ett2.getComponent(PhysicsCollider);
+            // console.log('addPostStepCallback', ett1, phys1.props.onBeginContact, phys2.props)
             if (phys1 && phys2) {
-                if (Object.prototype.hasOwnProperty.call(phys1, 'onCollisionEnter')) {
-                    phys1.props.onCollisionEnter(phys2);
+                if (Object.prototype.hasOwnProperty.call(phys1.props, 'onBeginContact')) {
+                    phys1.props.onBeginContact(phys2);
                 }
-                if (Object.prototype.hasOwnProperty.call(phys2, 'onCollisionEnter')) {
-                    phys2.props.onCollisionEnter(phys1);
+                if (Object.prototype.hasOwnProperty.call(phys2.props, 'onBeginContact')) {
+                    phys2.props.onBeginContact(phys1);
                 }
             }
         },
@@ -41,23 +41,55 @@ export const makeContactListener = (world, metadata, box2D) => {
             const ett1 = metadata[getPointer(contact.GetFixtureA().GetBody())];
             const ett2 = metadata[getPointer(contact.GetFixtureB().GetBody())];
             // const event1 = ett1.getComponent(NodeComp)
-            const phys1 = ett1.getComponent(ColliderPhysics);
-            const phys2 = ett2.getComponent(ColliderPhysics);
+            const phys1 = ett1.getComponent(PhysicsCollider);
+            const phys2 = ett2.getComponent(PhysicsCollider);
             // const event2 = ett2.getComponent(NodeComp)
             if (phys1 && phys2) {
-                if (Object.prototype.hasOwnProperty.call(phys1, 'onCollisionExit')) {
-                    phys1.props.onCollisionExit(phys2);
+                if (Object.prototype.hasOwnProperty.call(phys1.props, 'onEndContact')) {
+                    phys1.props.onEndContact(phys2);
                 }
-                if (Object.prototype.hasOwnProperty.call(phys2, 'onCollisionExit')) {
-                    phys2.props.onCollisionExit(phys1);
+                if (Object.prototype.hasOwnProperty.call(phys2.props, 'onEndContact')) {
+                    phys2.props.onEndContact(phys1);
                 }
             }
         },
         PreSolve(contact, oldManifold) {
-            console.log('collisionSeparate');
+            if (typeof contact === 'number') {
+                contact = getContactById(contact);
+            }
+            const ett1 = metadata[getPointer(contact.GetFixtureA().GetBody())];
+            const ett2 = metadata[getPointer(contact.GetFixtureB().GetBody())];
+            // const event1 = ett1.getComponent(NodeComp)
+            const phys1 = ett1.getComponent(PhysicsCollider);
+            const phys2 = ett2.getComponent(PhysicsCollider);
+            // const event2 = ett2.getComponent(NodeComp)
+            if (phys1 && phys2) {
+                if (Object.prototype.hasOwnProperty.call(phys1.props, 'onPostSolve')) {
+                    phys1.props.onPostSolve(phys2, oldManifold);
+                }
+                if (Object.prototype.hasOwnProperty.call(phys2.props, 'onPostSolve')) {
+                    phys2.props.onPostSolve(phys1, oldManifold);
+                }
+            }
         },
         PostSolve(contact, impulse) {
-            console.log('collisionPost');
+            if (typeof contact === 'number') {
+                contact = getContactById(contact);
+            }
+            const ett1 = metadata[getPointer(contact.GetFixtureA().GetBody())];
+            const ett2 = metadata[getPointer(contact.GetFixtureB().GetBody())];
+            // const event1 = ett1.getComponent(NodeComp)
+            const phys1 = ett1.getComponent(PhysicsCollider);
+            const phys2 = ett2.getComponent(PhysicsCollider);
+            // const event2 = ett2.getComponent(NodeComp)
+            if (phys1 && phys2) {
+                if (Object.prototype.hasOwnProperty.call(phys1.props, 'onPostSolve')) {
+                    phys1.props.onPostSolve(phys2, impulse);
+                }
+                if (Object.prototype.hasOwnProperty.call(phys2.props, 'onPostSolve')) {
+                    phys2.props.onPostSolve(phys1, impulse);
+                }
+            }
         },
     });
     return listener;

package/dist/box2d-wasm/PhysicsComponent.d.ts

@@ -1,8 +1,9 @@
 import { NoRenderComponentX } from '../gworld/core/decorator';
 import { Vec2 } from '../polyfills';
+import { BaseComponentProps } from '../safex';
 import { PhysicsSprite } from './PhysicsSprite';
 interface RigidBodyProps {
-    type?: 'static' | 'dynamic';
+    type?: 0 | 1 | 2;
     density?: Float;
     restitution?: Float;
     friction?: Float;
@@ -11,40 +12,33 @@ interface RigidBodyProps {
 export declare class RigidBody extends NoRenderComponentX<RigidBodyProps> {
     body: Box2D.b2Body;
 }
-interface PhysicsMaterialProps {
-    friction?: number;
-    restitution?: number;
-    density?: number;
-}
-export declare class PhysicsMaterial extends NoRenderComponentX<PhysicsMaterialProps> {
-}
 interface ColliderPhysicsProps {
     tag?: number;
-    group?: number;
     offset?: Vec2;
-    onCollisionEnter?: (other: ColliderPhysics) => void;
-    onCollisionExit?: (other: ColliderPhysics) => void;
-    onCollisionStay?: (other: ColliderPhysics) => void;
+    onBeginContact?: (other: PhysicsCollider) => void;
+    onEndContact?: (other: PhysicsCollider) => void;
+    onPreSolve?: (other: PhysicsCollider, impulse?: any) => void;
+    onPostSolve?: (other: PhysicsCollider, oldManifold?: any) => void;
 }
-export declare class ColliderPhysics<T extends ColliderPhysicsProps = ColliderPhysicsProps> extends NoRenderComponentX<T, PhysicsSprite['node']> {
+export declare class PhysicsCollider extends NoRenderComponentX<ColliderPhysicsProps & BaseComponentProps<PhysicsCollider>> {
     enabled: boolean;
-    instance: PhysicsSprite;
+    physicSprite: PhysicsSprite;
 }
-interface BoxColliderPhysicsProps extends ColliderPhysicsProps {
+interface BoxColliderPhysicsProps {
     width: number;
     height: number;
 }
-export declare class BoxColliderPhysics extends ColliderPhysics<BoxColliderPhysicsProps> {
+export declare class PhysicsBoxCollider extends NoRenderComponentX<BoxColliderPhysicsProps & BaseComponentProps<PhysicsCollider>> {
 }
-interface CircleColliderPhysicsProps extends ColliderPhysicsProps {
+interface CircleColliderPhysicsProps {
     radius: number;
 }
-export declare class CircleColliderPhysics extends ColliderPhysics<CircleColliderPhysicsProps> {
+export declare class PhysicsCircleCollider extends NoRenderComponentX<CircleColliderPhysicsProps & BaseComponentProps<PhysicsCollider>> {
 }
-interface PolygonColliderPhysicsProps extends ColliderPhysicsProps {
-    points: Array<Vec2>;
+interface PolygonColliderPhysicsProps {
+    points: Array<Vec2> | [number, number][];
 }
-export declare class PolygonColliderPhysics extends ColliderPhysics<PolygonColliderPhysicsProps> {
+export declare class PhysicsPolygonCollider extends NoRenderComponentX<PolygonColliderPhysicsProps & BaseComponentProps<PhysicsCollider>> {
 }
 export {};
 //# sourceMappingURL=PhysicsComponent.d.ts.map

package/dist/box2d-wasm/PhysicsComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PhysicsComponent.d.ts","sourceRoot":"","sources":["../../src/box2d-wasm/PhysicsComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC3B,OAAO,CAAC,EAAE,KAAK,CAAA;IACf,WAAW,CAAC,EAAE,KAAK,CAAA;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAA;IAChB,YAAY,CAAC,EAAE,KAAK,CAAA;CACrB;AAED,qBAAa,SAAU,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IAC/D,IAAI,EAAE,KAAK,CAAC,MAAM,CAAA;CAmBnB;AAED,UAAU,oBAAoB;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AACD,qBAAa,eAAgB,SAAQ,kBAAkB,CAAC,oBAAoB,CAAC;CAAG;AAEhF,UAAU,oBAAoB;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,IAAI,CAAA;IACb,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAA;IACnD,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAA;IAClD,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAA;CACnD;AAED,qBAAa,eAAe,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,kBAAkB,CAAC,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACtI,OAAO,UAAO;IACd,QAAQ,EAAE,aAAa,CAAA;CACxB;AAED,UAAU,uBAAwB,SAAQ,oBAAoB;IAC5D,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,kBAAmB,SAAQ,eAAe,CAAC,uBAAuB,CAAC;CAS/E;AACD,UAAU,0BAA2B,SAAQ,oBAAoB;IAC/D,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,qBAAsB,SAAQ,eAAe,CAAC,0BAA0B,CAAC;CAAG;AACzF,UAAU,2BAA4B,SAAQ,oBAAoB;IAChE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;CACpB;AACD,qBAAa,sBAAuB,SAAQ,eAAe,CAAC,2BAA2B,CAAC;CAAG"}
+{"version":3,"file":"PhysicsComponent.d.ts","sourceRoot":"","sources":["../../src/box2d-wasm/PhysicsComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChB,OAAO,CAAC,EAAE,KAAK,CAAA;IACf,WAAW,CAAC,EAAE,KAAK,CAAA;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAA;IAChB,YAAY,CAAC,EAAE,KAAK,CAAA;CACrB;AAED,qBAAa,SAAU,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IAC/D,IAAI,EAAE,KAAK,CAAC,MAAM,CAAA;CAmBnB;AASD,UAAU,oBAAoB;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,IAAI,CAAA;IACb,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAA;IACjD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAA;IAC/C,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,EAAE,OAAO,CAAC,KAAA,KAAK,IAAI,CAAA;IACvD,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,EAAE,WAAW,CAAC,KAAA,KAAK,IAAI,CAAA;CAC7D;AAED,qBAAa,eAAgB,SAAQ,kBAAkB,CAAC,oBAAoB,GAAG,kBAAkB,CAAC,eAAe,CAAC,CAAC;IACjH,OAAO,UAAO;IACd,YAAY,EAAE,aAAa,CAAA;CAC5B;AAED,UAAU,uBAAuB;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,kBAAmB,SAAQ,kBAAkB,CAAC,uBAAuB,GAAG,kBAAkB,CAAC,eAAe,CAAC,CAAC;CASxH;AACD,UAAU,0BAA0B;IAClC,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,qBAAsB,SAAQ,kBAAkB,CAAC,0BAA0B,GAAG,kBAAkB,CAAC,eAAe,CAAC,CAAC;CAAG;AAClI,UAAU,2BAA2B;IACnC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CACzC;AACD,qBAAa,sBAAuB,SAAQ,kBAAkB,CAAC,2BAA2B,GAAG,kBAAkB,CAAC,eAAe,CAAC,CAAC;CAAG"}

package/dist/box2d-wasm/PhysicsComponent.js

@@ -2,15 +2,13 @@ import { NoRenderComponentX } from '../gworld/core/decorator';
 export class RigidBody extends NoRenderComponentX {
     body;
 }
-export class PhysicsMaterial extends NoRenderComponentX {
-}
-export class ColliderPhysics extends NoRenderComponentX {
+export class PhysicsCollider extends NoRenderComponentX {
     enabled = true;
-    instance;
+    physicSprite;
 }
-export class BoxColliderPhysics extends ColliderPhysics {
+export class PhysicsBoxCollider extends NoRenderComponentX {
 }
-export class CircleColliderPhysics extends ColliderPhysics {
+export class PhysicsCircleCollider extends NoRenderComponentX {
 }
-export class PolygonColliderPhysics extends ColliderPhysics {
+export class PhysicsPolygonCollider extends NoRenderComponentX {
 }

package/dist/box2d-wasm/PhysicsSprite.js

@@ -16,7 +16,7 @@ export class PhysicsSprite {
         const pos = Vec2(cc.lerp(this.node.x, this.physicsBody.GetPosition().x, dt * 10), cc.lerp(this.node.y, this.physicsBody.GetPosition().y, dt * 10));
         this.node.setPosition(pos.x, pos.y);
         // lerp the rotation
-        this.node.setRotation(cc.lerp(this.node.rotation, cc.radiansToDegrees(this.physicsBody.GetAngle()), dt * 10));
+        this.node.setRotation(cc.lerp(this.node.rotation, cc.radiansToDegrees(-this.physicsBody.GetAngle()), dt * 10));
         // this.node.setRotation(cc.radiansToDegrees(this.physicsBody.GetAngle()))
         // this.node.setScale(1 / pixelsPerMeter)
         // this.node.setScale(1 / this.physicsBody.GetFixtureList().GetShape().GetRadius())
@@ -37,13 +37,13 @@ export class PhysicsSprite {
         return this.physicsBody.GetPosition().x;
     }
     get y() {
-        return this.physicsBody.GetPosition().x;
+        return this.physicsBody.GetPosition().y;
     }
     // set angle(val: number) {
     //   this.physicsBody.setAngle(val)
     // }
     get angle() {
-        return this.physicsBody.GetAngle();
+        return -this.physicsBody.GetAngle();
     }
     addChild(child) {
         this.node.addChild(child);

package/dist/box2d-wasm/PhysicsSystem.d.ts

@@ -1,4 +1,7 @@
 import { EntityManager, EventManager, System } from 'entityx-ts';
+export declare const DynamicBody = 2;
+export declare const KinematicBody = 1;
+export declare const StaticBody = 0;
 export declare let box2D: typeof Box2D;
 export declare function initBox2d(cb: any): void;
 export declare function setColliderMatrix(colliderMatrix?: boolean[][]): void;

package/dist/box2d-wasm/PhysicsSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PhysicsSystem.d.ts","sourceRoot":"","sources":["../../src/box2d-wasm/PhysicsSystem.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAe5E,eAAO,IAAI,KAAK,EAAE,OAAO,KAAK,CAAA;AAE9B,wBAAgB,SAAS,CAAC,EAAE,KAAA,QAK3B;AASD,wBAAgB,iBAAiB,CAAC,cAAc,cAAW,QAG1D;AAOD,qBAAa,aAAc,YAAW,MAAM;IAC1C,KAAK,EAAE,KAAK,CAAC,OAAO,CAAA;IACpB,cAAc,EAAE,KAAK,CAAC,MAAM,EAAE,CAAK;IACnC,eAAe,EAAE,KAAK,CAAC,OAAO,EAAE,CAAK;IACrC,cAAc,cAAW;IACzB,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAA;IAErB,SAAS,CAAC,aAAa,EAAE,YAAY;IA6ErC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;IAwBhE,IAAI,OAAO,CAAC,GAAG,KAAA,EAMd;CACF"}
+{"version":3,"file":"PhysicsSystem.d.ts","sourceRoot":"","sources":["../../src/box2d-wasm/PhysicsSystem.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAQ5E,eAAO,MAAM,WAAW,IAAI,CAAA;AAC5B,eAAO,MAAM,aAAa,IAAI,CAAA;AAC9B,eAAO,MAAM,UAAU,IAAI,CAAA;AAC3B,eAAO,IAAI,KAAK,EAAE,OAAO,KAAK,CAAA;AAE9B,wBAAgB,SAAS,CAAC,EAAE,KAAA,QAK3B;AASD,wBAAgB,iBAAiB,CAAC,cAAc,cAAW,QAG1D;AAOD,qBAAa,aAAc,YAAW,MAAM;IAC1C,KAAK,EAAE,KAAK,CAAC,OAAO,CAAA;IACpB,cAAc,EAAE,KAAK,CAAC,MAAM,EAAE,CAAK;IACnC,eAAe,EAAE,KAAK,CAAC,OAAO,EAAE,CAAK;IACrC,cAAc,cAAW;IACzB,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAA;IAErB,SAAS,CAAC,aAAa,EAAE,YAAY;IA8KrC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;IAwBhE,IAAI,OAAO,CAAC,GAAG,KAAA,EAMd;CACF"}

package/dist/box2d-wasm/PhysicsSystem.js

@@ -1,10 +1,13 @@
 import Box2DFactory from 'box2d-wasm';
 import { EventTypes } from 'entityx-ts';
-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, PhysicsCollider, PhysicsPolygonCollider, RigidBody } from './PhysicsComponent';
 import { PhysicsSprite } from './PhysicsSprite';
+export const DynamicBody = 2;
+export const KinematicBody = 1;
+export const StaticBody = 0;
 export let box2D;
 export function initBox2d(cb) {
     Box2DFactory().then((b2) => {
@@ -34,7 +37,7 @@ export class PhysicsSystem {
     colliderMatrix = [[true]];
     graphics;
     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 PhysicsSystem world', this.world);
@@ -47,26 +50,27 @@ export class PhysicsSystem {
         const debugDraw = makeDebugDraw(graphics, pixelsPerMeter, box2D);
         this.world.SetDebugDraw(debugDraw);
         // 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 }) => {
+            console.log('ComponentAddedEvent PhysicsBoxCollider', component);
             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?.props || {};
+            let physicsCollide = entity.getComponent(PhysicsCollider);
+            if (!physicsCollide) {
+                physicsCollide = instantiate(PhysicsCollider);
+                entity.assign(physicsCollide);
+            }
+            const { type = StaticBody, gravityScale = 1, density = 1, friction = 0.5, restitution = 0.3 } = rigidBody.props;
             const box = component;
             const node = entity.getComponent(NodeComp);
-            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 { width, height } = box.props;
+            const { x = 0, y = 0 } = physicsCollide.props.offset || {};
+            const zero = new b2Vec2(x, y);
             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);
@@ -87,18 +91,112 @@ export class PhysicsSystem {
             body.SetAwake(true);
             body.SetEnabled(true);
             metadata[getPointer(body)] = node;
-            const physicsCollide = entity.assign(instantiate(ColliderPhysics, colliderProps));
-            physicsCollide.instance = physicsNode;
+            physicsCollide.physicSprite = physicsNode;
             physicsCollide.node = node;
             box.node = node;
         });
-        event_manager.subscribe(EventTypes.ComponentAdded, CircleColliderPhysics, () => { });
-        event_manager.subscribe(EventTypes.ComponentAdded, PolygonColliderPhysics, () => { });
-        event_manager.subscribe(EventTypes.ComponentRemoved, NodeComp, ({ entity }) => {
-            // log('ComponentRemovedEvent NodeComp', event);
+        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);
+            }
+            let physicsCollide = entity.getComponent(PhysicsCollider);
+            if (!physicsCollide) {
+                physicsCollide = instantiate(PhysicsCollider);
+                entity.assign(physicsCollide);
+            }
+            const { type = StaticBody, gravityScale = 1, density = 1, friction = 0.5, restitution = 0.3 } = rigidBody.props;
             const node = entity.getComponent(NodeComp);
-            if (node.instance instanceof PhysicsSprite) {
-                const body = node.instance.getBody();
+            const { radius } = component.props;
+            const { x = 0, y = 0 } = physicsCollide.props.offset || {};
+            const zero = new b2Vec2(x, y);
+            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);
+            const fixtureDef = new b2FixtureDef();
+            fixtureDef.set_shape(circleShape);
+            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;
+            physicsCollide.physicSprite = physicsNode;
+            physicsCollide.node = node;
+            component.node = node;
+        });
+        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);
+            }
+            let physicsCollide = entity.getComponent(PhysicsCollider);
+            if (!physicsCollide) {
+                physicsCollide = instantiate(PhysicsCollider);
+                entity.assign(physicsCollide);
+            }
+            const { type = StaticBody, gravityScale = 1, density = 1, friction = 0.5, restitution = 0.3 } = rigidBody.props;
+            const node = entity.getComponent(NodeComp);
+            const { points } = component.props;
+            // ett.assign(instantiate(PhysicsCollider, { tag, offset }))
+            const { x = 0, y = 0 } = physicsCollide.props.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);
+            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);
+            body.CreateFixture(fixtureDef);
+            body.SetTransform(position, 0);
+            body.SetLinearVelocity(zero);
+            body.SetAwake(true);
+            body.SetEnabled(true);
+            metadata[getPointer(body)] = node;
+            physicsCollide.physicSprite = physicsNode;
+            physicsCollide.node = node;
+            component.node = node;
+        });
+        event_manager.subscribe(EventTypes.ComponentRemoved, PhysicsCollider, ({ 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);
             }

package/dist/gworld/systems/GUISystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GUISystem.d.ts","sourceRoot":"","sources":["../../../src/gworld/systems/GUISystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,EAAE,MAAM,YAAY,CAAA;AAiBlG,qBAAa,SAAU,YAAW,MAAM;IACtC,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,aAAa,EAAE,YAAY;IAWrC,OAAO,CAAC,eAAe,CAuBtB;IAED,OAAO,CAAC,sBAAsB,CAa7B;IAED,OAAO,CAAC,cAAc,CAMrB;IAED,OAAO,CAAC,qBAAqB,CAM5B;IAED,OAAO,CAAC,oBAAoB,CAM3B;IAED,OAAO,CAAC,mBAAmB,CAU1B;IAED,OAAO,CAAC,yBAAyB,CAOhC;IAED,OAAO,CAAC,cAAc,CAWrB;IAED,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAIjE"}
+{"version":3,"file":"GUISystem.d.ts","sourceRoot":"","sources":["../../../src/gworld/systems/GUISystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,EAAE,MAAM,YAAY,CAAA;AAiBlG,qBAAa,SAAU,YAAW,MAAM;IACtC,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,aAAa,EAAE,YAAY;IAWrC,OAAO,CAAC,eAAe,CAuBtB;IAED,OAAO,CAAC,sBAAsB,CAc7B;IAED,OAAO,CAAC,cAAc,CAMrB;IAED,OAAO,CAAC,qBAAqB,CAM5B;IAED,OAAO,CAAC,oBAAoB,CAM3B;IAED,OAAO,CAAC,mBAAmB,CAU1B;IAED,OAAO,CAAC,yBAAyB,CAOhC;IAED,OAAO,CAAC,cAAc,CAWrB;IAED,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAIjE"}

package/dist/gworld/systems/GUISystem.js

@@ -40,8 +40,9 @@ export class GUISystem {
         touchComp.props.onTouchCancel = touchComp.props.onTouchEnd;
     };
     onAddProgressTimerComp = ({ entity, component: bar }) => {
-        const { spriteFrame, fillType = FillType.HORIZONTAL, fillRange = 1, fillCenter = Vec2(1, 0) } = bar.props;
-        const sprite = new cc.Sprite(spriteFrame);
+        const { spriteFrame, fillType = FillType.HORIZONTAL, fillRange = 1, fillCenter = Vec2(0, 0) } = bar.props;
+        const frame = cc.spriteFrameCache.getSpriteFrame(spriteFrame);
+        const sprite = new cc.Sprite(frame || spriteFrame);
         const pTimer = new cc.ProgressTimer(sprite);
         const ptt = fillType === FillType.RADIAL ? cc.ProgressTimer.TYPE_RADIAL : cc.ProgressTimer.TYPE_BAR;
         pTimer.setType(ptt);

package/dist/gworld/systems/RenderSystem.js

@@ -31,7 +31,7 @@ export class RenderSystem {
         const { spriteFrame } = spriteComp.props;
         const frame = cc.spriteFrameCache.getSpriteFrame(spriteFrame);
         // console.log('frame', spriteFrame, frame)
-        const node = new cc.Sprite(frame);
+        const node = new cc.Sprite(frame || spriteFrame);
         const ett = entity;
         spriteComp.node = ett.assign(new NodeComp(node, ett));
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@safe-engine/cocos",
-  "version": "1.5.5",
+  "version": "1.5.8",
   "description": "safe-engine with cocos renderer support",
   "type": "module",
   "main": "dist/index.js",