diff --git a/tests/pe/CollisionTobiasGJK.cpp b/tests/pe/CollisionTobiasGJK.cpp index bed8bc4cebb963ccea415ffde4b7bcc45b1db31d..2c3fa052afaa27c40dc7de3145e6999ddd13d04c 100644 --- a/tests/pe/CollisionTobiasGJK.cpp +++ b/tests/pe/CollisionTobiasGJK.cpp @@ -48,7 +48,7 @@ using namespace walberla; using namespace walberla::pe; -typedef boost::tuple<Box, Capsule, Plane, Sphere, Union<boost::tuple<Sphere, Union<boost::tuple<Sphere>>>>, Ellipsoid> BodyTuple ; +typedef boost::tuple<Box, Capsule, Plane, Sphere, Union<boost::tuple<Sphere>>, Union<boost::tuple<Sphere, Union<boost::tuple<Sphere>>>>, Ellipsoid> BodyTuple ; bool gjkEPAcollideHybrid(GeomPrimitive &geom1, GeomPrimitive &geom2, Vec3& normal, Vec3& contactPoint, real_t& penetrationDepth) { diff --git a/tests/pe/SimpleCCD.cpp b/tests/pe/SimpleCCD.cpp index cd0095811a842b11aa2d3bc2d54d95c60d93a0b9..3bb6539082b84879307701ad0ceccc08a782bf48 100644 --- a/tests/pe/SimpleCCD.cpp +++ b/tests/pe/SimpleCCD.cpp @@ -19,18 +19,19 @@ //====================================================================================================================== #include "pe/Materials.h" -#include "pe/rigidbody/Sphere.h" #include "pe/Types.h" #include "pe/rigidbody/BodyStorage.h" +#include "pe/rigidbody/SetBodyTypeIDs.h" +#include "pe/rigidbody/Sphere.h" #include "pe/ccd/SimpleCCD.h" #include "pe/ccd/HashGrids.h" #include "pe/fcd/SimpleFCD.h" -#include "core/DataTypes.h" +#include "core/DataTypes.h" +#include "core/UniqueID.h" #include "core/timing/TimingPool.h" #include "core/debug/TestSubsystem.h" #include "core/math/Random.h" -#include "core/UniqueID.h" using namespace walberla; using namespace walberla::pe; @@ -43,6 +44,8 @@ int main( int argc, char** argv ) walberla::MPIManager::instance()->initializeMPI( &argc, &argv ); + SetBodyTypeIDs<BodyTuple>::execute(); + MaterialID iron = Material::find("iron"); BodyStorage globalStorage;