@safe-engine/cocos 1.6.5 → 1.7.1

package/dist/app.d.ts

@@ -6,10 +6,10 @@ interface RunOptions {
     id: string;
     renderMode: 0 | 1 | 2;
 }
-export declare function startGame(option: RunOptions, { width, height }: {
+export declare function startGame(defaultFont: string, { width, height }: {
     width: any;
     height: any;
-}, cb: () => void): void;
+}, option?: Partial<RunOptions>): Promise<void>;
 export declare function loadAll(assets: string[], cb: (progress: number) => void): void;
 export declare function loadJsonFromCache<T>(filePath: string): T;
 export declare const audioEngine: typeof cc.audioEngine;

package/dist/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAMA,wBAAgB,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,QAc7C;AACD,UAAU,UAAU;IAClB,SAAS,EAAE,CAAC,GAAG,CAAC,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CACtB;AACD,wBAAgB,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;;;CAAA,EAAE,EAAE,EAAE,MAAM,IAAI,QA+B9E;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAO,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,QA4B5E;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAIxD;AAED,eAAO,MAAM,WAAW,uBAAiB,CAAA"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAMA,wBAAgB,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,QAc7C;AACD,UAAU,UAAU;IAClB,SAAS,EAAE,CAAC,GAAG,CAAC,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CACtB;AACD,wBAAsB,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;;;CAAA,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,iBAwCnG;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAO,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,QA4B5E;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAIxD;AAED,eAAO,MAAM,WAAW,uBAAiB,CAAA"}

package/dist/app.js

@@ -18,33 +18,43 @@ export function initWorld(defaultFont) {
         guiSystem.defaultFont = defaultFont;
     }
 }
-export function startGame(option, { width, height }, cb) {
-    class BootScene extends cc.Scene {
-        constructor() {
-            super();
-            super.ctor(); // always call this for compatibility with cocos2dx JS Javascript class system
-            this.scheduleUpdate();
+export async function startGame(defaultFont, { width, height }, option) {
+    return new Promise((resolve) => {
+        class BootScene extends cc.Scene {
+            constructor() {
+                super();
+                super.ctor(); // always call this for compatibility with cocos2dx JS Javascript class system
+                this.scheduleUpdate();
+            }
+            onEnter() {
+                super.onEnter();
+                initWorld(defaultFont);
+                resolve();
+            }
+            update(dt) {
+                GameWorld.Instance.update(dt);
+            }
         }
-        onEnter() {
-            super.onEnter();
-            cb();
-        }
-        update(dt) {
-            GameWorld.Instance.update(dt);
-        }
-    }
-    cc._isContextMenuEnable = true;
-    cc.game.run(option, function onStart() {
-        // Pass true to enable retina display, disabled by default to improve performance
-        cc.view.enableRetina(cc.sys.os === cc.sys.OS_IOS);
-        // Adjust viewport meta
-        cc.view.adjustViewPort(true);
-        // Setup the resolution policy and design resolution size
-        const policy = width > height ? cc.ResolutionPolicy.FIXED_HEIGHT : cc.ResolutionPolicy.FIXED_WIDTH;
-        cc.view.setDesignResolutionSize(width, height, policy);
-        // The game will be resized when browser size change
-        cc.view.resizeWithBrowserSize(true);
-        cc.director.runScene(new BootScene());
+        cc._isContextMenuEnable = true;
+        cc.game.run({
+            debugMode: 1,
+            showFPS: false,
+            frameRate: 60,
+            id: 'gameCanvas',
+            renderMode: 1,
+            ...option || {},
+        }, function onStart() {
+            // Pass true to enable retina display, disabled by default to improve performance
+            cc.view.enableRetina(cc.sys.os === cc.sys.OS_IOS);
+            // Adjust viewport meta
+            cc.view.adjustViewPort(true);
+            // Setup the resolution policy and design resolution size
+            const policy = width > height ? cc.ResolutionPolicy.FIXED_HEIGHT : cc.ResolutionPolicy.FIXED_WIDTH;
+            cc.view.setDesignResolutionSize(width, height, policy);
+            // The game will be resized when browser size change
+            cc.view.resizeWithBrowserSize(true);
+            cc.director.runScene(new BootScene());
+        });
     });
 }
 export function loadAll(assets = [], cb) {

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

@@ -20,6 +20,8 @@ export declare class RigidBody extends NoRenderComponentX<RigidBodyProps> {
     physicSprite: PhysicsSprite;
     set linearVelocity(vel: Vec2);
     get linearVelocity(): Vec2;
+    applyForceToCenter(vel: Vec2): void;
+    applyLinearImpulseToCenter(vel: Vec2): void;
     set position(pos: Vec2);
     get position(): Vec2;
 }

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,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAG/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;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAA;IAC3C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAA;IACzC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,KAAA,KAAK,IAAI,CAAA;IACjD,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,CAAC,KAAA,KAAK,IAAI,CAAA;CACvD;AAED,qBAAa,SAAU,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IAC/D,IAAI,EAAE,KAAK,CAAC,MAAM,CAAA;IAClB,YAAY,EAAE,aAAa,CAAA;IAC3B,IAAI,cAAc,CAAC,GAAG,EAAE,IAAI,EAK3B;IAED,IAAI,cAAc,IAPM,IAAI,CAa3B;IAED,IAAI,QAAQ,CAAC,GAAG,EAAE,IAAI,EASrB;IAED,IAAI,QAAQ,IAXM,IAAI,CAarB;CACF;AAED,UAAU,uBAAuB;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,kBAAmB,SAAQ,kBAAkB,CAAC,uBAAuB,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;CAS3H;AACD,UAAU,0BAA0B;IAClC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,qBAAsB,SAAQ,kBAAkB,CAAC,0BAA0B,GAAG,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;CAAG;AACxI,UAAU,2BAA2B;IACnC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;IACxC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,sBAAuB,SAAQ,kBAAkB,CAAC,2BAA2B,GAAG,kBAAkB,CAAC,sBAAsB,CAAC,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;AAG/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;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAA;IAC3C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAA;IACzC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,KAAA,KAAK,IAAI,CAAA;IACjD,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,CAAC,KAAA,KAAK,IAAI,CAAA;CACvD;AAED,qBAAa,SAAU,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IAC/D,IAAI,EAAE,KAAK,CAAC,MAAM,CAAA;IAClB,YAAY,EAAE,aAAa,CAAA;IAC3B,IAAI,cAAc,CAAC,GAAG,EAAE,IAAI,EAK3B;IAED,IAAI,cAAc,IAPM,IAAI,CAa3B;IAED,kBAAkB,CAAC,GAAG,EAAE,IAAI;IAO5B,0BAA0B,CAAC,GAAG,EAAE,IAAI;IAQpC,IAAI,QAAQ,CAAC,GAAG,EAAE,IAAI,EASrB;IAED,IAAI,QAAQ,IAXM,IAAI,CAarB;CACF;AAED,UAAU,uBAAuB;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,kBAAmB,SAAQ,kBAAkB,CAAC,uBAAuB,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;CAS3H;AACD,UAAU,0BAA0B;IAClC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,qBAAsB,SAAQ,kBAAkB,CAAC,0BAA0B,GAAG,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;CAAG;AACxI,UAAU,2BAA2B;IACnC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;IACxC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,sBAAuB,SAAQ,kBAAkB,CAAC,2BAA2B,GAAG,kBAAkB,CAAC,sBAAsB,CAAC,CAAC;CAAG"}

package/dist/box2d-wasm/PhysicsComponent.js

@@ -8,20 +8,33 @@ export class RigidBody extends NoRenderComponentX {
         if (!this.node) {
             return;
         }
-        this.physicSprite.getBody().SetLinearVelocity(new box2D.b2Vec2(vel.x, vel.y));
+        this.body.SetLinearVelocity(new box2D.b2Vec2(vel.x, vel.y));
     }
     get linearVelocity() {
         if (!this.node) {
             return Vec2.ZERO;
         }
-        const vel = this.physicSprite.getBody().GetLinearVelocity();
+        const vel = this.body.GetLinearVelocity();
         return Vec2(vel);
     }
+    applyForceToCenter(vel) {
+        if (!this.node) {
+            return;
+        }
+        this.body.ApplyForceToCenter(new box2D.b2Vec2(vel.x, vel.y), true);
+    }
+    applyLinearImpulseToCenter(vel) {
+        if (!this.node) {
+            return;
+        }
+        // console.log('applyLinearImpulseToCenter', new box2D.b2Vec2(vel.x, vel.y))
+        this.body.ApplyLinearImpulseToCenter(new box2D.b2Vec2(vel.x, vel.y), true);
+    }
     set position(pos) {
         this.physicSprite.node.setPosition(pos.x, pos.y);
         const physicsPos = new box2D.b2Vec2(pos.x, pos.y);
         // console.log('SetTransform', pos, physicsPos)
-        const body = this.physicSprite.getBody();
+        const body = this.body;
         body.SetLinearVelocity(new box2D.b2Vec2(0, 0));
         body.SetAngularVelocity(0);
         body.SetAwake(true);

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

@@ -4,6 +4,7 @@ export declare class PhysicsSprite {
     constructor(node: cc.Node, body: Box2D.b2Body);
     update(dt: number): void;
     getBody(): Box2D.b2Body;
+    set position(val: Box2D.b2Vec2);
     get x(): number;
     get y(): number;
     get angle(): number;

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

@@ -1 +1 @@
-{"version":3,"file":"PhysicsSprite.d.ts","sourceRoot":"","sources":["../../src/box2d-wasm/PhysicsSprite.ts"],"names":[],"mappings":"AAEA,qBAAa,aAAa;IACxB,IAAI,EAAE,EAAE,CAAC,IAAI,CAAA;IACb,WAAW,EAAE,KAAK,CAAC,MAAM,CAAA;gBAEb,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM;IAM7C,MAAM,CAAC,EAAE,EAAE,MAAM;IAkBjB,OAAO;IAeP,IAAI,CAAC,WAEJ;IAED,IAAI,CAAC,WAEJ;IAMD,IAAI,KAAK,WAER;IAED,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI;CAGxB"}
+{"version":3,"file":"PhysicsSprite.d.ts","sourceRoot":"","sources":["../../src/box2d-wasm/PhysicsSprite.ts"],"names":[],"mappings":"AAEA,qBAAa,aAAa;IACxB,IAAI,EAAE,EAAE,CAAC,IAAI,CAAA;IACb,WAAW,EAAE,KAAK,CAAC,MAAM,CAAA;gBAEb,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM;IAK7C,MAAM,CAAC,EAAE,EAAE,MAAM;IAkBjB,OAAO;IAIP,IAAI,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,EAE7B;IASD,IAAI,CAAC,WAEJ;IAED,IAAI,CAAC,WAEJ;IAMD,IAAI,KAAK,WAER;IAED,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI;CAGxB"}

package/dist/box2d-wasm/PhysicsSprite.js

@@ -5,7 +5,6 @@ export class PhysicsSprite {
     constructor(node, body) {
         this.node = node;
         this.physicsBody = body;
-        this.node.schedule(this.update.bind(this), 0, cc.REPEAT_FOREVER, 0);
     }
     update(dt) {
         if (!this.physicsBody) {
@@ -24,9 +23,9 @@ export class PhysicsSprite {
     getBody() {
         return this.physicsBody;
     }
-    // set position(val: Box2D.b2Vec2) {
-    //   this.physicsBody.setPosition(val)
-    // }
+    set position(val) {
+        this.physicsBody.SetTransform(val, this.node.rotation);
+    }
     // set x(val) {
     //   this.physicsBody.setPosition(Vec2(val, this.y))
     // }

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

@@ -4,12 +4,11 @@ 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 initBox2d(): Promise<void>;
 export declare function setColliderMatrix(colliderMatrix?: boolean[][]): void;
 export declare class PhysicsSystem implements System {
     world: Box2D.b2World;
     listRemoveBody: Box2D.b2Body[];
-    listRemoveShape: Box2D.b2Shape[];
     colliderMatrix: boolean[][];
     graphics: cc.DrawNode;
     addDebug(): 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,OAAO,EAAoC,IAAI,EAAE,MAAM,IAAI,CAAA;AAM3D,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,QAAQ;IAKR,SAAS,CAAC,aAAa,EAAE,YAAY;IA4JrC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;IAwBhE,IAAI,OAAO,CAAC,GAAG,EAAE,IAAI,EAIpB;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;AAE5E,OAAO,EAAoC,IAAI,EAAE,MAAM,IAAI,CAAA;AAM3D,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;AAC9B,wBAAsB,SAAS,kBAE9B;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;IAEnC,cAAc,cAAW;IACzB,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAA;IAErB,QAAQ;IAKR,SAAS,CAAC,aAAa,EAAE,YAAY;IA4JrC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;IA8BhE,IAAI,OAAO,CAAC,GAAG,EAAE,IAAI,EAIpB;CACF"}

package/dist/box2d-wasm/PhysicsSystem.js

@@ -9,11 +9,8 @@ export const DynamicBody = 2;
 export const KinematicBody = 1;
 export const StaticBody = 0;
 export let box2D;
-export function initBox2d(cb) {
-    Box2DFactory().then((b2) => {
-        box2D = b2;
-        cb();
-    });
+export async function initBox2d() {
+    box2D = await Box2DFactory();
 }
 // Box2D.b2Fixture.prototype.shouldCollide = function (other) {
 //   const nodeThis: NodeComp = this.getBody().getUserData()
@@ -26,14 +23,14 @@ export function setColliderMatrix(colliderMatrix = [[true]]) {
     physicsSystem.colliderMatrix = colliderMatrix;
 }
 const maxTimeStep = 1 / 60;
-const velocityIterations = 1;
-const positionIterations = 1;
+const velocityIterations = 8;
+const positionIterations = 3;
 const metadata = {};
 const pixelsPerMeter = 1;
 export class PhysicsSystem {
     world;
     listRemoveBody = [];
-    listRemoveShape = [];
+    // listRemoveShape: Box2D.b2Shape[] = []
     colliderMatrix = [[true]];
     graphics;
     addDebug() {
@@ -44,34 +41,32 @@ export class PhysicsSystem {
         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);
+        // console.log('configure PhysicsSystem world', this.world)
         const graphics = new cc.DrawNode();
         this.graphics = graphics;
         graphics.zIndex = 1000;
         const scene = cc.director.getRunningScene();
         scene.addChild(graphics);
-        event_manager.subscribe(EventTypes.ComponentAdded, PhysicsBoxCollider, ({ entity, component }) => {
+        event_manager.subscribe(EventTypes.ComponentAdded, PhysicsBoxCollider, ({ entity, component: box }) => {
             // console.log('ComponentAddedEvent PhysicsBoxCollider', component)
             let rigidBody = entity.getComponent(RigidBody);
-            const box = component;
-            const { width, height, offset = [] } = box.props;
-            const node = entity.getComponent(NodeComp);
-            const zero = new b2Vec2(0, 0);
             if (!rigidBody) {
                 rigidBody = instantiate(RigidBody);
                 entity.assign(rigidBody);
-                const { type = StaticBody, gravityScale = 1 } = rigidBody.props;
-                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;
-                const physicsNode = new PhysicsSprite(node.instance, rigidBody.body);
-                rigidBody.physicSprite = physicsNode;
-                rigidBody.node = node;
             }
-            const { density = 1, friction = 0.5, restitution = 0.3 } = rigidBody.props;
+            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 zero = new b2Vec2(0, 0);
+            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;
+            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 position = new b2Vec2(node.posX, node.posY);
@@ -83,6 +78,7 @@ export class PhysicsSystem {
             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);
@@ -98,7 +94,7 @@ export class PhysicsSystem {
                 rigidBody = instantiate(RigidBody);
                 entity.assign(rigidBody);
             }
-            const { type = StaticBody, gravityScale = 1, density = 1, friction = 0.5, restitution = 0.3 } = rigidBody.props;
+            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;
@@ -119,6 +115,7 @@ export class PhysicsSystem {
             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);
@@ -138,7 +135,7 @@ export class PhysicsSystem {
                 rigidBody = instantiate(RigidBody);
                 entity.assign(rigidBody);
             }
-            const { type = StaticBody, gravityScale = 1, density = 1, friction = 0.5, restitution = 0.3 } = rigidBody.props;
+            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;
@@ -170,9 +167,10 @@ export class PhysicsSystem {
             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.SetLinearVelocity(zero)
             body.SetAwake(true);
             body.SetEnabled(true);
             metadata[getPointer(body)] = node;
@@ -194,6 +192,12 @@ export class PhysicsSystem {
     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) {
@@ -206,7 +210,7 @@ export class PhysicsSystem {
             //   }
             // })
             this.listRemoveBody = [];
-            this.listRemoveShape = [];
+            // this.listRemoveShape = []
             const clampedDelta = Math.min(dt, maxTimeStep);
             this.world.Step(clampedDelta, velocityIterations, positionIterations);
             this.graphics.clear();

package/dist/gworld/components/AnimationComponent.d.ts

@@ -1,4 +1,4 @@
-import { EnhancedComponent } from './EnhancedComponent';
+import { EnhancedComponent } from '../gworld/components/EnhancedComponent';
 export declare namespace AnimationClip {
     interface IEvent {
         frame: number;
@@ -61,5 +61,5 @@ export declare class AnimationComp extends EnhancedComponent {
     resume(): void;
     stop(name?: string): void;
 }
-export {};
+export { };
 //# sourceMappingURL=AnimationComponent.d.ts.map

package/dist/gworld/components/CollideComponent.d.ts

@@ -1,5 +1,5 @@
-import { NoRenderComponentX } from '../gworld/core/decorator';
-import { Vec2 } from '../polyfills';
+import { Vec2 } from '../../polyfills';
+import { NoRenderComponentX } from '../core/decorator';
 interface ColliderProps {
     offset?: Vec2;
     tag?: number;
@@ -60,5 +60,5 @@ export declare class Contract {
     updateState(): CollisionType;
     test(): any;
 }
-export { };
+export {};
 //# sourceMappingURL=CollideComponent.d.ts.map

package/dist/gworld/systems/CollideSystem.d.ts

@@ -1,6 +1,5 @@
 import { EntityManager, EventManager, System } from 'entityx-ts';
-import { Collider, Contract } from '../../collider/CollideComponent';
-export declare function shouldCollider(colA: Collider, colB: Collider): any;
+import { Collider, Contract } from '../components/CollideComponent';
 export declare class CollideSystem implements System {
     listColliders: Collider[];
     _contracts: Contract[];

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

@@ -1 +1 @@
-{"version":3,"file":"CollideSystem.d.ts","sourceRoot":"","sources":["../../../src/gworld/systems/CollideSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAG5E,OAAO,EAA+B,QAAQ,EAAiB,QAAQ,EAAmB,MAAM,gCAAgC,CAAA;AAGhI,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,OAQ5D;AAED,qBAAa,aAAc,YAAW,MAAM;IAC1C,aAAa,EAAE,QAAQ,EAAE,CAAK;IAC9B,UAAU,EAAE,QAAQ,EAAE,CAAK;IAC3B,eAAe,QAAK;IACpB,aAAa,EAAE,EAAE,CAAC,QAAQ,CAAA;IAC1B,gBAAgB,UAAQ;IACxB,OAAO,UAAO;IACd,cAAc,cAAW;IAEzB,SAAS,CAAC,aAAa,EAAE,YAAY;IASrC,OAAO,CAAC,aAAa,CAOpB;IAED,OAAO,CAAC,gBAAgB,CAEvB;IAED,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;IA2GhE,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAS9B,cAAc,CAAC,QAAQ,EAAE,QAAQ;IAIjC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK;IAK3B,eAAe,CAAC,MAAM,UAAO;CAI9B"}
+{"version":3,"file":"CollideSystem.d.ts","sourceRoot":"","sources":["../../../src/gworld/systems/CollideSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAG5E,OAAO,EAA+B,QAAQ,EAAiB,QAAQ,EAAmB,MAAM,gCAAgC,CAAA;AAGhI,qBAAa,aAAc,YAAW,MAAM;IAC1C,aAAa,EAAE,QAAQ,EAAE,CAAK;IAC9B,UAAU,EAAE,QAAQ,EAAE,CAAK;IAC3B,eAAe,QAAK;IACpB,aAAa,EAAE,EAAE,CAAC,QAAQ,CAAA;IAC1B,gBAAgB,UAAQ;IACxB,OAAO,UAAO;IACd,cAAc,cAAW;IAEzB,SAAS,CAAC,aAAa,EAAE,YAAY;IASrC,OAAO,CAAC,aAAa,CAOpB;IAED,OAAO,CAAC,gBAAgB,CAEvB;IAED,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;IA2GhE,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAS9B,cAAc,CAAC,QAAQ,EAAE,QAAQ;IAIjC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK;IAK3B,eAAe,CAAC,MAAM,UAAO;CAI9B"}

package/dist/gworld/systems/CollideSystem.js

@@ -1,20 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CollideSystem = void 0;
-exports.shouldCollider = shouldCollider;
 var entityx_ts_1 = require("entityx-ts");
-var __1 = require("..");
+var utils_1 = require("../../helper/utils");
 var CollideComponent_1 = require("../components/CollideComponent");
 var NodeComp_1 = require("../components/NodeComp");
-function shouldCollider(colA, colB) {
-    var groupA = colA.node.group;
-    var groupB = colB.node.group;
-    if (groupA === undefined || groupB === undefined) {
-        return true;
-    }
-    var colliderMatrix = __1.GameWorld.Instance.systems.get(CollideSystem).colliderMatrix;
-    return colliderMatrix[groupA][groupB];
-}
 var CollideSystem = /** @class */ (function () {
     function CollideSystem() {
         var _this = this;
@@ -157,7 +147,7 @@ var CollideSystem = /** @class */ (function () {
     CollideSystem.prototype.addCollider = function (collider) {
         var _this = this;
         this.listColliders.forEach(function (col) {
-            if (shouldCollider(col, collider)) {
+            if ((0, utils_1.shouldCollider)(col, collider)) {
                 _this._contracts.push(new CollideComponent_1.Contract(col, collider));
             }
         });

package/package.json

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

package/dist/dragonbones/cocos/CocosArmatureDisplay.d.ts

@@ -1,77 +0,0 @@
-/**
- * The MIT License (MIT)
- *
- * Copyright (c) 2012-2018 DragonBones team and other contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-import { Armature, EventObject, EventStringType, IArmatureProxy } from '@cocos/dragonbones-js';
-export declare class CocosArmatureDisplay extends cc.Sprite implements IArmatureProxy {
-    /**
-     * @private
-     */
-    debugDraw: boolean;
-    private _debugDraw;
-    private _armature;
-    private _debugDrawer;
-    /**
-     * @inheritDoc
-     */
-    dbInit(armature: Armature): void;
-    /**
-     * @inheritDoc
-     */
-    dbClear(): void;
-    /**
-     * @inheritDoc
-     */
-    dbUpdate(): void;
-    /**
-     * @inheritDoc
-     */
-    dispose(disposeProxy?: boolean): void;
-    /**
-     * @inheritDoc
-     */
-    destroy(): void;
-    /**
-     * @private
-     */
-    dispatchDBEvent(type: EventStringType, eventObject: EventObject): void;
-    /**
-     * @inheritDoc
-     */
-    hasDBEventListener(type: EventStringType): boolean;
-    /**
-     * @inheritDoc
-     */
-    addDBEventListener(type: EventStringType, listener: (event: EventObject) => void, target: any): void;
-    /**
-     * @inheritDoc
-     */
-    removeDBEventListener(type: EventStringType, listener: (event: EventObject) => void, target: any): void;
-    /**
-     * @inheritDoc
-     */
-    get armature(): Armature;
-    /**
-     * @inheritDoc
-     */
-    get animation(): Animation;
-}
-//# sourceMappingURL=CocosArmatureDisplay.d.ts.map

package/dist/dragonbones/cocos/CocosArmatureDisplay.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"CocosArmatureDisplay.d.ts","sourceRoot":"","sources":["../../../src/dragonbones/cocos/CocosArmatureDisplay.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,QAAQ,EAAgC,WAAW,EAAE,eAAe,EAAE,cAAc,EAA0B,MAAM,uBAAuB,CAAC;AAErJ,qBAAa,oBAAqB,SAAQ,EAAE,CAAC,MAAO,YAAW,cAAc;IAC3E;;OAEG;IACI,SAAS,UAAS;IACzB,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,YAAY,CAA0B;IAC9C;;OAEG;IACI,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAGvC;;OAEG;IACI,OAAO,IAAI,IAAI;IAUtB;;OAEG;IACI,QAAQ,IAAI,IAAI;IAyGvB;;OAEG;IACI,OAAO,CAAC,YAAY,UAAO,GAAG,IAAI;IAQzC;;OAEG;IACI,OAAO,IAAI,IAAI;IAGtB;;OAEG;IACI,eAAe,CAAC,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI;IAG7E;;OAEG;IACI,kBAAkB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO;IAIzD;;OAEG;IACI,kBAAkB,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;IAG3G;;OAEG;IACI,qBAAqB,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;IAG9G;;OAEG;IACH,IAAW,QAAQ,IAAI,QAAQ,CAE9B;IACD;;OAEG;IACH,IAAW,SAAS,IAAI,SAAS,CAEhC;CACF"}