From 8cb30741bf823ceecd105dfd580852063a68bc22 Mon Sep 17 00:00:00 2001 From: 2youyouo2 <501251991@qq.com> Date: Sat, 1 Apr 2017 15:27:34 +0800 Subject: [PATCH] optimize contact listener --- .../physics/CCPhysicsContactListener.cpp | 21 ++++++------------- .../physics/CCPhysicsContactListener.h | 3 +++ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/native/cocos/editor-support/creator/physics/CCPhysicsContactListener.cpp b/native/cocos/editor-support/creator/physics/CCPhysicsContactListener.cpp index 1bd6e5f03a..16d304be9c 100644 --- a/native/cocos/editor-support/creator/physics/CCPhysicsContactListener.cpp +++ b/native/cocos/editor-support/creator/physics/CCPhysicsContactListener.cpp @@ -43,6 +43,7 @@ void PhysicsContactListener::BeginContact(b2Contact* contact) if (find(_contactFixtures.begin(), _contactFixtures.end(), fixtureA) != _contactFixtures.end() || find(_contactFixtures.begin(), _contactFixtures.end(), fixtureB) != _contactFixtures.end()) { + _contactMap[contact] = true; _beginContact(contact); } @@ -52,13 +53,11 @@ void PhysicsContactListener::EndContact(b2Contact* contact) { if (!_endContact) return; - b2Fixture* fixtureA = contact->GetFixtureA(); - b2Fixture* fixtureB = contact->GetFixtureB(); - - if (find(_contactFixtures.begin(), _contactFixtures.end(), fixtureA) != _contactFixtures.end() || - find(_contactFixtures.begin(), _contactFixtures.end(), fixtureB) != _contactFixtures.end()) + auto i = _contactMap.find(contact); + if (i != _contactMap.end()) { _endContact(contact); + _contactMap.erase(i); } } @@ -66,11 +65,7 @@ void PhysicsContactListener::PreSolve(b2Contact* contact, const b2Manifold* oldM { if (!_preSolve) return; - b2Fixture* fixtureA = contact->GetFixtureA(); - b2Fixture* fixtureB = contact->GetFixtureB(); - - if (find(_contactFixtures.begin(), _contactFixtures.end(), fixtureA) != _contactFixtures.end() || - find(_contactFixtures.begin(), _contactFixtures.end(), fixtureB) != _contactFixtures.end()) + if (_contactMap.find(contact) != _contactMap.end()) { _preSolve(contact); } @@ -80,11 +75,7 @@ void PhysicsContactListener::PostSolve(b2Contact* contact, const b2ContactImpuls { if (!_postSolve) return; - b2Fixture* fixtureA = contact->GetFixtureA(); - b2Fixture* fixtureB = contact->GetFixtureB(); - - if (find(_contactFixtures.begin(), _contactFixtures.end(), fixtureA) != _contactFixtures.end() || - find(_contactFixtures.begin(), _contactFixtures.end(), fixtureB) != _contactFixtures.end()) + if (_contactMap.find(contact) != _contactMap.end()) { _impulse.init(impulse); _postSolve(contact, &_impulse); diff --git a/native/cocos/editor-support/creator/physics/CCPhysicsContactListener.h b/native/cocos/editor-support/creator/physics/CCPhysicsContactListener.h index 38dd11975d..b3434cac50 100644 --- a/native/cocos/editor-support/creator/physics/CCPhysicsContactListener.h +++ b/native/cocos/editor-support/creator/physics/CCPhysicsContactListener.h @@ -32,6 +32,7 @@ #include #include + namespace creator { class CC_DLL PhysicsContactListener : public b2ContactListener @@ -62,6 +63,8 @@ protected: std::vector _contactFixtures; PhysicsContactImpulse _impulse; + + std::unordered_map _contactMap; }; }