[SofaMiscCollision] Move back to modules (instead of applications/plu…

…gins) (sofa-framework#2127) * move back sofamisccollision into the modules dir (instead of app/plugins) * add miscollis to componentall * Update CMakeLists.txt
hugtalbot · Jun 14, 2021 · b55fcf9 · b55fcf9
1 parent ca7ff65
commit b55fcf9
Show file tree

Hide file tree

Showing 45 changed files with 2 additions and 1 deletion.
diff --git a/applications/collections/SofaComponentAll/CMakeLists.txt b/applications/collections/SofaComponentAll/CMakeLists.txt
@@ -50,6 +50,7 @@ set(SOFACOMPONENTALL_MODULES
     SofaNonUniformFem
 
     # SofaMisc
+    SofaMiscCollision
     SofaMiscEngine
     SofaMiscExtra
     SofaMiscFem

diff --git a/applications/plugins/CMakeLists.txt b/applications/plugins/CMakeLists.txt
@@ -7,7 +7,6 @@ sofa_add_subdirectory_external(SofaHighOrder SofaHighOrder)
 sofa_add_plugin(CImgPlugin CImgPlugin ON) # ON by default and first as it is used by other plugins.
 sofa_add_plugin(SofaEulerianFluid SofaEulerianFluid)
 sofa_add_plugin(SofaSphFluid SofaSphFluid)
-sofa_add_plugin(SofaMiscCollision SofaMiscCollision ON) # Contains DefaultCollisionGroupManager
 sofa_add_plugin(SofaDistanceGrid SofaDistanceGrid) # Depends on SofaMiscCollision
 sofa_add_plugin(SofaImplicitField SofaImplicitField)
 sofa_add_plugin(MultiThreading MultiThreading)

diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
@@ -47,3 +47,4 @@ sofa_add_plugin(SofaMiscEngine SofaMiscEngine ON)
 sofa_add_plugin(SofaMiscSolver SofaMiscSolver ON)
 sofa_add_plugin(SofaMiscFem SofaMiscFem ON)
 sofa_add_plugin(SofaMiscMapping SofaMiscMapping ON)
+sofa_add_plugin(SofaMiscCollision SofaMiscCollision ON)
diff --git a/.../plugins/SofaMiscCollision/CMakeLists.txt → modules/SofaMiscCollision/CMakeLists.txt b/.../plugins/SofaMiscCollision/CMakeLists.txt → modules/SofaMiscCollision/CMakeLists.txt
diff --git a/...ollision/SofaMiscCollisionConfig.cmake.in → ...ollision/SofaMiscCollisionConfig.cmake.in b/...ollision/SofaMiscCollisionConfig.cmake.in → ...ollision/SofaMiscCollisionConfig.cmake.in
diff --git a/...ion/SofaMiscCollision_test/CMakeLists.txt → ...ion/SofaMiscCollision_test/CMakeLists.txt b/...ion/SofaMiscCollision_test/CMakeLists.txt → ...ion/SofaMiscCollision_test/CMakeLists.txt
diff --git a/...est/DefaultCollisionGroupManager_test.cpp → ...est/DefaultCollisionGroupManager_test.cpp b/...est/DefaultCollisionGroupManager_test.cpp → ...est/DefaultCollisionGroupManager_test.cpp
diff --git a/...llisionGroupManager_singleObject_test.scn → ...llisionGroupManager_singleObject_test.scn b/...llisionGroupManager_singleObject_test.scn → ...llisionGroupManager_singleObject_test.scn
diff --git a/...MiscCollision/BarycentricStickContact.cpp → ...MiscCollision/BarycentricStickContact.cpp b/...MiscCollision/BarycentricStickContact.cpp → ...MiscCollision/BarycentricStickContact.cpp
diff --git a/...faMiscCollision/BarycentricStickContact.h → ...faMiscCollision/BarycentricStickContact.h b/...faMiscCollision/BarycentricStickContact.h → ...faMiscCollision/BarycentricStickContact.h
diff --git a/...MiscCollision/BarycentricStickContact.inl → ...MiscCollision/BarycentricStickContact.inl b/...MiscCollision/BarycentricStickContact.inl → ...MiscCollision/BarycentricStickContact.inl
diff --git a/.../src/SofaMiscCollision/CapsuleContact.cpp → .../src/SofaMiscCollision/CapsuleContact.cpp b/.../src/SofaMiscCollision/CapsuleContact.cpp → .../src/SofaMiscCollision/CapsuleContact.cpp
diff --git a/...ofaMiscCollision/CapsuleContactMapper.cpp → ...ofaMiscCollision/CapsuleContactMapper.cpp b/...ofaMiscCollision/CapsuleContactMapper.cpp → ...ofaMiscCollision/CapsuleContactMapper.cpp
diff --git a/.../SofaMiscCollision/CapsuleContactMapper.h → .../SofaMiscCollision/CapsuleContactMapper.h b/.../SofaMiscCollision/CapsuleContactMapper.h → .../SofaMiscCollision/CapsuleContactMapper.h
diff --git a/...SofaMiscCollision/CapsuleIntersection.cpp → ...SofaMiscCollision/CapsuleIntersection.cpp b/...SofaMiscCollision/CapsuleIntersection.cpp → ...SofaMiscCollision/CapsuleIntersection.cpp
diff --git a/...c/SofaMiscCollision/CapsuleIntersection.h → ...c/SofaMiscCollision/CapsuleIntersection.h b/...c/SofaMiscCollision/CapsuleIntersection.h → ...c/SofaMiscCollision/CapsuleIntersection.h
diff --git a/...ollision/DefaultCollisionGroupManager.cpp → ...ollision/DefaultCollisionGroupManager.cpp b/...ollision/DefaultCollisionGroupManager.cpp → ...ollision/DefaultCollisionGroupManager.cpp
diff --git a/...cCollision/DefaultCollisionGroupManager.h → ...cCollision/DefaultCollisionGroupManager.h b/...cCollision/DefaultCollisionGroupManager.h → ...cCollision/DefaultCollisionGroupManager.h
diff --git a/...ollision/FrictionContact_DistanceGrid.cpp → ...ollision/FrictionContact_DistanceGrid.cpp b/...ollision/FrictionContact_DistanceGrid.cpp → ...ollision/FrictionContact_DistanceGrid.cpp
diff --git a/...sion/src/SofaMiscCollision/OBBContact.cpp → ...sion/src/SofaMiscCollision/OBBContact.cpp b/...sion/src/SofaMiscCollision/OBBContact.cpp → ...sion/src/SofaMiscCollision/OBBContact.cpp
diff --git a/...rc/SofaMiscCollision/OBBContactMapper.cpp → ...rc/SofaMiscCollision/OBBContactMapper.cpp b/...rc/SofaMiscCollision/OBBContactMapper.cpp → ...rc/SofaMiscCollision/OBBContactMapper.cpp
diff --git a/.../src/SofaMiscCollision/OBBContactMapper.h → .../src/SofaMiscCollision/OBBContactMapper.h b/.../src/SofaMiscCollision/OBBContactMapper.h → .../src/SofaMiscCollision/OBBContactMapper.h
diff --git a/...src/SofaMiscCollision/OBBIntersection.cpp → ...src/SofaMiscCollision/OBBIntersection.cpp b/...src/SofaMiscCollision/OBBIntersection.cpp → ...src/SofaMiscCollision/OBBIntersection.cpp
diff --git a/...n/src/SofaMiscCollision/OBBIntersection.h → ...n/src/SofaMiscCollision/OBBIntersection.h b/...n/src/SofaMiscCollision/OBBIntersection.h → ...n/src/SofaMiscCollision/OBBIntersection.h
diff --git a/...Collision/src/SofaMiscCollision/README.md → ...Collision/src/SofaMiscCollision/README.md b/...Collision/src/SofaMiscCollision/README.md → ...Collision/src/SofaMiscCollision/README.md
diff --git a/.../SofaMiscCollision/RayTriangleVisitor.cpp → .../SofaMiscCollision/RayTriangleVisitor.cpp b/.../SofaMiscCollision/RayTriangleVisitor.cpp → .../SofaMiscCollision/RayTriangleVisitor.cpp
diff --git a/...rc/SofaMiscCollision/RayTriangleVisitor.h → ...rc/SofaMiscCollision/RayTriangleVisitor.h b/...rc/SofaMiscCollision/RayTriangleVisitor.h → ...rc/SofaMiscCollision/RayTriangleVisitor.h
diff --git a/...MiscCollision/RuleBasedContactManager.cpp → ...MiscCollision/RuleBasedContactManager.cpp b/...MiscCollision/RuleBasedContactManager.cpp → ...MiscCollision/RuleBasedContactManager.cpp
diff --git a/...faMiscCollision/RuleBasedContactManager.h → ...faMiscCollision/RuleBasedContactManager.h b/...faMiscCollision/RuleBasedContactManager.h → ...faMiscCollision/RuleBasedContactManager.h
diff --git a/...on/src/SofaMiscCollision/SolverMerger.cpp → ...on/src/SofaMiscCollision/SolverMerger.cpp b/...on/src/SofaMiscCollision/SolverMerger.cpp → ...on/src/SofaMiscCollision/SolverMerger.cpp
diff --git a/...sion/src/SofaMiscCollision/SolverMerger.h → ...sion/src/SofaMiscCollision/SolverMerger.h b/...sion/src/SofaMiscCollision/SolverMerger.h → ...sion/src/SofaMiscCollision/SolverMerger.h
diff --git a/...faMiscCollision/SpatialGridPointModel.cpp → ...faMiscCollision/SpatialGridPointModel.cpp b/...faMiscCollision/SpatialGridPointModel.cpp → ...faMiscCollision/SpatialGridPointModel.cpp
diff --git a/...SofaMiscCollision/SpatialGridPointModel.h → ...SofaMiscCollision/SpatialGridPointModel.h b/...SofaMiscCollision/SpatialGridPointModel.h → ...SofaMiscCollision/SpatialGridPointModel.h
diff --git a/...TetrahedronBarycentricPenalityContact.cpp → ...TetrahedronBarycentricPenalityContact.cpp b/...TetrahedronBarycentricPenalityContact.cpp → ...TetrahedronBarycentricPenalityContact.cpp
diff --git a/...ision/TetrahedronDiscreteIntersection.cpp → ...ision/TetrahedronDiscreteIntersection.cpp b/...ision/TetrahedronDiscreteIntersection.cpp → ...ision/TetrahedronDiscreteIntersection.cpp
diff --git a/...llision/TetrahedronDiscreteIntersection.h → ...llision/TetrahedronDiscreteIntersection.h b/...llision/TetrahedronDiscreteIntersection.h → ...llision/TetrahedronDiscreteIntersection.h
diff --git a/...cCollision/TetrahedronFrictionContact.cpp → ...cCollision/TetrahedronFrictionContact.cpp b/...cCollision/TetrahedronFrictionContact.cpp → ...cCollision/TetrahedronFrictionContact.cpp
diff --git a/...rc/SofaMiscCollision/TetrahedronModel.cpp → ...rc/SofaMiscCollision/TetrahedronModel.cpp b/...rc/SofaMiscCollision/TetrahedronModel.cpp → ...rc/SofaMiscCollision/TetrahedronModel.cpp
diff --git a/.../src/SofaMiscCollision/TetrahedronModel.h → .../src/SofaMiscCollision/TetrahedronModel.h b/.../src/SofaMiscCollision/TetrahedronModel.h → .../src/SofaMiscCollision/TetrahedronModel.h
diff --git a/...faMiscCollision/TetrahedronRayContact.cpp → ...faMiscCollision/TetrahedronRayContact.cpp b/...faMiscCollision/TetrahedronRayContact.cpp → ...faMiscCollision/TetrahedronRayContact.cpp
diff --git a/...cCollision/TriangleModelInRegularGrid.cpp → ...cCollision/TriangleModelInRegularGrid.cpp b/...cCollision/TriangleModelInRegularGrid.cpp → ...cCollision/TriangleModelInRegularGrid.cpp
diff --git a/...iscCollision/TriangleModelInRegularGrid.h → ...iscCollision/TriangleModelInRegularGrid.h b/...iscCollision/TriangleModelInRegularGrid.h → ...iscCollision/TriangleModelInRegularGrid.h
diff --git a/...llision/src/SofaMiscCollision/config.h.in → ...llision/src/SofaMiscCollision/config.h.in b/...llision/src/SofaMiscCollision/config.h.in → ...llision/src/SofaMiscCollision/config.h.in
diff --git a/...faMiscCollision/initSofaMiscCollision.cpp → ...faMiscCollision/initSofaMiscCollision.cpp b/...faMiscCollision/initSofaMiscCollision.cpp → ...faMiscCollision/initSofaMiscCollision.cpp
diff --git a/...SofaMiscCollision/initSofaMiscCollision.h → ...SofaMiscCollision/initSofaMiscCollision.h b/...SofaMiscCollision/initSofaMiscCollision.h → ...SofaMiscCollision/initSofaMiscCollision.h