@safe-engine/cocos 2.4.0 → 2.4.1

package/dist/chipmunk/PhysicsComponent.d.ts

@@ -7,8 +7,8 @@ interface RigidBodyProps {
     density?: Float;
     restitution?: Float;
     friction?: Float;
-    gravityScale?: Float;
     isSensor?: boolean;
+    isLockRotate?: boolean;
     tag?: number;
     onBeginContact?: (other: RigidBody) => void;
     onEndContact?: (other: RigidBody) => void;

package/dist/chipmunk/PhysicsComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PhysicsComponent.d.ts","sourceRoot":"","sources":["../../src/chipmunk/PhysicsComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,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;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,UAAU,CAAC,cAAc,CAAC;IACvD,IAAI,EAAE,EAAE,CAAC,IAAI,CAAA;IACb,YAAY,EAAE,aAAa,CAAA;IAC3B,IAAI,cAAc,CAAC,GAAG,EAAE,IAAI,EAM3B;IAED,IAAI,cAAc,IARM,IAAI,CAc3B;IAED,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,IAAI;IAWlC,kBAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,IAAI;IAaxC,WAAW,CAAC,MAAM,EAAE,KAAK;IAOzB,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,UAAU,CAAC,uBAAuB,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;CASnH;AACD,UAAU,0BAA0B;IAClC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,qBAAsB,SAAQ,UAAU,CAAC,0BAA0B,GAAG,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;CAAG;AAChI,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,UAAU,CAAC,2BAA2B,GAAG,kBAAkB,CAAC,sBAAsB,CAAC,CAAC;CAAG"}
+{"version":3,"file":"PhysicsComponent.d.ts","sourceRoot":"","sources":["../../src/chipmunk/PhysicsComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,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;IAEhB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,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,UAAU,CAAC,cAAc,CAAC;IACvD,IAAI,EAAE,EAAE,CAAC,IAAI,CAAA;IACb,YAAY,EAAE,aAAa,CAAA;IAC3B,IAAI,cAAc,CAAC,GAAG,EAAE,IAAI,EAM3B;IAED,IAAI,cAAc,IARM,IAAI,CAc3B;IAED,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,IAAI;IAWlC,kBAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,IAAI;IAaxC,WAAW,CAAC,MAAM,EAAE,KAAK;IAOzB,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,UAAU,CAAC,uBAAuB,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;CASnH;AACD,UAAU,0BAA0B;IAClC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,qBAAsB,SAAQ,UAAU,CAAC,0BAA0B,GAAG,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;CAAG;AAChI,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,UAAU,CAAC,2BAA2B,GAAG,kBAAkB,CAAC,sBAAsB,CAAC,CAAC;CAAG"}

package/dist/chipmunk/PhysicsSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PhysicsSystem.d.ts","sourceRoot":"","sources":["../../src/chipmunk/PhysicsSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAO5E,eAAO,MAAM,WAAW,IAAI,CAAA;AAC5B,eAAO,MAAM,aAAa,IAAI,CAAA;AAC9B,eAAO,MAAM,UAAU,IAAI,CAAA;AAE3B,wBAAgB,iBAAiB,CAAC,cAAc,cAAW,QAG1D;AAED,qBAAa,aAAc,YAAW,MAAM;IAC1C,KAAK,EAAE,EAAE,CAAC,KAAK,CAAA;IACf,UAAU,EAAE,EAAE,CAAC,gBAAgB,CAAA;IAC/B,cAAc,EAAE,EAAE,CAAC,IAAI,EAAE,CAAK;IAC9B,eAAe,EAAE,EAAE,CAAC,KAAK,EAAE,CAAK;IAChC,cAAc,cAAW;IAEzB,SAAS,CAAC,aAAa,EAAE,YAAY;IAiKrC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;IA2BhE,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK;IA2BnD,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK;IAKjD,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK;IAKlD,iBAAiB,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK;IAkBtD,QAAQ;CAMT"}
+{"version":3,"file":"PhysicsSystem.d.ts","sourceRoot":"","sources":["../../src/chipmunk/PhysicsSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAO5E,eAAO,MAAM,WAAW,IAAI,CAAA;AAC5B,eAAO,MAAM,aAAa,IAAI,CAAA;AAC9B,eAAO,MAAM,UAAU,IAAI,CAAA;AAE3B,wBAAgB,iBAAiB,CAAC,cAAc,cAAW,QAG1D;AAED,qBAAa,aAAc,YAAW,MAAM;IAC1C,KAAK,EAAE,EAAE,CAAC,KAAK,CAAA;IACf,UAAU,EAAE,EAAE,CAAC,gBAAgB,CAAA;IAC/B,cAAc,EAAE,EAAE,CAAC,IAAI,EAAE,CAAK;IAC9B,eAAe,EAAE,EAAE,CAAC,KAAK,EAAE,CAAK;IAChC,cAAc,cAAW;IAEzB,SAAS,CAAC,aAAa,EAAE,YAAY;IAuKrC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;IA2BhE,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK;IA2BnD,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK;IAKjD,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK;IAKlD,iBAAiB,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK;IAkBtD,QAAQ;CAMT"}

package/dist/chipmunk/PhysicsSystem.js

@@ -30,7 +30,7 @@ export class PhysicsSystem {
                 rigidBody = instantiate(RigidBody);
                 entity.assign(rigidBody);
             }
-            const { type = StaticBody, gravityScale = 1, density = 1, friction = 0.5, restitution = 0.3, isSensor, tag = 0 } = rigidBody.props;
+            const { type = DynamicBody, density = 1, friction = 0.5, restitution = 0.3, isSensor, isLockRotate, tag = 0 } = rigidBody.props;
             const { width, height, offset = [] } = box.props;
             const [x = 0, y = 0] = offset;
             const node = entity.getComponent(NodeComp);
@@ -39,8 +39,9 @@ export class PhysicsSystem {
             let shape;
             let body;
             if (type === DynamicBody) {
-                body = new cp.Body(density * gravityScale, cp.momentForBox(density, width, height));
+                body = new cp.Body(density, isLockRotate ? Infinity : cp.momentForBox(density, width, height));
                 shape = new cp.BoxShape2(body, new cp.BB(-hw + x, -hh + y, hw + x, hh + y));
+                body.setPos(node.position);
                 this.space.addShape(shape);
                 this.space.addBody(body);
             }
@@ -49,6 +50,8 @@ export class PhysicsSystem {
                 body.nodeIdleTime = Infinity;
                 shape = new cp.BoxShape2(body, new cp.BB(-hw + x, -hh + y, hw + x, hh + y));
                 this.space.addStaticShape(shape);
+                body.setPos(node.position);
+                this.space.reindexStatic();
             }
             shape.setElasticity(restitution);
             shape.setFriction(friction);
@@ -60,7 +63,6 @@ export class PhysicsSystem {
             body.data = node;
             shape.group = tag;
             box.node = node;
-            body.setPos(node.position);
         });
         event_manager.subscribe(EventTypes.ComponentAdded, PhysicsCircleCollider, ({ entity, component }) => {
             // console.log('ComponentAddedEvent PhysicsCircleCollider', component)
@@ -69,7 +71,7 @@ export class PhysicsSystem {
                 rigidBody = instantiate(RigidBody);
                 entity.assign(rigidBody);
             }
-            const { type = StaticBody, gravityScale = 1, density = 1, friction = 0.5, restitution = 0.3, isSensor = false, tag = 0, } = rigidBody.props;
+            const { type = DynamicBody, isLockRotate, density = 1, friction = 0.5, restitution = 0.3, isSensor = false, tag = 0, } = rigidBody.props;
             const node = entity.getComponent(NodeComp);
             const { radius, offset = [] } = component.props;
             const [x = 0, y = 0] = offset;
@@ -79,8 +81,9 @@ export class PhysicsSystem {
             let shape;
             let body;
             if (type === DynamicBody) {
-                body = new cp.Body(density * gravityScale, cp.momentForCircle(density, radius, radius, offVect));
+                body = new cp.Body(density, isLockRotate ? Infinity : cp.momentForCircle(density, radius, radius, offVect));
                 shape = new cp.CircleShape(body, radius, offVect);
+                body.setPos(node.position);
                 this.space.addShape(shape);
                 this.space.addBody(body);
             }
@@ -89,6 +92,8 @@ export class PhysicsSystem {
                 body.nodeIdleTime = Infinity;
                 shape = new cp.CircleShape(body, radius, offVect);
                 this.space.addStaticShape(shape);
+                body.setPos(node.position);
+                this.space.reindexStatic();
             }
             shape.setElasticity(restitution);
             shape.setFriction(friction);
@@ -101,7 +106,6 @@ export class PhysicsSystem {
             body.data = node;
             shape.group = tag;
             component.node = node;
-            body.setPos(node.position);
         });
         event_manager.subscribe(EventTypes.ComponentAdded, PhysicsPolygonCollider, ({ entity, component }) => {
             // console.log('ComponentAddedEvent PhysicsPolygonCollider', component)
@@ -110,7 +114,7 @@ export class PhysicsSystem {
                 rigidBody = instantiate(RigidBody);
                 entity.assign(rigidBody);
             }
-            const { type = StaticBody, gravityScale = 1, density = 1, friction = 0.5, restitution = 0.3, isSensor, tag = 0 } = rigidBody.props;
+            const { type = DynamicBody, isLockRotate, density = 1, friction = 0.5, restitution = 0.3, isSensor, tag = 0 } = rigidBody.props;
             const node = entity.getComponent(NodeComp);
             const { points, offset = [] } = component.props;
             const [x = 0, y = 0] = offset;
@@ -127,8 +131,9 @@ export class PhysicsSystem {
             let shape;
             let body;
             if (type === DynamicBody) {
-                body = new cp.Body(density * gravityScale, cp.momentForPoly(density, fixedPoints, offVect));
+                body = new cp.Body(density, isLockRotate ? Infinity : cp.momentForPoly(density, fixedPoints, offVect));
                 shape = new cp.PolyShape(body, fixedPoints, offVect);
+                body.setPos(node.position);
                 this.space.addShape(shape);
                 this.space.addBody(body);
             }
@@ -137,6 +142,8 @@ export class PhysicsSystem {
                 body.nodeIdleTime = Infinity;
                 shape = new cp.PolyShape(body, fixedPoints, offVect);
                 this.space.addStaticShape(shape);
+                body.setPos(node.position);
+                this.space.reindexStatic();
             }
             shape.setElasticity(restitution);
             shape.setFriction(friction);
@@ -148,7 +155,6 @@ export class PhysicsSystem {
             body.data = node;
             shape.group = tag;
             component.node = node;
-            body.setPos(node.position);
         });
         event_manager.subscribe(EventTypes.ComponentRemoved, RigidBody, ({ component }) => {
             // console.log('ComponentRemovedEvent RigidBody', component)

package/dist/chipmunk/index.d.ts

@@ -1,8 +1,8 @@
-import { GameWorld, Vec2 } from '..';
+import { Vec2 } from '..';
 export * from './PhysicsComponent';
 export * from './PhysicsSprite';
 export * from './PhysicsSystem';
-export declare function setupPhysics(world?: GameWorld, isDebugDraw?: boolean, gravity?: {
+export declare function setupPhysics(colliderMatrix?: boolean[][], isDebugDraw?: boolean, gravity?: {
     x: number;
     y: number;
     equals(other: /*elided*/ any): boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/chipmunk/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAGpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAE/B,wBAAgB,YAAY,CAAC,KAAK,YAAqB,EAAE,WAAW,UAAQ,EAAE,OAAO;;;;;;;;;;;;;;;;;;CAAe,QAMnG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/chipmunk/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,IAAI,EAAE,MAAM,IAAI,CAAA;AAGpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAE/B,wBAAgB,YAAY,CAAC,cAAc,cAAW,EAAE,WAAW,UAAQ,EAAE,OAAO;;;;;;;;;;;;;;;;;;CAAe,QAOlG"}

package/dist/chipmunk/index.js

@@ -3,10 +3,11 @@ import { PhysicsSystem } from './PhysicsSystem';
 export * from './PhysicsComponent';
 export * from './PhysicsSprite';
 export * from './PhysicsSystem';
-export function setupPhysics(world = GameWorld.Instance, isDebugDraw = false, gravity = Vec2(0, -98)) {
-    const physicsSystem = world.addSystemAndUpdate(PhysicsSystem);
+export function setupPhysics(colliderMatrix = [[true]], isDebugDraw = false, gravity = Vec2(0, -98)) {
+    const physicsSystem = GameWorld.Instance.addSystemAndUpdate(PhysicsSystem);
     if (isDebugDraw) {
         physicsSystem.addDebug();
     }
+    physicsSystem.colliderMatrix = colliderMatrix;
     physicsSystem.space.gravity = gravity;
 }

package/dist/core/Scene.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Scene.d.ts","sourceRoot":"","sources":["../../src/core/Scene.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAGvD,qBAAa,cAAe,SAAQ,iBAAiB;IACnD,MAAM;CASP"}
+{"version":3,"file":"Scene.d.ts","sourceRoot":"","sources":["../../src/core/Scene.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAGvD,qBAAa,cAAe,SAAQ,iBAAiB;IACnD,MAAM;CAYP"}

package/dist/core/Scene.js

@@ -6,7 +6,10 @@ export class SceneComponent extends EnhancedComponent {
         const world = GameWorld.Instance;
         world.entities.reset();
         const root = world.entities.create();
-        const node = root.assign(new NodeComp(cc.director.getRunningScene(), root));
+        const scene = cc.director.getRunningScene();
+        scene.unscheduleAllCallbacks();
+        scene.stopAllActions();
+        const node = root.assign(new NodeComp(scene, root));
         const sceneComponent = root.assign(this);
         sceneComponent.node = node;
         return sceneComponent;

package/dist/render/RenderSystem.d.ts

@@ -1,4 +1,4 @@
-import { EntityManager, EventManager, System } from 'entityx-ts';
+import { EventManager, System } from 'entityx-ts';
 export declare enum SpriteTypes {
     SIMPLE = 0,
     SLICED = 1,
@@ -17,6 +17,5 @@ export declare class RenderSystem implements System {
     private onAddTiledMap;
     private onAddMotionStreak;
     private onRemovedNodeComp;
-    update(entities: EntityManager, events: EventManager, dt: number): any;
 }
 //# sourceMappingURL=RenderSystem.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RenderSystem.d.ts","sourceRoot":"","sources":["../../src/render/RenderSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,EAAE,MAAM,YAAY,CAAA;AAKlG,oBAAY,WAAW;IACrB,MAAM,IAAA;IACN,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,IAAI,IAAA;IACJ,SAAS,IAAA;CACV;AA4CD,qBAAa,YAAa,YAAW,MAAM;IACzC,SAAS,CAAC,aAAa,EAAE,YAAY;IAWrC,OAAO,CAAC,eAAe,CAKtB;IAED,OAAO,CAAC,iBAAiB,CAgBxB;IAED,OAAO,CAAC,eAAe,CAatB;IAED,OAAO,CAAC,mBAAmB,CAQ1B;IAED,OAAO,CAAC,iBAAiB,CAKxB;IAED,OAAO,CAAC,aAAa,CAKpB;IAED,OAAO,CAAC,iBAAiB,CAUxB;IAED,OAAO,CAAC,iBAAiB,CAKxB;IAED,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAIjE"}
+{"version":3,"file":"RenderSystem.d.ts","sourceRoot":"","sources":["../../src/render/RenderSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoC,MAAM,EAAE,MAAM,YAAY,CAAA;AAKnF,oBAAY,WAAW;IACrB,MAAM,IAAA;IACN,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,IAAI,IAAA;IACJ,SAAS,IAAA;CACV;AA4CD,qBAAa,YAAa,YAAW,MAAM;IACzC,SAAS,CAAC,aAAa,EAAE,YAAY;IAWrC,OAAO,CAAC,eAAe,CAKtB;IAED,OAAO,CAAC,iBAAiB,CAgBxB;IAED,OAAO,CAAC,eAAe,CAatB;IAED,OAAO,CAAC,mBAAmB,CAQ1B;IAED,OAAO,CAAC,iBAAiB,CAKxB;IAED,OAAO,CAAC,aAAa,CAKpB;IAED,OAAO,CAAC,iBAAiB,CAUxB;IAED,OAAO,CAAC,iBAAiB,CAKxB;CAKF"}

package/dist/render/RenderSystem.js

@@ -131,7 +131,4 @@ export class RenderSystem {
             node.instance.removeFromParent(true);
         }
     };
-    update() {
-        // throw new Error('Method not implemented.');
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@safe-engine/cocos",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "safe-engine with cocos renderer support",
   "type": "module",
   "main": "dist/index.js",
@@ -24,7 +24,7 @@
     "@cocos/dragonbones-js": "^1.0.2",
     "@esotericsoftware/spine-core": "^4.2.93",
     "box2d-wasm": "^7.0.0",
-    "cocos-html5-ts": "^2.1.1",
+    "cocos-html5-ts": "^2.1.2",
     "entityx-ts": "^2.3.1"
   },
   "author": "",

package/dist/core/index.d.ts

@@ -1,6 +0,0 @@
-export * from './decorator';
-export * from './EnhancedComponent';
-export * from './NodeComp';
-export * from './NodePool';
-export * from './Scene';
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA;AACnC,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA"}

package/dist/core/index.js

@@ -1,5 +0,0 @@
-export * from './decorator';
-export * from './EnhancedComponent';
-export * from './NodeComp';
-export * from './NodePool';
-export * from './Scene';

package/dist/dragonbones/PixiDragonBonesSprite.d.ts

@@ -1,19 +0,0 @@
-import { PixiArmatureDisplay } from 'dragonbones-pixijs';
-import { Application } from 'pixi.js';
-export declare function loadDragonBonesAssets({ skeleton, atlas, texture }: {
-    skeleton: any;
-    atlas: any;
-    texture: any;
-}): Promise<any>;
-export declare class PixiDragonBonesSprite extends cc.Sprite {
-    _canvas: any;
-    _pixiApp: Application;
-    _texture: cc.Texture2D;
-    _config: any;
-    _armatureDisplay: PixiArmatureDisplay;
-    constructor(config: any);
-    _setupArmature(): void;
-    updateTexture(): void;
-    onExit(): void;
-}
-//# sourceMappingURL=PixiDragonBonesSprite.d.ts.map

package/dist/dragonbones/PixiDragonBonesSprite.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PixiDragonBonesSprite.d.ts","sourceRoot":"","sources":["../../src/dragonbones/PixiDragonBonesSprite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAe,MAAM,oBAAoB,CAAA;AACrE,OAAO,EAAE,WAAW,EAAU,MAAM,SAAS,CAAA;AAE7C,wBAAgB,qBAAqB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE;;;;CAAA,gBAGjE;AAED,qBAAa,qBAAsB,SAAQ,EAAE,CAAC,MAAM;IAClD,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;IACrB,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAA;IACtB,OAAO,MAAA;IACP,gBAAgB,EAAE,mBAAmB,CAAA;gBACzB,MAAM,KAAA;IA+BlB,cAAc;IAuBd,aAAa;IASb,MAAM;CAQP"}

package/dist/dragonbones/PixiDragonBonesSprite.js

@@ -1,75 +0,0 @@
-import { PixiFactory } from 'dragonbones-pixijs';
-import { Application, Assets } from 'pixi.js';
-export function loadDragonBonesAssets({ skeleton, atlas, texture }) {
-    // console.log('loadDragonBonesAssets', skeleton, atlas, texture)
-    return Assets.load([skeleton, atlas, texture]);
-}
-export class PixiDragonBonesSprite extends cc.Sprite {
-    _canvas;
-    _pixiApp;
-    _texture;
-    _config;
-    _armatureDisplay;
-    constructor(config) {
-        super();
-        super.ctor(); // always call this for compatibility with cocos2dx JS Javascript class system
-        this._canvas = document.createElement('canvas');
-        this._canvas.width = config.width || 1024;
-        this._canvas.height = config.height || 1024;
-        this._pixiApp = new Application();
-        this._pixiApp.init({
-            view: this._canvas,
-            width: this._canvas.width,
-            height: this._canvas.height,
-            backgroundAlpha: 0, // nền trong suốt
-            // transparent: true, // bắt buộc để alpha hoạt động
-            clearBeforeRender: true, // xoá trước khi vẽ frame mới
-            preserveDrawingBuffer: true, // giúp lấy ảnh từ canvas
-            antialias: true,
-        });
-        this._texture = new cc.Texture2D();
-        this._texture.initWithElement(this._canvas);
-        this._texture.handleLoadedTexture();
-        this.initWithTexture(this._texture);
-        this._config = config;
-        this._armatureDisplay = null;
-        this._setupArmature();
-        // this.schedule(this.updateTexture, 1 / 30);
-    }
-    _setupArmature() {
-        const { skeleton, atlas, texture, playTimes, animationName, scale = 1 } = this._config;
-        const factory = PixiFactory.factory;
-        const atlasAsset = Assets.get(atlas);
-        const dragonData = factory.parseDragonBonesData(Assets.get(skeleton), atlasAsset.name);
-        factory.parseTextureAtlasData(Assets.get(atlas), Assets.get(texture), atlasAsset.name);
-        const { armatureNames } = dragonData;
-        const armatureName = armatureNames[0];
-        const display = factory.buildArmatureDisplay(armatureName, atlasAsset.name);
-        if (!display) {
-            console.error('Cannot build armature:', armatureName);
-            return;
-        }
-        display.animation.play(animationName, playTimes);
-        display.x = this._canvas.width / 2;
-        display.y = this._canvas.height / 2;
-        display.scale.set(scale);
-        this._pixiApp.stage.addChild(display);
-        this._armatureDisplay = display;
-    }
-    updateTexture() {
-        if (this._armatureDisplay && this._pixiApp.renderer && this._pixiApp.stage) {
-            this._pixiApp.renderer.render(this._pixiApp.stage);
-            this._texture.initWithElement(this._canvas);
-            this._texture.handleLoadedTexture();
-            this.setTexture(this._texture);
-        }
-    }
-    onExit() {
-        // this.unschedule(this.updateTexture);
-        this._pixiApp.destroy(true, { children: true });
-        this._canvas.remove();
-        this._armatureDisplay.destroy();
-        this._armatureDisplay = null;
-        super.onExit();
-    }
-}

package/dist/gworld/EnhancedComponent.d.ts

@@ -1,22 +0,0 @@
-import { Constructor } from 'entityx-ts';
-import { BaseComponentProps } from '../safex';
-import { NodeComp } from './NodeComp';
-export declare class EnhancedComponent<Props = object, N extends NodeComp<any> = NodeComp<any>> {
-    static hasRender: boolean;
-    props: Props;
-    node: N;
-    enabled: boolean;
-    constructor(data?: BaseComponentProps<EnhancedComponent> & Props);
-    init(data?: Props): void;
-    addComponent<T extends EnhancedComponent>(instance: T): T;
-    getComponent<T extends EnhancedComponent>(component: Constructor<T>): T;
-    schedule(callback: (arg: any) => void, interval: number, repeat?: number, delay?: number): void;
-    unschedule(callback: (arg: any) => void): void;
-    unscheduleAllCallbacks(): void;
-    scheduleOnce(callback: (arg: any) => void, delay: number, key?: string): void;
-    getComponentsInChildren<T extends ComponentType>(component: Constructor<T>): T[];
-    getComponentInChildren<T extends ComponentType>(component: Constructor<T>): T;
-    isEqual(other: EnhancedComponent): boolean;
-}
-export type ComponentType = EnhancedComponent | NodeComp;
-//# sourceMappingURL=EnhancedComponent.d.ts.map

package/dist/gworld/EnhancedComponent.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"EnhancedComponent.d.ts","sourceRoot":"","sources":["../../src/gworld/EnhancedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,iBAAiB,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;IACpF,MAAM,CAAC,SAAS,UAAO;IACvB,KAAK,EAAE,KAAK,CAAY;IACxB,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,UAAO;gBACF,IAAI,CAAC,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,GAAG,KAAK;IAGhE,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK;IASjB,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;IAGzD,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAGvE,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,MAAgC,EAAE,KAAK,SAAI;IAG5G,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI;IAGvC,sBAAsB;IAGtB,YAAY,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAGtE,uBAAuB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;IAGhF,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAG7E,OAAO,CAAC,KAAK,EAAE,iBAAiB;CAGjC;AAED,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG,QAAQ,CAAA"}

package/dist/gworld/EnhancedComponent.js

@@ -1,44 +0,0 @@
-export class EnhancedComponent {
-    static hasRender = true;
-    props = {};
-    node;
-    enabled = true;
-    constructor(data) {
-        this.init(data);
-    }
-    init(data) {
-        if (data) {
-            // console.log('constructor', this.constructor.name, data)
-            Object.keys(data).forEach((key) => {
-                this.props[key] = data[key];
-            });
-        }
-    }
-    addComponent(instance) {
-        return this.node.addComponent(instance);
-    }
-    getComponent(component) {
-        return this.node.getComponent(component);
-    }
-    schedule(callback, interval, repeat = cc.macro.REPEAT_FOREVER, delay = 0) {
-        this.node.instance.schedule(callback.bind(this), interval, repeat, delay);
-    }
-    unschedule(callback) {
-        this.node.instance.unschedule(callback.bind(this));
-    }
-    unscheduleAllCallbacks() {
-        this.node.instance.unscheduleAllCallbacks();
-    }
-    scheduleOnce(callback, delay, key) {
-        this.node.instance.scheduleOnce(callback, delay, key);
-    }
-    getComponentsInChildren(component) {
-        return this.node.getComponentsInChildren(component);
-    }
-    getComponentInChildren(component) {
-        return this.node.getComponentInChildren(component);
-    }
-    isEqual(other) {
-        return this.node.entity.id === other.node.entity.id;
-    }
-}

package/dist/gworld/NodeComp.d.ts

@@ -1,153 +0,0 @@
-import { Constructor, Entity } from 'entityx-ts';
-import { Vec2 } from '../polyfills';
-import { ComponentType, EnhancedComponent } from './EnhancedComponent';
-export type EventCallbackType = (...args: any[]) => void;
-export declare class NodeComp<C extends cc.Node = cc.Node> {
-    entity: Entity;
-    instance: C;
-    parent: NodeComp;
-    children: NodeComp[];
-    name: string;
-    private _group;
-    private _active;
-    constructor(instance: C, entity: Entity);
-    get uuid(): number;
-    get position(): Readonly<Vec2>;
-    set position(val: Vec2);
-    set xy(val: [number, number]);
-    get posX(): number;
-    set posX(val: number);
-    get posY(): number;
-    set posY(val: number);
-    get scale(): number;
-    set scale(val: number);
-    get scaleX(): number;
-    set scaleX(val: number);
-    get scaleY(): number;
-    set scaleY(val: number);
-    get anchorX(): number;
-    set anchorX(val: number);
-    get anchorY(): number;
-    set anchorY(val: number);
-    /**
-     * Returns the angle of the node in degrees. 0 is the default rotation angle. Positive values rotate node clockwise.
-     * @function
-     * @return {Number} The rotation of the node in degrees.
-     */
-    get rotation(): number;
-    /**
-     *
-     *  Sets the X angle of the node in degrees which performs a horizontal rotational skew.
-     *  (support only in WebGL rendering mode)
-     *  0 is the default rotation angle.
-     *  Positive values rotate node clockwise, and negative values for anti-clockwise.
-     *
-     * @param {Number} degrees The X rotation in degrees which performs a horizontal rotational skew.
-     */
-    set rotation(val: number);
-    get color(): cc.Color;
-    set color(val: cc.Color);
-    get opacity(): number;
-    set opacity(val: number);
-    get active(): boolean;
-    set active(val: boolean);
-    get group(): string | number;
-    set group(val: string | number);
-    get width(): number;
-    set width(val: number);
-    get height(): number;
-    set height(val: number);
-    get zIndex(): number;
-    set zIndex(val: number);
-    get childrenCount(): number;
-    destroy(): void;
-    addComponent<T extends ComponentType>(instance: T): T;
-    getComponent<T extends ComponentType>(component: Constructor<T>): T;
-    getComponentsInChildren<T extends ComponentType>(component: Constructor<T>): T[];
-    getComponentInChildren<T extends ComponentType>(component: Constructor<T>): T;
-    hasComponentInChildren<T extends ComponentType>(component: Constructor<T>): boolean;
-    getPercent(): number;
-    setPercent(val: number): void;
-    setTouchEnabled(enabled: boolean): void;
-    addTouchEventListener(cb: any): void;
-    convertToNodeSpace(point: cc.Point): {
-        x: number;
-        y: number;
-        equals(other: /*elided*/ any): boolean;
-        add(value: cc.Point | Vec2): /*elided*/ any;
-        addSelf(value: cc.Point | Vec2): /*elided*/ any;
-        sub(value: cc.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: cc.Point): {
-        x: number;
-        y: number;
-        equals(other: /*elided*/ any): boolean;
-        add(value: cc.Point | Vec2): /*elided*/ any;
-        addSelf(value: cc.Point | Vec2): /*elided*/ any;
-        sub(value: cc.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: cc.Vec2): {
-        x: number;
-        y: number;
-        equals(other: /*elided*/ any): boolean;
-        add(value: cc.Point | Vec2): /*elided*/ any;
-        addSelf(value: cc.Point | Vec2): /*elided*/ any;
-        sub(value: cc.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;
-    };
-    getPosition(): cc.Point;
-    setPosition(x: number | cc.Vec2 | cc.Vec3 | cc.Point, y?: number): void;
-    setRotation(deg: number): void;
-    getRotation(): number;
-    setAnchorPoint(point: number | cc.Point, y?: number): void;
-    getAnchorPoint(): cc.Point;
-    getBoundingBox(): cc.Rect;
-    getContentSize(): cc.Size;
-    setContentSize(size: cc.Size | number, height?: number): void;
-    setColor(color: cc.Color): void;
-    setScale(scaleX: number, scaleY?: number): void;
-    runAction(atc: cc.ActionInterval): void;
-    stopAllActions(): void;
-    pauseAllActionsAndSchedule(): void;
-    resumeAllActionsAndSchedule(): void;
-    removeFromParent(cleanup?: boolean): void;
-    addChild(child: NodeComp, zOrder?: number, tag?: number): any;
-    removeAllChildren(cleanup?: any): void;
-    getData<T>(key: string): T;
-    setData<T extends Integer | Float | string>(key: string, value: T): void;
-    removeData(key: string): void;
-    resolveComponent(component: EnhancedComponent<object, NodeComp>): void;
-}
-//# sourceMappingURL=NodeComp.d.ts.map

package/dist/gworld/NodeComp.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../src/gworld/NodeComp.ts"],"names":[],"mappings":"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"}