From b55fcf901859de5f50dd69d33f09fe2e0f6dfcc9 Mon Sep 17 00:00:00 2001 From: Frederick Roy Date: Tue, 8 Jun 2021 09:08:52 +0200 Subject: [PATCH] [SofaMiscCollision] Move back to modules (instead of applications/plugins) (#2127) * move back sofamisccollision into the modules dir (instead of app/plugins) * add miscollis to componentall * Update CMakeLists.txt --- applications/collections/SofaComponentAll/CMakeLists.txt | 1 + applications/plugins/CMakeLists.txt | 1 - modules/CMakeLists.txt | 1 + .../plugins => modules}/SofaMiscCollision/CMakeLists.txt | 0 .../SofaMiscCollision/SofaMiscCollisionConfig.cmake.in | 0 .../SofaMiscCollision/SofaMiscCollision_test/CMakeLists.txt | 0 .../SofaMiscCollision_test/DefaultCollisionGroupManager_test.cpp | 0 .../scenes/DefaultCollisionGroupManager_singleObject_test.scn | 0 .../src/SofaMiscCollision/BarycentricStickContact.cpp | 0 .../src/SofaMiscCollision/BarycentricStickContact.h | 0 .../src/SofaMiscCollision/BarycentricStickContact.inl | 0 .../SofaMiscCollision/src/SofaMiscCollision/CapsuleContact.cpp | 0 .../src/SofaMiscCollision/CapsuleContactMapper.cpp | 0 .../src/SofaMiscCollision/CapsuleContactMapper.h | 0 .../src/SofaMiscCollision/CapsuleIntersection.cpp | 0 .../src/SofaMiscCollision/CapsuleIntersection.h | 0 .../src/SofaMiscCollision/DefaultCollisionGroupManager.cpp | 0 .../src/SofaMiscCollision/DefaultCollisionGroupManager.h | 0 .../src/SofaMiscCollision/FrictionContact_DistanceGrid.cpp | 0 .../SofaMiscCollision/src/SofaMiscCollision/OBBContact.cpp | 0 .../SofaMiscCollision/src/SofaMiscCollision/OBBContactMapper.cpp | 0 .../SofaMiscCollision/src/SofaMiscCollision/OBBContactMapper.h | 0 .../SofaMiscCollision/src/SofaMiscCollision/OBBIntersection.cpp | 0 .../SofaMiscCollision/src/SofaMiscCollision/OBBIntersection.h | 0 .../SofaMiscCollision/src/SofaMiscCollision/README.md | 0 .../src/SofaMiscCollision/RayTriangleVisitor.cpp | 0 .../SofaMiscCollision/src/SofaMiscCollision/RayTriangleVisitor.h | 0 .../src/SofaMiscCollision/RuleBasedContactManager.cpp | 0 .../src/SofaMiscCollision/RuleBasedContactManager.h | 0 .../SofaMiscCollision/src/SofaMiscCollision/SolverMerger.cpp | 0 .../SofaMiscCollision/src/SofaMiscCollision/SolverMerger.h | 0 .../src/SofaMiscCollision/SpatialGridPointModel.cpp | 0 .../src/SofaMiscCollision/SpatialGridPointModel.h | 0 .../SofaMiscCollision/TetrahedronBarycentricPenalityContact.cpp | 0 .../src/SofaMiscCollision/TetrahedronDiscreteIntersection.cpp | 0 .../src/SofaMiscCollision/TetrahedronDiscreteIntersection.h | 0 .../src/SofaMiscCollision/TetrahedronFrictionContact.cpp | 0 .../SofaMiscCollision/src/SofaMiscCollision/TetrahedronModel.cpp | 0 .../SofaMiscCollision/src/SofaMiscCollision/TetrahedronModel.h | 0 .../src/SofaMiscCollision/TetrahedronRayContact.cpp | 0 .../src/SofaMiscCollision/TriangleModelInRegularGrid.cpp | 0 .../src/SofaMiscCollision/TriangleModelInRegularGrid.h | 0 .../SofaMiscCollision/src/SofaMiscCollision/config.h.in | 0 .../src/SofaMiscCollision/initSofaMiscCollision.cpp | 0 .../src/SofaMiscCollision/initSofaMiscCollision.h | 0 45 files changed, 2 insertions(+), 1 deletion(-) rename {applications/plugins => modules}/SofaMiscCollision/CMakeLists.txt (100%) rename {applications/plugins => modules}/SofaMiscCollision/SofaMiscCollisionConfig.cmake.in (100%) rename {applications/plugins => modules}/SofaMiscCollision/SofaMiscCollision_test/CMakeLists.txt (100%) rename {applications/plugins => modules}/SofaMiscCollision/SofaMiscCollision_test/DefaultCollisionGroupManager_test.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/SofaMiscCollision_test/scenes/DefaultCollisionGroupManager_singleObject_test.scn (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.h (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.inl (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/CapsuleContact.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/CapsuleContactMapper.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/CapsuleContactMapper.h (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/CapsuleIntersection.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/CapsuleIntersection.h (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/DefaultCollisionGroupManager.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/DefaultCollisionGroupManager.h (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/FrictionContact_DistanceGrid.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/OBBContact.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/OBBContactMapper.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/OBBContactMapper.h (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/OBBIntersection.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/OBBIntersection.h (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/README.md (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/RayTriangleVisitor.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/RayTriangleVisitor.h (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/RuleBasedContactManager.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/RuleBasedContactManager.h (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/SolverMerger.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/SolverMerger.h (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/SpatialGridPointModel.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/SpatialGridPointModel.h (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/TetrahedronBarycentricPenalityContact.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/TetrahedronDiscreteIntersection.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/TetrahedronDiscreteIntersection.h (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/TetrahedronFrictionContact.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/TetrahedronModel.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/TetrahedronModel.h (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/TetrahedronRayContact.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/TriangleModelInRegularGrid.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/TriangleModelInRegularGrid.h (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/config.h.in (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/initSofaMiscCollision.cpp (100%) rename {applications/plugins => modules}/SofaMiscCollision/src/SofaMiscCollision/initSofaMiscCollision.h (100%) diff --git a/applications/collections/SofaComponentAll/CMakeLists.txt b/applications/collections/SofaComponentAll/CMakeLists.txt index 313787c9f030..f6149c09065e 100644 --- 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 index 0177c8428518..5c4f33d2801e 100644 --- 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 index 086d5b016d67..284fd809af47 100644 --- 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/applications/plugins/SofaMiscCollision/CMakeLists.txt b/modules/SofaMiscCollision/CMakeLists.txt similarity index 100% rename from applications/plugins/SofaMiscCollision/CMakeLists.txt rename to modules/SofaMiscCollision/CMakeLists.txt diff --git a/applications/plugins/SofaMiscCollision/SofaMiscCollisionConfig.cmake.in b/modules/SofaMiscCollision/SofaMiscCollisionConfig.cmake.in similarity index 100% rename from applications/plugins/SofaMiscCollision/SofaMiscCollisionConfig.cmake.in rename to modules/SofaMiscCollision/SofaMiscCollisionConfig.cmake.in diff --git a/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/CMakeLists.txt b/modules/SofaMiscCollision/SofaMiscCollision_test/CMakeLists.txt similarity index 100% rename from applications/plugins/SofaMiscCollision/SofaMiscCollision_test/CMakeLists.txt rename to modules/SofaMiscCollision/SofaMiscCollision_test/CMakeLists.txt diff --git a/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/DefaultCollisionGroupManager_test.cpp b/modules/SofaMiscCollision/SofaMiscCollision_test/DefaultCollisionGroupManager_test.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/SofaMiscCollision_test/DefaultCollisionGroupManager_test.cpp rename to modules/SofaMiscCollision/SofaMiscCollision_test/DefaultCollisionGroupManager_test.cpp diff --git a/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/scenes/DefaultCollisionGroupManager_singleObject_test.scn b/modules/SofaMiscCollision/SofaMiscCollision_test/scenes/DefaultCollisionGroupManager_singleObject_test.scn similarity index 100% rename from applications/plugins/SofaMiscCollision/SofaMiscCollision_test/scenes/DefaultCollisionGroupManager_singleObject_test.scn rename to modules/SofaMiscCollision/SofaMiscCollision_test/scenes/DefaultCollisionGroupManager_singleObject_test.scn diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.h b/modules/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.h diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.inl b/modules/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.inl similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.inl rename to modules/SofaMiscCollision/src/SofaMiscCollision/BarycentricStickContact.inl diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/CapsuleContact.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/CapsuleContact.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/CapsuleContact.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/CapsuleContact.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/CapsuleContactMapper.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/CapsuleContactMapper.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/CapsuleContactMapper.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/CapsuleContactMapper.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/CapsuleContactMapper.h b/modules/SofaMiscCollision/src/SofaMiscCollision/CapsuleContactMapper.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/CapsuleContactMapper.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/CapsuleContactMapper.h diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/CapsuleIntersection.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/CapsuleIntersection.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/CapsuleIntersection.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/CapsuleIntersection.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/CapsuleIntersection.h b/modules/SofaMiscCollision/src/SofaMiscCollision/CapsuleIntersection.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/CapsuleIntersection.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/CapsuleIntersection.h diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/DefaultCollisionGroupManager.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/DefaultCollisionGroupManager.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/DefaultCollisionGroupManager.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/DefaultCollisionGroupManager.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/DefaultCollisionGroupManager.h b/modules/SofaMiscCollision/src/SofaMiscCollision/DefaultCollisionGroupManager.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/DefaultCollisionGroupManager.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/DefaultCollisionGroupManager.h diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/FrictionContact_DistanceGrid.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/FrictionContact_DistanceGrid.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/FrictionContact_DistanceGrid.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/FrictionContact_DistanceGrid.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/OBBContact.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/OBBContact.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/OBBContact.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/OBBContact.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/OBBContactMapper.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/OBBContactMapper.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/OBBContactMapper.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/OBBContactMapper.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/OBBContactMapper.h b/modules/SofaMiscCollision/src/SofaMiscCollision/OBBContactMapper.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/OBBContactMapper.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/OBBContactMapper.h diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/OBBIntersection.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/OBBIntersection.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/OBBIntersection.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/OBBIntersection.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/OBBIntersection.h b/modules/SofaMiscCollision/src/SofaMiscCollision/OBBIntersection.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/OBBIntersection.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/OBBIntersection.h diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/README.md b/modules/SofaMiscCollision/src/SofaMiscCollision/README.md similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/README.md rename to modules/SofaMiscCollision/src/SofaMiscCollision/README.md diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/RayTriangleVisitor.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/RayTriangleVisitor.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/RayTriangleVisitor.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/RayTriangleVisitor.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/RayTriangleVisitor.h b/modules/SofaMiscCollision/src/SofaMiscCollision/RayTriangleVisitor.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/RayTriangleVisitor.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/RayTriangleVisitor.h diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/RuleBasedContactManager.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/RuleBasedContactManager.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/RuleBasedContactManager.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/RuleBasedContactManager.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/RuleBasedContactManager.h b/modules/SofaMiscCollision/src/SofaMiscCollision/RuleBasedContactManager.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/RuleBasedContactManager.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/RuleBasedContactManager.h diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/SolverMerger.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/SolverMerger.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/SolverMerger.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/SolverMerger.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/SolverMerger.h b/modules/SofaMiscCollision/src/SofaMiscCollision/SolverMerger.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/SolverMerger.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/SolverMerger.h diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/SpatialGridPointModel.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/SpatialGridPointModel.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/SpatialGridPointModel.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/SpatialGridPointModel.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/SpatialGridPointModel.h b/modules/SofaMiscCollision/src/SofaMiscCollision/SpatialGridPointModel.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/SpatialGridPointModel.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/SpatialGridPointModel.h diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronBarycentricPenalityContact.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronBarycentricPenalityContact.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronBarycentricPenalityContact.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronBarycentricPenalityContact.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronDiscreteIntersection.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronDiscreteIntersection.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronDiscreteIntersection.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronDiscreteIntersection.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronDiscreteIntersection.h b/modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronDiscreteIntersection.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronDiscreteIntersection.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronDiscreteIntersection.h diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronFrictionContact.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronFrictionContact.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronFrictionContact.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronFrictionContact.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronModel.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronModel.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronModel.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronModel.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronModel.h b/modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronModel.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronModel.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronModel.h diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronRayContact.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronRayContact.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TetrahedronRayContact.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/TetrahedronRayContact.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TriangleModelInRegularGrid.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/TriangleModelInRegularGrid.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TriangleModelInRegularGrid.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/TriangleModelInRegularGrid.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TriangleModelInRegularGrid.h b/modules/SofaMiscCollision/src/SofaMiscCollision/TriangleModelInRegularGrid.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/TriangleModelInRegularGrid.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/TriangleModelInRegularGrid.h diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/config.h.in b/modules/SofaMiscCollision/src/SofaMiscCollision/config.h.in similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/config.h.in rename to modules/SofaMiscCollision/src/SofaMiscCollision/config.h.in diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/initSofaMiscCollision.cpp b/modules/SofaMiscCollision/src/SofaMiscCollision/initSofaMiscCollision.cpp similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/initSofaMiscCollision.cpp rename to modules/SofaMiscCollision/src/SofaMiscCollision/initSofaMiscCollision.cpp diff --git a/applications/plugins/SofaMiscCollision/src/SofaMiscCollision/initSofaMiscCollision.h b/modules/SofaMiscCollision/src/SofaMiscCollision/initSofaMiscCollision.h similarity index 100% rename from applications/plugins/SofaMiscCollision/src/SofaMiscCollision/initSofaMiscCollision.h rename to modules/SofaMiscCollision/src/SofaMiscCollision/initSofaMiscCollision.h