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

Fix compilation warnings

Browse Source
This commit is contained in:
Daniel Chappuis 2018-04-15 23:25:21 +02:00
parent 53ecef10b4
commit e0c624205c
3 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/containers/Map.h
View File

@ -427,7 +427,7 @@ class Map {
} }
/// Allocate memory for a given number of elements /// Allocate memory for a given number of elements
void reserve(size_t capacity) { void reserve(int capacity) {
if (capacity <= mCapacity) return; if (capacity <= mCapacity) return;

8
src/memory/MemoryManager.h
View File

@ -97,10 +97,12 @@ class MemoryManager {
inline void* MemoryManager::allocate(AllocationType allocationType, size_t size) { inline void* MemoryManager::allocate(AllocationType allocationType, size_t size) {
switch (allocationType) { switch (allocationType) {
case AllocationType::Base: return mBaseAllocator->allocate(size); break; case AllocationType::Base: return mBaseAllocator->allocate(size);
case AllocationType::Pool: return mPoolAllocator.allocate(size); break; case AllocationType::Pool: return mPoolAllocator.allocate(size);
case AllocationType::Frame: return mSingleFrameAllocator.allocate(size); break; case AllocationType::Frame: return mSingleFrameAllocator.allocate(size);
} }
return nullptr;
} }
// Release previously allocated memory. // Release previously allocated memory.

35
test/tests/collision/TestCollisionWorld.h
View File

@ -2518,10 +2518,7 @@ class TestCollisionWorld : public Test {
test(collisionData->getNbContactManifolds() == 1); test(collisionData->getNbContactManifolds() == 1);
test(collisionData->getTotalNbContactPoints() == 4); test(collisionData->getTotalNbContactPoints() == 4);
// True if the bodies are swapped in the collision callback response for (size_t i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) {
bool swappedBodiesCollisionData = collisionData->getBody1()->getId() != mBoxBody1->getId();
for (int i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) {
test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f)); test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f));
} }
@ -2538,10 +2535,7 @@ class TestCollisionWorld : public Test {
test(collisionData->getNbContactManifolds() == 1); test(collisionData->getNbContactManifolds() == 1);
test(collisionData->getTotalNbContactPoints() == 4); test(collisionData->getTotalNbContactPoints() == 4);
// True if the bodies are swapped in the collision callback response for (size_t i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) {
swappedBodiesCollisionData = collisionData->getBody1()->getId() != mBoxBody1->getId();
for (int i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) {
test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f)); test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f));
} }
@ -2558,10 +2552,7 @@ class TestCollisionWorld : public Test {
test(collisionData->getNbContactManifolds() == 1); test(collisionData->getNbContactManifolds() == 1);
test(collisionData->getTotalNbContactPoints() == 4); test(collisionData->getTotalNbContactPoints() == 4);
// True if the bodies are swapped in the collision callback response for (size_t i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) {
swappedBodiesCollisionData = collisionData->getBody1()->getId() != mBoxBody1->getId();
for (int i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) {
test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f)); test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f));
} }
@ -2578,11 +2569,8 @@ class TestCollisionWorld : public Test {
test(collisionData->getNbContactManifolds() == 1); test(collisionData->getNbContactManifolds() == 1);
test(collisionData->getTotalNbContactPoints() == 4); test(collisionData->getTotalNbContactPoints() == 4);
// True if the bodies are swapped in the collision callback response
swappedBodiesCollisionData = collisionData->getBody1()->getId() != mBoxBody1->getId();
// Test contact points // Test contact points
for (int i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) { for (size_t i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) {
test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f)); test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f));
} }
@ -2652,10 +2640,7 @@ class TestCollisionWorld : public Test {
test(collisionData->getNbContactManifolds() == 1); test(collisionData->getNbContactManifolds() == 1);
test(collisionData->getTotalNbContactPoints() == 4); test(collisionData->getTotalNbContactPoints() == 4);
// True if the bodies are swapped in the collision callback response for (size_t i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) {
swappedBodiesCollisionData = collisionData->getBody1()->getId() != mConvexMeshBody1->getId();
for (int i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) {
test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f)); test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f));
} }
@ -2672,10 +2657,7 @@ class TestCollisionWorld : public Test {
test(collisionData->getNbContactManifolds() == 1); test(collisionData->getNbContactManifolds() == 1);
test(collisionData->getTotalNbContactPoints() == 4); test(collisionData->getTotalNbContactPoints() == 4);
// True if the bodies are swapped in the collision callback response for (size_t i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) {
swappedBodiesCollisionData = collisionData->getBody1()->getId() != mConvexMeshBody1->getId();
for (int i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) {
test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f)); test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f));
} }
@ -2692,11 +2674,8 @@ class TestCollisionWorld : public Test {
test(collisionData->getNbContactManifolds() == 1); test(collisionData->getNbContactManifolds() == 1);
test(collisionData->getTotalNbContactPoints() == 4); test(collisionData->getTotalNbContactPoints() == 4);
// True if the bodies are swapped in the collision callback response
swappedBodiesCollisionData = collisionData->getBody1()->getId() != mConvexMeshBody1->getId();
// Test contact points // Test contact points
for (int i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) { for (size_t i=0; i<collisionData->contactManifolds[0].contactPoints.size(); i++) {
test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f)); test(approxEqual(collisionData->contactManifolds[0].contactPoints[i].penetrationDepth, 1.0f));
} }