修复 character controller 的 group/mask 没有正确设置的问题

Author: shrinktofit

cocos/physics/physx/character-controllers/physx-box-character-controller.ts

@@ -67,11 +67,12 @@ export class PhysXBoxCharacterController extends PhysXCharacterController implem
         controllerDesc.position = { x: v3_0.x, y: v3_0.y, z: v3_0.z };//PxExtendedVec3
         controllerDesc.setMaterial(pxMtl);
         controllerDesc.setReportCallback(PX.PxUserControllerHitReport.implement(physxWorld.callback.controllerHitReportCB));
-        this._impl = PX.createBoxCharacterController(physxWorld.controllerManager, controllerDesc);
+        const impl = PX.createBoxCharacterController(physxWorld.controllerManager, controllerDesc);
+        this.setImpl(impl);
 
-        if (this._impl.$$) {
-            PX.IMPL_PTR[this._impl.$$.ptr] = this;
-            const shapePtr = this._impl.getShape().$$.ptr;
+        if (impl.$$) {
+            PX.IMPL_PTR[impl.$$.ptr] = this;
+            const shapePtr = impl.getShape().$$.ptr;
             PX.IMPL_PTR[shapePtr] = this;
         }
 

cocos/physics/physx/character-controllers/physx-capsule-character-controller.ts

@@ -68,11 +68,12 @@ export class PhysXCapsuleCharacterController extends PhysXCharacterController im
         controllerDesc.position = { x: v3_0.x, y: v3_0.y, z: v3_0.z };//PxExtendedVec3
         controllerDesc.setMaterial(pxMtl);
         controllerDesc.setReportCallback(PX.PxUserControllerHitReport.implement(physxWorld.callback.controllerHitReportCB));
-        this._impl = PX.createCapsuleCharacterController(physxWorld.controllerManager, controllerDesc);
+        const impl = PX.createCapsuleCharacterController(physxWorld.controllerManager, controllerDesc);
+        this.setImpl(impl);
 
-        if (this._impl.$$) {
-            PX.IMPL_PTR[this._impl.$$.ptr] = this;
-            const shapePtr = this._impl.getShape().$$.ptr;
+        if (impl.$$) {
+            PX.IMPL_PTR[impl.$$.ptr] = this;
+            const shapePtr = impl.getShape().$$.ptr;
             PX.IMPL_PTR[shapePtr] = this;
         }
 

cocos/physics/physx/character-controllers/physx-character-controller.ts

@@ -31,6 +31,7 @@ import { PhysXWorld } from '../physx-world';
 import { PhysXShape } from '../shapes/physx-shape';
 import { degreesToRadians } from '../../../core/utils/misc';
 import { TransformBit } from '../../../scene-graph';
+import { PhysXFilterData } from '../filter-data';
 
 const v3_0 = new Vec3(0, 0, 0);
 const v3_1 = new Vec3(0, 0, 0);
@@ -41,7 +42,7 @@ export class PhysXCharacterController implements IBaseCharacterController {
     protected _impl: any = null;
     protected _comp: CharacterController = null as any;
     private _pxCollisionFlags = 0;//: PX.PxControllerCollisionFlags;
-    private _filterData: any;
+    private _filterData: PhysXFilterData;
     private _queryFilterCB: any = null;
     protected _word3 = 0;
     protected _overlapRecovery = true;
@@ -85,6 +86,7 @@ export class PhysXCharacterController implements IBaseCharacterController {
         this._filterData.word0 = this._comp.group;
         const mask = PhysicsSystem.instance.collisionMatrix[group];
         this._filterData.word1 = mask;
+        this.updateFilterData();
 
         this.onComponentSet();
 
@@ -292,4 +294,9 @@ export class PhysXCharacterController implements IBaseCharacterController {
         // this._impl.setQueryFilterData(filterData);//set inside move()
         this._impl.setSimulationFilterData(this.filterData);
     }
+
+    protected setImpl (impl: any): void {
+        this._impl = impl;
+        this.updateFilterData();
+    }
 }

cocos/physics/physx/filter-data.ts

@@ -0,0 +1,6 @@
+export interface PhysXFilterData {
+    word0: number;
+    word1: number;
+    word2: number;
+    word3: number;
+}

cocos/physics/physx/physx-shared-body.ts

@@ -37,6 +37,7 @@ import { ERigidBodyType, PhysicsSystem } from '../framework';
 import { PhysXJoint } from './joints/physx-joint';
 import { PhysicsGroup } from '../framework/physics-enum';
 import { Node } from '../../scene-graph';
+import { PhysXFilterData } from './filter-data';
 
 /** @mangle */
 export class PhysXSharedBody {
@@ -89,7 +90,7 @@ export class PhysXSharedBody {
     private _dynamicActor!: PhysX.RigidActor | any;
     private _staticActor!: PhysX.RigidActor | any;
     private _wrappedBody: PhysXRigidBody | null = null;
-    private _filterData: any;
+    private _filterData: PhysXFilterData;
 
     set reference (v: boolean) {
         this._ref = v ? this._ref + 1 : this._ref - 1;