Merge pull request #1831 from INEEDSSD/Master3.0

fix: Fixed 2D physics Shape naming duplication issue.

Author: lirong2f

src/layaAir/laya/physics/Collider2D/ColliderBase.ts

@@ -118,7 +118,7 @@ export class ColliderBase extends Component {
     public set inertia(value: number) {
         this._inertia = value;
         if (!this._useAutoMass) {
-            Physics2D.I._factory.set_rigidBody_Mass(this._box2DBody, this._mass, this._centerOfMass, this._inertia, this._massData);
+            this._box2DBody && Physics2D.I._factory.set_rigidBody_Mass(this._box2DBody, this._mass, this._centerOfMass, this._inertia, this._massData);
         }
     }
 
@@ -128,7 +128,7 @@ export class ColliderBase extends Component {
      */
     public get centerOfMass(): IV2 | Vector2 {
         let center;
-        if (this._useAutoMass) {
+        if (this._useAutoMass && this._box2DBody) {
             center = Physics2D.I._factory.get_rigidBody_Center(this._box2DBody);
             this._centerOfMass.x = center.x;
             this._centerOfMass.y = center.y;
@@ -145,7 +145,7 @@ export class ColliderBase extends Component {
             this._centerOfMass.y = value.y;
         }
         if (!this._useAutoMass) {
-            Physics2D.I._factory.set_rigidBody_Mass(this._box2DBody, this._mass, this._centerOfMass, this._inertia, this._massData);
+            this._box2DBody && Physics2D.I._factory.set_rigidBody_Mass(this._box2DBody, this._mass, this._centerOfMass, this._inertia, this._massData);
         }
     }
 
@@ -155,7 +155,7 @@ export class ColliderBase extends Component {
      */
     public get mass(): number {
         let mass;
-        if (this._useAutoMass) {
+        if (this._useAutoMass && this._box2DBody) {
             mass = Physics2D.I._factory.get_rigidBody_Mass(this._box2DBody);
         } else {
             mass = this._mass;
@@ -165,8 +165,7 @@ export class ColliderBase extends Component {
     public set mass(value: number) {
         this._mass = value;
         if (!this._useAutoMass) {
-            Physics2D.I._factory.set_rigidBody_Mass(this._box2DBody, this._mass, this._centerOfMass, this._inertia, this._massData);
-
+            this._box2DBody && Physics2D.I._factory.set_rigidBody_Mass(this._box2DBody, this._mass, this._centerOfMass, this._inertia, this._massData);
         }
     }
 
@@ -179,19 +178,21 @@ export class ColliderBase extends Component {
     }
     public set useAutoMass(value: boolean) {
         this._useAutoMass = value;
-        Physics2D.I._factory.set_rigidBody_Mass(this._box2DBody, this._mass, this._centerOfMass, this._inertia, this._massData);
+        this._box2DBody && Physics2D.I._factory.set_rigidBody_Mass(this._box2DBody, this._mass, this._centerOfMass, this._inertia, this._massData);
     }
 
     /**
      * @zh 当前碰撞体在物理世界中是否在激活状态
      */
     public get isAwake(): boolean {
-        this._isAwake = Physics2D.I._factory.get_rigidBody_IsAwake(this._box2DBody);
+        if (this._box2DBody) {
+            this._isAwake = Physics2D.I._factory.get_rigidBody_IsAwake(this._box2DBody);
+        }
         return this.isAwake;
     }
     public set isAwake(value: boolean) {
         this._isAwake = value;
-        Physics2D.I._factory.set_rigidBody_Awake(this._box2DBody, value);
+        this._box2DBody && Physics2D.I._factory.set_rigidBody_Awake(this._box2DBody, value);
     }
 
     /**
@@ -231,7 +232,7 @@ export class ColliderBase extends Component {
     set x(value: number) {
         if (this._x == value) return;
         this._x = value;
-        this._updateTransformFromRender();
+        this._needupdataShapeAttribute();
     }
 
     /**
@@ -245,7 +246,7 @@ export class ColliderBase extends Component {
     set y(value: number) {
         if (this._y == value) return;
         this._y = value;
-        this._updateTransformFromRender();
+        this._needupdataShapeAttribute();
     }
 
     /**
@@ -300,12 +301,13 @@ export class ColliderBase extends Component {
         return this.owner.globalTrans.localToGlobal(x, y);
     }
 
+
     /**
-     * @zh 从渲染更新碰撞体的位置
+     * @internal
+     * @en Refresh the physics world collision information after the collision body parameters change.
+     * @zh 碰撞体参数发生变化后，刷新物理世界碰撞信息
      */
-    private _updateTransformFromRender() {
-        var sp: Sprite = this.owner;
-        Physics2D.I._factory.set_RigibBody_Transform(this._box2DBody, sp.globalTrans.x, sp.globalTrans.y, Utils.toRadian(this.owner.globalTrans.rotation));
+    _refresh(): void {
     }
 
     /**@internal*/
@@ -431,7 +433,15 @@ export class ColliderBase extends Component {
 
     /**@internal @deprecated 通知rigidBody 更新shape 属性值 */
     protected _needupdataShapeAttribute(): void {
-        this._rigidbody && this.createShape(this._rigidbody);
+        //兼容模式下使用，设置类似BoxCollider的偏移方式
+        if (this._rigidbody && this._rigidbody.applyOwnerColliderComponent) {
+            this.createShape(this._rigidbody);
+        }
+        //非dynamic类型下可以直接设置位置
+        if (this._type != "dynamic") {
+            var sp: Sprite = this.owner;
+            this._box2DBody && Physics2D.I._factory.set_RigibBody_Transform(this._box2DBody, sp.globalTrans.x, sp.globalTrans.y, Utils.toRadian(this.owner.globalTrans.rotation));
+        }
     }
 
     // -----------------------  已废弃 deprecated ------------------------

src/layaAir/laya/physics/ModuleDef.ts

@@ -20,16 +20,19 @@ import { PolygonCollider } from "./Collider2D/PolygonCollider";
 import { RigidBody } from "./RigidBody";
 import { StaticCollider } from "./StaticCollider";
 import { Physics2DShapeBase } from "./Shape/Physics2DShapeBase";
-import { BoxShape } from "./Shape/BoxShape";
-import { ChainShape } from "./Shape/ChainShape";
-import { EdgeShape } from "./Shape/EdgeShape";
-import { PolygonShape } from "./Shape/PolygonShape";
+import { BoxShape2D } from "./Shape/BoxShape2D";
+import { ChainShape2D } from "./Shape/ChainShape2D";
+import { EdgeShape2D } from "./Shape/EdgeShape2D";
+import { PolygonShape2D } from "./Shape/PolygonShape2D";
 import { Physics2DWorldManager } from "./Physics2DWorldManager";
+import { CircleShape2D } from "./Shape/CircleShape2D";
+import { FilterData } from "./factory/IPhysics2DFactory";
 
 let c = ClassUtils.regClass;
 c("Physics2D", Physics2D);
 c("Physics2DDebugDraw", Physics2DDebugDraw);
 c("Physics2DWorldManager", Physics2DWorldManager);
+c("FilterData", FilterData);
 
 c("ColliderBase", ColliderBase);
 c("RigidBody", RigidBody);
@@ -52,9 +55,9 @@ c("CircleCollider", CircleCollider);
 c("EdgeCollider", EdgeCollider);
 c("PolygonCollider", PolygonCollider);
 
-
 c("Physics2DShapeBase", Physics2DShapeBase);
-c("BoxShape", BoxShape);
-c("ChainShape", ChainShape);
-c("EdgeShape", EdgeShape);
-c("PolygonShape", PolygonShape);
+c("BoxShape2D", BoxShape2D);
+c("CircleShape2D", CircleShape2D);
+c("ChainShape2D", ChainShape2D);
+c("EdgeShape2D", EdgeShape2D);
+c("PolygonShape2D", PolygonShape2D);

src/layaAir/laya/physics/Physics2DWorldManager.ts

@@ -28,6 +28,7 @@ export class Physics2DWorldManager implements IElementComponentManager {
     private _contactListener: any;
     private _JSQuerycallback: any;
     private _JSRayCastcallback: any;
+    private _allowWorldSleep: boolean = false;
 
     get box2DWorld(): any {
         return this._box2DWorld;
@@ -49,6 +50,7 @@ export class Physics2DWorldManager implements IElementComponentManager {
         this._worldDef.velocityIterations = this._velocityIterations = Physics2DOption.velocityIterations;
         this._worldDef.positionIterations = this._positionIterations = Physics2DOption.positionIterations;
         this._worldDef.gravity = this._gravity.setValue(Physics2DOption.gravity.x, Physics2DOption.gravity.y);
+        this._allowWorldSleep = Physics2DOption.allowSleeping;
         this._scene = scene;
         this.setRootSprite(this._scene);
     }
@@ -69,6 +71,7 @@ export class Physics2DWorldManager implements IElementComponentManager {
     setRootSprite(scene: Scene | Sprite): void {
         this._scene = scene;
         this._box2DWorld = Physics2D.I._factory.createWorld(this._worldDef);
+        Physics2D.I._factory.allowWorldSleep(this._box2DWorld, this._allowWorldSleep);
         this._box2DWorld._pixelRatio = this._pixelRatio;
         this._box2DWorld._indexInMap = Physics2D.I._factory.worldCount;
         Physics2D.I._factory.worldMap.set(Physics2D.I._factory.worldCount, this);

src/layaAir/laya/physics/RigidBody.ts

@@ -100,7 +100,7 @@ export class RigidBody extends ColliderBase {
     /**
      * @zh 碰撞形状，可以是多个
      */
-    private _shapes: Physics2DShapeBase[] = [];
+    private _shapes: Physics2DShapeBase[];
 
     /**
      * @zh 是否兼容Collider组件的方式
@@ -264,11 +264,17 @@ export class RigidBody extends ColliderBase {
     }
 
     public set shapes(shapes: Physics2DShapeBase[]) {
+        if (!shapes || shapes.length == 0) return;
+        this._shapes = shapes;
         shapes.forEach((shape) => {
             shape.setCollider(this);
         });
-        this._shapes = shapes;
-
+        if (this._useAutoMass) {
+            // 根据shape自动计算质量
+            this._box2DBody && Physics2D.I._factory.retSet_rigidBody_MassData(this._box2DBody);
+        } else {
+            this._box2DBody && Physics2D.I._factory.set_rigidBody_Mass(this._box2DBody, this._mass, this._centerOfMass, this._inertia, this._massData);
+        }
     }
 
     /**
@@ -364,16 +370,16 @@ export class RigidBody extends ColliderBase {
         let owner: Sprite = this.owner;
         this._bodyDef.position.setValue(owner.globalTrans.x, owner.globalTrans.y);
         this._bodyDef.angle = Utils.toRadian(owner.globalTrans.rotation);
+        this._bodyDef.fixedRotation = !this._allowRotation;
         this._bodyDef.allowSleep = this._allowSleep;
         this._bodyDef.angularVelocity = this._angularVelocity;
         this._bodyDef.angularDamping = this._angularDamping;
         this._bodyDef.linearDamping = this._linearDamping;
-        this._bodyDef.linearVelocity.setValue(this._linearVelocity.x, this._linearVelocity.y);
+        if (this._linearVelocity.x != 0 || this._linearVelocity.y != 0) {
+            this._bodyDef.linearVelocity.setValue(this._linearVelocity.x, this._linearVelocity.y);
+        }
         this._bodyDef.type = this._type;
-
         this._bodyDef.bullet = this._bullet;
-        this._bodyDef.fixedRotation = !this._allowRotation;
-
         this._bodyDef.gravityScale = this._gravityScale;
         this._bodyDef.group = this.group;
     }
@@ -393,12 +399,6 @@ export class RigidBody extends ColliderBase {
             //更新shapes
             this.shapes = this._shapes;
         }
-        if (this._useAutoMass) {
-            // 根据shape自动计算质量
-            Physics2D.I._factory.retSet_rigidBody_MassData(this._box2DBody);
-        } else {
-            Physics2D.I._factory.set_rigidBody_Mass(this._box2DBody, this._mass, this._centerOfMass, this._inertia, this._massData);
-        }
         this.owner.on(SpriteGlobalTransform.CHANGED, this, this._globalChangeHandler);
     }
 
@@ -446,6 +446,7 @@ export class RigidBody extends ColliderBase {
     }
 
     getUserData(): any {
+        if (!this._box2DBody) return;
         return Physics2D.I._factory.get_rigidBody_userData(this._box2DBody);
     }
 

src/layaAir/laya/physics/Shape/BoxShape.ts renamed to src/layaAir/laya/physics/Shape/BoxShape2D.ts

@@ -3,7 +3,7 @@ import { EPhysics2DShape } from "../factory/IPhysics2DFactory";
 import { Physics2D } from "../Physics2D";
 import { Physics2DShapeBase } from "./Physics2DShapeBase";
 
-export class BoxShape extends Physics2DShapeBase {
+export class BoxShape2D extends Physics2DShapeBase {
 
     private _width: number = 100;
 
@@ -51,13 +51,13 @@ export class BoxShape extends Physics2DShapeBase {
 
     }
 
-    clone(): BoxShape {
-        let dest: BoxShape = new BoxShape();
+    clone(): BoxShape2D {
+        let dest: BoxShape2D = new BoxShape2D();
         this.cloneTo(dest);
         return dest;
     }
 
-    cloneTo(destObject: BoxShape): void {
+    cloneTo(destObject: BoxShape2D): void {
         super.cloneTo(destObject);
         destObject.width = this.width;
         destObject.height = this.height;

src/layaAir/laya/physics/Shape/ChainShape.ts renamed to src/layaAir/laya/physics/Shape/ChainShape2D.ts

@@ -3,10 +3,10 @@ import { EPhysics2DShape } from "../factory/IPhysics2DFactory";
 import { Physics2D } from "../Physics2D";
 import { Physics2DShapeBase } from "./Physics2DShapeBase";
 
-export class ChainShape extends Physics2DShapeBase {
+export class ChainShape2D extends Physics2DShapeBase {
 
     /**@internal 顶点数据*/
-    private _datas: number[] = [];
+    private _datas: number[] = [0, 0, 100, 0];
 
     /**@internal 是否是闭环，注意不要有自相交的链接形状，它可能不能正常工作*/
     private _loop: boolean = false;
@@ -58,13 +58,13 @@ export class ChainShape extends Physics2DShapeBase {
         Physics2D.I._factory.set_ChainShape_data(shape, this.pivotoffx, this.pivotoffy, this._datas, this._loop, this.scaleX, this.scaleY);
     }
 
-    clone(): ChainShape {
-        let dest: ChainShape = new ChainShape();
+    clone(): ChainShape2D {
+        let dest: ChainShape2D = new ChainShape2D();
         this.cloneTo(dest);
         return dest;
     }
 
-    cloneTo(destObject: ChainShape): void {
+    cloneTo(destObject: ChainShape2D): void {
         super.cloneTo(destObject);
         destObject.datas = this.datas;
         destObject.loop = this.loop;

src/layaAir/laya/physics/Shape/CircleShape.ts renamed to src/layaAir/laya/physics/Shape/CircleShape2D.ts

@@ -3,7 +3,7 @@ import { EPhysics2DShape } from "../factory/IPhysics2DFactory";
 import { Physics2D } from "../Physics2D";
 import { Physics2DShapeBase } from "./Physics2DShapeBase";
 
-export class CircleShape extends Physics2DShapeBase {
+export class CircleShape2D extends Physics2DShapeBase {
     private _radius: number = 50;
 
 
@@ -33,13 +33,13 @@ export class CircleShape extends Physics2DShapeBase {
         Physics2D.I._factory.set_CircleShape_pos(this._box2DShapeDef._shape, this.x, this.y, scale);
     }
 
-    clone(): CircleShape {
-        let dest: CircleShape = new CircleShape();
+    clone(): CircleShape2D {
+        let dest: CircleShape2D = new CircleShape2D();
         this.cloneTo(dest);
         return dest;
     }
 
-    cloneTo(destObject: CircleShape): void {
+    cloneTo(destObject: CircleShape2D): void {
         super.cloneTo(destObject);
         destObject.radius = this.radius;
     }

src/layaAir/laya/physics/Shape/EdgeShape.ts renamed to src/layaAir/laya/physics/Shape/EdgeShape2D.ts

@@ -3,7 +3,7 @@ import { EPhysics2DShape } from "../factory/IPhysics2DFactory";
 import { Physics2D } from "../Physics2D";
 import { Physics2DShapeBase } from "./Physics2DShapeBase";
 
-export class EdgeShape extends Physics2DShapeBase {
+export class EdgeShape2D extends Physics2DShapeBase {
 
     /**@internal 顶点数据*/
     private _datas: number[] = [0, 0, 100, 0];
@@ -41,13 +41,13 @@ export class EdgeShape extends Physics2DShapeBase {
         Physics2D.I._factory.set_EdgeShape_data(shape, this.pivotoffx, this.pivotoffy, this._datas, this.scaleX, this.scaleY);
     }
 
-    clone(): EdgeShape {
-        let dest: EdgeShape = new EdgeShape();
+    clone(): EdgeShape2D {
+        let dest: EdgeShape2D = new EdgeShape2D();
         this.cloneTo(dest);
         return dest;
     }
 
-    cloneTo(destObject: EdgeShape): void {
+    cloneTo(destObject: EdgeShape2D): void {
         super.cloneTo(destObject);
         destObject.datas = this.datas;
     }

src/layaAir/laya/physics/Shape/Physics2DShapeBase.ts

@@ -148,7 +148,7 @@ export class Physics2DShapeBase implements IClone {
     _updateFilterData(): void {
         if (!this._box2DShape || !this._box2DFilter) return;
         this._box2DFilter.groupIndex = this._filterData.group;
-        this._box2DFilter.categoryBits = this._filterData.catagory;
+        this._box2DFilter.categoryBits = this._filterData.category;
         this._box2DFilter.maskBits = this._filterData.mask;
         this._shapeDef.filter = this._filterData;
         Physics2D.I._factory.setfilterData(this._box2DShape, this._box2DFilter);