change default mask value of collision matrix (#7277)

This commit is contained in:
jiaxin.lai
2020-09-02 15:32:48 +08:00
committed by GitHub
parent 3240dba206
commit 3933474f3e
+6 -7
View File
@@ -14,20 +14,18 @@ import { PhysicsRayResult } from './physics-ray-result';
import { EDITOR, DEBUG } from 'internal:constants';
import { IPhysicsConfig, ICollisionMatrix } from './physics-config';
const PhysicsGroup = {
DEFAULT: 1,
};
enum PhysicsGroup {
DEFAULT = 1,
}
Enum(PhysicsGroup);
legacyCC.internal.PhysicsGroup = PhysicsGroup;
class CollisionMatrix {
updateArray: number[] = [];
constructor () {
for (let i = 0; i < 32; i++) {
const key = 1 << i;
this[`_${key}`] = 0xffffffff;
this[`_${key}`] = 0;
Object.defineProperty(this, key, {
'get': function () { return this[`_${key}`] },
'set': function (v: number) {
@@ -41,6 +39,7 @@ class CollisionMatrix {
}
})
}
this[`_1`] = PhysicsGroup.DEFAULT;
}
}
@@ -300,7 +299,7 @@ export class PhysicsSystem extends System {
if (config.collisionMatrix) {
for (const i in config.collisionMatrix) {
const key = 1 << parseInt(i);
this.collisionMatrix[`_${key}`] = config.collisionMatrix[key];
this.collisionMatrix[`_${key}`] = config.collisionMatrix[i];
}
}
} else {