address PR comments
This commit is contained in:
parent
8bd9bc8b6d
commit
9918bbd0cb
|
@ -107,8 +107,10 @@ void JoltPhysicsFluidController::OnJoltPhysicsObjectDestroyed( JoltPhysicsObject
|
||||||
std::erase_if( m_ObjectsInShape, [pObject]( JoltPhysicsObject *pCachedObject ) { return pObject == pCachedObject; } );
|
std::erase_if( m_ObjectsInShape, [pObject]( JoltPhysicsObject *pCachedObject ) { return pObject == pCachedObject; } );
|
||||||
#else
|
#else
|
||||||
for ( auto it( m_ObjectsInShape.begin() ); it != m_ObjectsInShape.end(); ++it ) {
|
for ( auto it( m_ObjectsInShape.begin() ); it != m_ObjectsInShape.end(); ++it ) {
|
||||||
if ( *it == pObject )
|
if ( *it == pObject ) {
|
||||||
it = m_ObjectsInShape.erase(it);
|
m_ObjectsInShape.erase(it);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,12 +5,10 @@
|
||||||
|
|
||||||
struct JoltPhysicsContactPair
|
struct JoltPhysicsContactPair
|
||||||
{
|
{
|
||||||
#if __cplusplus < 202002L
|
|
||||||
JoltPhysicsContactPair( JoltPhysicsObject *object1, JoltPhysicsObject *object2 )
|
JoltPhysicsContactPair( JoltPhysicsObject *object1, JoltPhysicsObject *object2 )
|
||||||
: pObject1(object1), pObject2(object2)
|
: pObject1(object1), pObject2(object2)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
JoltPhysicsObject *pObject1 = nullptr;
|
JoltPhysicsObject *pObject1 = nullptr;
|
||||||
JoltPhysicsObject *pObject2 = nullptr;
|
JoltPhysicsObject *pObject2 = nullptr;
|
||||||
|
|
|
@ -58,7 +58,7 @@ bool JoltPhysicsObjectPairHash::IsObjectPairInHash( void *pObject0, void *pObjec
|
||||||
#if __cplusplus >= 202002L
|
#if __cplusplus >= 202002L
|
||||||
return pairHashes.contains( pair );
|
return pairHashes.contains( pair );
|
||||||
#else
|
#else
|
||||||
return pairHashes.find( pair ) != pairHashes.cend();
|
return pairHashes.find( pair ) != pairHashes.end();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@ bool JoltPhysicsObjectPairHash::IsObjectInHash( void *pObject0 )
|
||||||
#if __cplusplus >= 202002L
|
#if __cplusplus >= 202002L
|
||||||
return m_Objects.contains( pObject0 );
|
return m_Objects.contains( pObject0 );
|
||||||
#else
|
#else
|
||||||
return m_Objects.find( pObject0 ) != m_Objects.cend();
|
return m_Objects.find( pObject0 ) != m_Objects.end();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue