ENH: Merge collision context branch.
Revert some changes and make it build, run FEMSimulator example CollisionContext/CMakeLists.txt was contributed by Sreekanth.
Showing
- CMakeLists.txt 1 addition, 0 deletionsCMakeLists.txt
- Collision/MeshToMeshCollision.cpp 2 additions, 2 deletionsCollision/MeshToMeshCollision.cpp
- Collision/MeshToMeshCollision.h 2 additions, 2 deletionsCollision/MeshToMeshCollision.h
- Collision/PlaneToMeshCollision.cpp 2 additions, 2 deletionsCollision/PlaneToMeshCollision.cpp
- Collision/PlaneToMeshCollision.h 2 additions, 2 deletionsCollision/PlaneToMeshCollision.h
- Collision/SpatialHashCollision.h 1 addition, 1 deletionCollision/SpatialHashCollision.h
- Collision/UnitTests/CollisionPairSpec.cpp 5 additions, 5 deletionsCollision/UnitTests/CollisionPairSpec.cpp
- Collision/UnitTests/MeshToMeshCollisionSpec.cpp 2 additions, 2 deletionsCollision/UnitTests/MeshToMeshCollisionSpec.cpp
- CollisionContext/CMakeLists.txt 17 additions, 0 deletionsCollisionContext/CMakeLists.txt
- CollisionContext/CollisionContext.cpp 126 additions, 118 deletionsCollisionContext/CollisionContext.cpp
- CollisionContext/CollisionContext.h 76 additions, 65 deletionsCollisionContext/CollisionContext.h
- ContactHandling/PenaltyContactFemToStatic.cpp 3 additions, 3 deletionsContactHandling/PenaltyContactFemToStatic.cpp
- ContactHandling/PenaltyContactHandling.cpp 1 addition, 1 deletionContactHandling/PenaltyContactHandling.cpp
- ContactHandling/PenaltyContactHandling.h 1 addition, 1 deletionContactHandling/PenaltyContactHandling.h
- ContactHandling/UnitTests/PenaltyContactHandlingSpec.cpp 3 additions, 3 deletionsContactHandling/UnitTests/PenaltyContactHandlingSpec.cpp
- Core/AnalyticalGeometry.cpp 0 additions, 225 deletionsCore/AnalyticalGeometry.cpp
- Core/AnalyticalGeometry.h 0 additions, 541 deletionsCore/AnalyticalGeometry.h
- Core/CMakeLists.txt 2 additions, 4 deletionsCore/CMakeLists.txt
- Core/CollisionDetection.cpp 1 addition, 1 deletionCore/CollisionDetection.cpp
- Core/CollisionDetection.h 3 additions, 3 deletionsCore/CollisionDetection.h
Loading
Please register or sign in to comment