1.基于 Box2D JSB 的2D物理系统 结束碰撞但不回调 2.回调个数BeginContact和EndContact不一致。

cocos/physics-2d/box2d-jsb/physics-contact-manager.ts

@@ -0,0 +1,56 @@
+/*
+ Copyright (c) 2024 Xiamen Yaji Software Co., Ltd.
+
+ https://www.cocos.com/
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+*/
+import { PhysicsContact, b2ContactExtends } from './physics-contact';
+
+const contactMap = new Map<b2ContactExtends, PhysicsContact>();
+const pools: PhysicsContact[] = [];
+
+export class PhysicsContactManager {
+    static get (b2contact: b2ContactExtends): PhysicsContact {
+        let c = pools.pop();
+        if (!c) {
+            c = new PhysicsContact();
+        }
+        c.init(b2contact);
+        contactMap.set(b2contact, c);
+        return c;
+    }
+
+    static find (b2contact: b2ContactExtends): PhysicsContact | null {
+        return contactMap.get(b2contact) ?? null;
+    }
+
+    static put (b2contact: b2ContactExtends): void {
+        const c = contactMap.get(b2contact);
+        if (!c) return;
+        pools.push(c);
+        c.reset();
+        contactMap.delete(b2contact);
+    }
+
+    static clear (): void {
+        contactMap.clear();
+        pools.length = 0;
+    }
+}

cocos/physics-2d/box2d-jsb/physics-contact.ts

@@ -31,8 +31,6 @@ export type b2ContactExtends = b2jsb.Contact & {
     m_userData: any
 }
 
-const pools: PhysicsContact[] = [];
-
 // temp world manifold
 const pointCache = [new Vec2(), new Vec2()];
 
@@ -74,25 +72,6 @@ const impulse: IPhysics2DImpulse = {
 };
 
 export class PhysicsContact implements IPhysics2DContact {
-    static get (b2contact: b2ContactExtends): PhysicsContact {
-        let c = pools.pop();
-
-        if (!c) {
-            c = new PhysicsContact();
-        }
-
-        c.init(b2contact);
-        return c;
-    }
-
-    static put (b2contact: b2ContactExtends): void {
-        const c: PhysicsContact = b2contact.m_userData as PhysicsContact;
-        if (!c) return;
-
-        pools.push(c);
-        c.reset();
-    }
-
     colliderA: Collider2D | null = null;
     colliderB: Collider2D | null = null;
 
@@ -108,16 +87,13 @@ export class PhysicsContact implements IPhysics2DContact {
     }
 
     init (b2contact: b2ContactExtends): void {
+        this._b2contact = b2contact;
         this.colliderA = (b2contact.GetFixtureA().m_userData as b2Shape2D).collider;
         this.colliderB = (b2contact.GetFixtureB().m_userData as b2Shape2D).collider;
         this.disabled = false;
         this.disabledOnce = false;
         this._impulse = null!;
-
         this._inverted = false;
-
-        this._b2contact = b2contact;
-        b2contact.m_userData = this;
     }
 
     reset (): void {
@@ -130,7 +106,6 @@ export class PhysicsContact implements IPhysics2DContact {
         this.disabled = false;
         this._impulse = null!;
 
-        this._b2contact.m_userData = null;
         this._b2contact = null!;
     }
 

cocos/physics-2d/box2d-jsb/physics-world.ts

@@ -36,6 +36,7 @@ import { PhysicsContactListener } from './platform/physics-contact-listener';
 import { PhysicsAABBQueryCallback } from './platform/physics-aabb-query-callback';
 import { PhysicsRayCastCallback } from './platform/physics-ray-cast-callback';
 import { PhysicsContact, b2ContactExtends } from './physics-contact';
+import { PhysicsContactManager } from './physics-contact-manager';
 import { Contact2DType, Collider2D, RaycastResult2D } from '../framework';
 import { b2Shape2D } from './shapes/shape-2d';
 import { PhysicsDebugDraw } from './platform/physics-debug-draw';
@@ -444,22 +445,22 @@ export class b2PhysicsWorld implements IPhysicsWorld {
     }
 
     _onBeginContact (b2contact: b2ContactExtends): void {
-        const c = PhysicsContact.get(b2contact);
+        const c = PhysicsContactManager.get(b2contact);
         c.emit(Contact2DType.BEGIN_CONTACT);
     }
 
     _onEndContact (b2contact: b2ContactExtends): void {
-        const c = b2contact.m_userData as PhysicsContact;
+        const c = PhysicsContactManager.find(b2contact);
         if (!c) {
             return;
         }
         c.emit(Contact2DType.END_CONTACT);
 
-        PhysicsContact.put(b2contact);
+        PhysicsContactManager.put(b2contact);
     }
 
     _onPreSolve (b2contact: b2ContactExtends): void {
-        const c = b2contact.m_userData as PhysicsContact;
+        const c = PhysicsContactManager.find(b2contact);
         if (!c) {
             return;
         }
@@ -468,7 +469,7 @@ export class b2PhysicsWorld implements IPhysicsWorld {
     }
 
     _onPostSolve (b2contact: b2ContactExtends, impulse: b2jsb.ContactImpulse): void {
-        const c: PhysicsContact = b2contact.m_userData as PhysicsContact;
+        const c = PhysicsContactManager.find(b2contact);
         if (!c) {
             return;
         }