Merge pull request #1559 from INEEDSSD/LayaAir_3.1

fix: Fixed the problem of reuse of physical component collider.
layabox · Jul 26, 2024 · 1131666 · 1131666
2 parents 2af4ef3 + 5acea3c
commit 1131666
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/layaAir/laya/Physics3D/Bullet/btPhysicsManager.ts b/src/layaAir/laya/Physics3D/Bullet/btPhysicsManager.ts
@@ -272,14 +272,18 @@ export class btPhysicsManager implements IPhysicsManager {
         bt.btGImpactCollisionAlgorithm_RegisterAlgorithm(this._btDispatcher);//注册算法
         this.initPhysicsCapable();  // 初始化物理能力
     }
-    setActiveCollider(collider: ICollider, value: boolean): void {
+    setActiveCollider(collider: btCollider, value: boolean): void {
         collider.active = value;
+        if (value) {
+            collider._physicsManager = this;
+        } else {
+            collider._physicsManager = null;
+        }
     }
     sphereQuery?(pos: Vector3, radius: number, result: ICollider[], collisionmask: number): void {
         throw new Error("Method not implemented.");
     }
 
-
 
     /**
     * @internal

diff --git a/src/layaAir/laya/Physics3D/PhysX/pxPhysicsManager.ts b/src/layaAir/laya/Physics3D/PhysX/pxPhysicsManager.ts
@@ -130,8 +130,13 @@ export class pxPhysicsManager implements IPhysicsManager {
         }
         this.fixedTime = physicsSettings.fixedTimeStep;
     }
-    setActiveCollider(collider: ICollider, value: boolean): void {
+    setActiveCollider(collider: pxCollider, value: boolean): void {
         collider.active = value;
+        if (value) {
+            collider._physicsManager = this;
+        } else {
+            collider._physicsManager = null;
+        }
     }
     enableDebugDrawer?(value: boolean): void {
         throw new Error("Method not implemented.");