joshua
/
vphysics_jolt
mirror of https://github.com/Joshua-Ashton/VPhysics-Jolt
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove #if __cplusplus checks

This commit is contained in:
arthurdead 2022-08-29 03:54:52 -03:00
parent 9918bbd0cb
commit 3abfb61aca
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vphysics_jolt/vjolt_controller_fluid.cpp
View File

@ -103,16 +103,12 @@ void JoltPhysicsFluidController::OnJoltPhysicsObjectDestroyed( JoltPhysicsObject
if ( pObject == m_pFluidObject )
m_pFluidObject = nullptr;
#if __cplusplus >= 202002L
std::erase_if( m_ObjectsInShape, [pObject]( JoltPhysicsObject *pCachedObject ) { return pObject == pCachedObject; } );
#else
for ( auto it( m_ObjectsInShape.begin() ); it != m_ObjectsInShape.end(); ++it ) {
if ( *it == pObject ) {
m_ObjectsInShape.erase(it);
break;
}
}
#endif
}
//-------------------------------------------------------------------------------------------------

10
vphysics_jolt/vjolt_objectpairhash.cpp
View File

@ -54,12 +54,8 @@ void JoltPhysicsObjectPairHash::RemoveObjectPair( void *pObject0, void *pObject1
bool JoltPhysicsObjectPairHash::IsObjectPairInHash( void *pObject0, void *pObject1 )
{
auto pair = CreateSortedPair( pObject0, pObject1 );
auto &pairHashes = m_PairHashes[ GetHashArrayIndex( PointerHasher{}( pair ) ) ];
#if __cplusplus >= 202002L
return pairHashes.contains( pair );
#else
auto &pairHashes = m_PairHashes[ GetHashArrayIndex( PointerHasher{}( pair ) ) ];
return pairHashes.find( pair ) != pairHashes.end();
#endif
}
void JoltPhysicsObjectPairHash::RemoveAllPairsForObject( void *pObject0 )
@ -76,11 +72,7 @@ void JoltPhysicsObjectPairHash::RemoveAllPairsForObject( void *pObject0 )
bool JoltPhysicsObjectPairHash::IsObjectInHash( void *pObject0 )
{
#if __cplusplus >= 202002L
return m_Objects.contains( pObject0 );
#else
return m_Objects.find( pObject0 ) != m_Objects.end();
#endif
}
//-------------------------------------------------------------------------------------------------