mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Daniel Chappuis 2022-02-23 22:44:13 +01:00
commit 0e44e922bb
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/reactphysics3d/components/Components.h
View File

@ -137,7 +137,7 @@ RP3D_FORCE_INLINE bool Components::hasComponent(Entity entity) const {
return mMapEntityToComponentIndex.containsKey(entity); return mMapEntityToComponentIndex.containsKey(entity);
} }
// Return true if there is a component for a given entiy and if so set the entity index // Return true if there is a component for a given entity and if so set the entity index
RP3D_FORCE_INLINE bool Components::hasComponentGetIndex(Entity entity, uint32& entityIndex) const { RP3D_FORCE_INLINE bool Components::hasComponentGetIndex(Entity entity, uint32& entityIndex) const {
auto it = mMapEntityToComponentIndex.find(entity); auto it = mMapEntityToComponentIndex.find(entity);

4
src/systems/CollisionDetectionSystem.cpp
View File

@ -665,7 +665,7 @@ void CollisionDetectionSystem::addContactPairsToBodies() {
mRigidBodyComponents.addContacPair(contactPair.body2Entity, p); mRigidBodyComponents.addContacPair(contactPair.body2Entity, p);
} }
// If at least of body is a CollisionBody // If at least one of the two bodies is a CollisionBody
if (!isBody1Rigid || !isBody2Rigid) { if (!isBody1Rigid || !isBody2Rigid) {
// Add the pair index to the array of pairs with CollisionBody // Add the pair index to the array of pairs with CollisionBody
@ -858,8 +858,6 @@ void CollisionDetectionSystem::createContacts() {
// creation (only the pairs with two RigidBodies are added during island creation) // creation (only the pairs with two RigidBodies are added during island creation)
mWorld->mProcessContactPairsOrderIslands.addRange(mCollisionBodyContactPairsIndices); mWorld->mProcessContactPairsOrderIslands.addRange(mCollisionBodyContactPairsIndices);
assert(mWorld->mProcessContactPairsOrderIslands.size() == (*mCurrentContactPairs).size());
// Process the contact pairs in the order defined by the islands such that the contact manifolds and // Process the contact pairs in the order defined by the islands such that the contact manifolds and
// contact points of a given island are packed together in the array of manifolds and contact points // contact points of a given island are packed together in the array of manifolds and contact points
const uint32 nbContactPairsToProcess = static_cast<uint32>(mWorld->mProcessContactPairsOrderIslands.size()); const uint32 nbContactPairsToProcess = static_cast<uint32>(mWorld->mProcessContactPairsOrderIslands.size());