diff --git a/Sofa/Component/CMakeLists.txt b/Sofa/Component/CMakeLists.txt index 264fbcc8e2d..dbd5d4a4fb3 100644 --- a/Sofa/Component/CMakeLists.txt +++ b/Sofa/Component/CMakeLists.txt @@ -49,3 +49,10 @@ sofa_create_package_with_targets( INCLUDE_SOURCE_DIR "src" INCLUDE_INSTALL_DIR "${PROJECT_NAME}" ) + +# Tests +# If SOFA_BUILD_TESTS exists and is OFF, then these tests will be auto-disabled +cmake_dependent_option(SOFA_COMPONENT_BUILD_TESTS "Compile the automatic tests" ON "SOFA_BUILD_TESTS OR NOT DEFINED SOFA_BUILD_TESTS" OFF) +if(SOFA_COMPONENT_BUILD_TESTS) + add_subdirectory(test) +endif() diff --git a/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp b/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp index 0adc21e696f..5bc4208c23b 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp +++ b/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp @@ -76,8 +76,8 @@ class TestCollisionPipeline : public BaseSimulationTest { void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Collision"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Collision); } void TearDown() override diff --git a/Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp b/Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp index c432f420552..835875e7051 100644 --- a/Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp +++ b/Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp @@ -56,8 +56,8 @@ namespace struct TestLocalMinDistance : public BaseSimulationTest { void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Collision.Detection.Intersection"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Collision.Detection.Intersection); } void TearDown() override { diff --git a/Sofa/Component/Collision/Detection/src/sofa/component/collision/detection/init.cpp b/Sofa/Component/Collision/Detection/src/sofa/component/collision/detection/init.cpp index 387d165aa7f..e7e10ae60ce 100644 --- a/Sofa/Component/Collision/Detection/src/sofa/component/collision/detection/init.cpp +++ b/Sofa/Component/Collision/Detection/src/sofa/component/collision/detection/init.cpp @@ -26,6 +26,7 @@ #include #include +#include namespace sofa::component::collision::detection { @@ -54,8 +55,8 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.Collision.Detection.Algorithm"); - factory->registerObjectsFromPlugin("Sofa.Component.Collision.Detection.Intersection"); + factory->registerObjectsFromPlugin(Sofa.Component.Collision.Detection.Algorithm); + factory->registerObjectsFromPlugin(Sofa.Component.Collision.Detection.Intersection); } void init() diff --git a/Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp b/Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp index 35f2199ebe8..97bd2249d8d 100644 --- a/Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp +++ b/Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp @@ -72,8 +72,8 @@ struct TestSphere : public BaseSimulationTest { void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Collision.Geometry"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Collision.Geometry); m_proxIntersection = sofa::core::objectmodel::New(); m_proxIntersection->setAlarmDistance(1.0); diff --git a/Sofa/Component/Collision/Response/src/sofa/component/collision/response/init.cpp b/Sofa/Component/Collision/Response/src/sofa/component/collision/response/init.cpp index 1f530ac7e92..79fd36c7bd4 100644 --- a/Sofa/Component/Collision/Response/src/sofa/component/collision/response/init.cpp +++ b/Sofa/Component/Collision/Response/src/sofa/component/collision/response/init.cpp @@ -26,6 +26,7 @@ #include #include +#include namespace sofa::component::collision::response { @@ -54,8 +55,8 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.Collision.Response.Mapper"); - factory->registerObjectsFromPlugin("Sofa.Component.Collision.Response.Contact"); + factory->registerObjectsFromPlugin(Sofa.Component.Collision.Response.Mapper); + factory->registerObjectsFromPlugin(Sofa.Component.Collision.Response.Contact); } void init() diff --git a/Sofa/Component/Collision/src/sofa/component/collision/init.cpp b/Sofa/Component/Collision/src/sofa/component/collision/init.cpp index 7fa133efb29..1423e912ea0 100644 --- a/Sofa/Component/Collision/src/sofa/component/collision/init.cpp +++ b/Sofa/Component/Collision/src/sofa/component/collision/init.cpp @@ -27,6 +27,7 @@ #include #include +#include namespace sofa::component::collision { @@ -55,9 +56,9 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.Collision.Geometry"); - factory->registerObjectsFromPlugin("Sofa.Component.Collision.Detection"); - factory->registerObjectsFromPlugin("Sofa.Component.Collision.Response"); + factory->registerObjectsFromPlugin(Sofa.Component.Collision.Geometry); + factory->registerObjectsFromPlugin(Sofa.Component.Collision.Detection); + factory->registerObjectsFromPlugin(Sofa.Component.Collision.Response); } void init() diff --git a/Sofa/Component/Constraint/Lagrangian/src/sofa/component/constraint/lagrangian/init.cpp b/Sofa/Component/Constraint/Lagrangian/src/sofa/component/constraint/lagrangian/init.cpp index b0f8cbd6009..e7adc9e8fe9 100644 --- a/Sofa/Component/Constraint/Lagrangian/src/sofa/component/constraint/lagrangian/init.cpp +++ b/Sofa/Component/Constraint/Lagrangian/src/sofa/component/constraint/lagrangian/init.cpp @@ -27,6 +27,7 @@ #include #include +#include namespace sofa::component::constraint::lagrangian { @@ -55,9 +56,9 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.Constraint.Lagrangian.Correction"); - factory->registerObjectsFromPlugin("Sofa.Component.Constraint.Lagrangian.Model"); - factory->registerObjectsFromPlugin("Sofa.Component.Constraint.Lagrangian.Solver"); + factory->registerObjectsFromPlugin(Sofa.Component.Constraint.Lagrangian.Correction); + factory->registerObjectsFromPlugin(Sofa.Component.Constraint.Lagrangian.Model); + factory->registerObjectsFromPlugin(Sofa.Component.Constraint.Lagrangian.Solver); } void init() diff --git a/Sofa/Component/Constraint/Projective/tests/FixedProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/FixedProjectiveConstraint_test.cpp index adee116e4ec..638b23878cc 100644 --- a/Sofa/Component/Constraint/Projective/tests/FixedProjectiveConstraint_test.cpp +++ b/Sofa/Component/Constraint/Projective/tests/FixedProjectiveConstraint_test.cpp @@ -81,9 +81,9 @@ struct FixedProjectiveConstraint_test : public BaseTest const simulation::Node::SPtr root = simulation->createNewGraph("root"); root->setGravity( type::Vec3(0,0,0) ); - simpleapi::createObject(root , "RequiredPlugin", {{"name", "Sofa.Component.LinearSolver.Direct"}}) ; - simpleapi::createObject(root , "RequiredPlugin", {{"name", "Sofa.Component.ODESolver.Forward"}}) ; - simpleapi::createObject(root , "RequiredPlugin", {{"name", "Sofa.Component.ODESolver.Backward"}}) ; + simpleapi::createObject(root , "RequiredPlugin", {{"name", Sofa.Component.LinearSolver.Direct}}) ; + simpleapi::createObject(root , "RequiredPlugin", {{"name", Sofa.Component.ODESolver.Forward}}) ; + simpleapi::createObject(root , "RequiredPlugin", {{"name", Sofa.Component.ODESolver.Backward}}) ; simulation::Node::SPtr node = createEulerSolverNode(root,"test", integrationScheme); diff --git a/Sofa/Component/Constraint/src/sofa/component/constraint/init.cpp b/Sofa/Component/Constraint/src/sofa/component/constraint/init.cpp index 73d6424d02b..f122b9422be 100644 --- a/Sofa/Component/Constraint/src/sofa/component/constraint/init.cpp +++ b/Sofa/Component/Constraint/src/sofa/component/constraint/init.cpp @@ -26,6 +26,7 @@ #include #include +#include namespace sofa::component::constraint { @@ -54,8 +55,8 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.Constraint.Lagrangian"); - factory->registerObjectsFromPlugin("Sofa.Component.Constraint.Projective"); + factory->registerObjectsFromPlugin(Sofa.Component.Constraint.Lagrangian); + factory->registerObjectsFromPlugin(Sofa.Component.Constraint.Projective); } void init() diff --git a/Sofa/Component/Engine/Select/tests/BoxROI_test.cpp b/Sofa/Component/Engine/Select/tests/BoxROI_test.cpp index c695c34e884..8054de5d1db 100644 --- a/Sofa/Component/Engine/Select/tests/BoxROI_test.cpp +++ b/Sofa/Component/Engine/Select/tests/BoxROI_test.cpp @@ -73,9 +73,9 @@ struct BoxROITest : public sofa::testing::BaseTest void onSetUp() override { this->loadPlugins({ - "Sofa.Component.StateContainer", - "Sofa.Component.Topology.Container.Dynamic", - "Sofa.Component.Engine.Select"}); + Sofa.Component.StateContainer, + Sofa.Component.Topology.Container.Dynamic, + Sofa.Component.Engine.Select}); m_simu = sofa::simulation::getSimulation(); ASSERT_NE(m_simu, nullptr); diff --git a/Sofa/Component/Engine/Select/tests/MeshROI_test.cpp b/Sofa/Component/Engine/Select/tests/MeshROI_test.cpp index aa3e96d8ab6..fca7511b4a8 100644 --- a/Sofa/Component/Engine/Select/tests/MeshROI_test.cpp +++ b/Sofa/Component/Engine/Select/tests/MeshROI_test.cpp @@ -63,9 +63,9 @@ struct MeshROI_test : public BaseSimulationTest, void SetUp() override { - simpleapi::importPlugin("Sofa.Component.Engine.Select"); - simpleapi::importPlugin("Sofa.Component.Topology.Container.Constant"); - simpleapi::importPlugin("Sofa.Component.IO.Mesh"); + simpleapi::importPlugin(Sofa.Component.Engine.Select); + simpleapi::importPlugin(Sofa.Component.Topology.Container.Constant); + simpleapi::importPlugin(Sofa.Component.IO.Mesh); // SetUp3 const string scene2 = diff --git a/Sofa/Component/Engine/Select/tests/MeshSubsetEngine_test.cpp b/Sofa/Component/Engine/Select/tests/MeshSubsetEngine_test.cpp index 17ed3e5d1ca..7b86f165312 100644 --- a/Sofa/Component/Engine/Select/tests/MeshSubsetEngine_test.cpp +++ b/Sofa/Component/Engine/Select/tests/MeshSubsetEngine_test.cpp @@ -33,7 +33,7 @@ struct MeshSubsetEngine_test : public testing::BaseSimulationTest void SetUp() override { - simpleapi::importPlugin("Sofa.Component.Engine.Select"); + simpleapi::importPlugin(Sofa.Component.Engine.Select); m_root = simulation::getSimulation()->createNewNode("root"); ASSERT_NE(nullptr, m_root); diff --git a/Sofa/Component/Engine/src/sofa/component/engine/init.cpp b/Sofa/Component/Engine/src/sofa/component/engine/init.cpp index 05eeff6cc2b..4ffe472034e 100644 --- a/Sofa/Component/Engine/src/sofa/component/engine/init.cpp +++ b/Sofa/Component/Engine/src/sofa/component/engine/init.cpp @@ -28,6 +28,7 @@ #include #include +#include namespace sofa::component::engine { @@ -56,10 +57,10 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.Engine.Analyze"); - factory->registerObjectsFromPlugin("Sofa.Component.Engine.Generate"); - factory->registerObjectsFromPlugin("Sofa.Component.Engine.Select"); - factory->registerObjectsFromPlugin("Sofa.Component.Engine.Transform"); + factory->registerObjectsFromPlugin(Sofa.Component.Engine.Analyze); + factory->registerObjectsFromPlugin(Sofa.Component.Engine.Generate); + factory->registerObjectsFromPlugin(Sofa.Component.Engine.Select); + factory->registerObjectsFromPlugin(Sofa.Component.Engine.Transform); } void init() diff --git a/Sofa/Component/IO/Mesh/tests/MeshExporter_test.cpp b/Sofa/Component/IO/Mesh/tests/MeshExporter_test.cpp index 9c5996dee24..833bcb0ab05 100644 --- a/Sofa/Component/IO/Mesh/tests/MeshExporter_test.cpp +++ b/Sofa/Component/IO/Mesh/tests/MeshExporter_test.cpp @@ -77,8 +77,8 @@ class MeshExporter_test void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Grid"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Grid); } void TearDown() override diff --git a/Sofa/Component/IO/Mesh/tests/MeshXspLoader_test.cpp b/Sofa/Component/IO/Mesh/tests/MeshXspLoader_test.cpp index df20ce772a6..3a167422840 100644 --- a/Sofa/Component/IO/Mesh/tests/MeshXspLoader_test.cpp +++ b/Sofa/Component/IO/Mesh/tests/MeshXspLoader_test.cpp @@ -35,7 +35,7 @@ class MeshXspLoader_test : public BaseSimulationTest const Node::SPtr root = sofa::simpleapi::createRootNode(simulation, "root"); sofa::simpleapi::createObject(root, "DefaultAnimationLoop"); - sofa::simpleapi::createObject(root, "RequiredPlugin", { { "name","Sofa.Component.IO.Mesh" } }); + sofa::simpleapi::createObject(root, "RequiredPlugin", { { "name",Sofa.Component.IO.Mesh } }); auto loader = sofa::simpleapi::createObject(root, "MeshXspLoader", {{"filename", std::string(SOFA_COMPONENT_IO_MESH_TEST_FILES_DIR)+"test.xs3"}}); sofa::simulation::node::initRoot(root.get()); diff --git a/Sofa/Component/IO/Mesh/tests/STLExporter_test.cpp b/Sofa/Component/IO/Mesh/tests/STLExporter_test.cpp index 067f0bfef90..45dadf6959a 100644 --- a/Sofa/Component/IO/Mesh/tests/STLExporter_test.cpp +++ b/Sofa/Component/IO/Mesh/tests/STLExporter_test.cpp @@ -67,9 +67,9 @@ class STLExporter_test : public BaseSimulationTest { void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Visual"); - sofa::simpleapi::importPlugin("Sofa.Component.IO.Mesh"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Visual); + sofa::simpleapi::importPlugin(Sofa.Component.IO.Mesh); } void TearDown() override diff --git a/Sofa/Component/IO/src/sofa/component/io/init.cpp b/Sofa/Component/IO/src/sofa/component/io/init.cpp index 45cfe4d1971..cf13bfd0001 100644 --- a/Sofa/Component/IO/src/sofa/component/io/init.cpp +++ b/Sofa/Component/IO/src/sofa/component/io/init.cpp @@ -25,6 +25,7 @@ #include #include +#include namespace sofa::component::io { @@ -53,7 +54,7 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.IO.Mesh"); + factory->registerObjectsFromPlugin(Sofa.Component.IO.Mesh); } void init() diff --git a/Sofa/Component/LinearSolver/Direct/tests/SparseLDLSolver_test.cpp b/Sofa/Component/LinearSolver/Direct/tests/SparseLDLSolver_test.cpp index c55dceb4748..3d72df3da06 100644 --- a/Sofa/Component/LinearSolver/Direct/tests/SparseLDLSolver_test.cpp +++ b/Sofa/Component/LinearSolver/Direct/tests/SparseLDLSolver_test.cpp @@ -58,9 +58,9 @@ TEST(SparseLDLSolver, EmptyMState) const sofa::simulation::Node::SPtr root = sofa::simulation::getSimulation()->createNewGraph("root"); const auto plugins = sofa::testing::makeScopedPlugin({ - "Sofa.Component.LinearSolver.Direct", - "Sofa.Component.ODESolver.Backward", - "Sofa.Component.StateContainer"}); + Sofa.Component.LinearSolver.Direct, + Sofa.Component.ODESolver.Backward, + Sofa.Component.StateContainer}); sofa::simpleapi::createObject(root, "DefaultAnimationLoop"); sofa::simpleapi::createObject(root, "EulerImplicitSolver"); @@ -87,12 +87,12 @@ TEST(SparseLDLSolver, TopologyChangeEmptyMState) const sofa::simulation::Node::SPtr root = sofa::simulation::getSimulation()->createNewGraph("root"); const auto plugins = sofa::testing::makeScopedPlugin({ - "Sofa.Component.LinearSolver.Direct", - "Sofa.Component.Mass", - "Sofa.Component.ODESolver.Backward", - "Sofa.Component.StateContainer", - "Sofa.Component.Topology.Container.Dynamic", - "Sofa.Component.Topology.Utility"}); + Sofa.Component.LinearSolver.Direct, + Sofa.Component.Mass, + Sofa.Component.ODESolver.Backward, + Sofa.Component.StateContainer, + Sofa.Component.Topology.Container.Dynamic, + Sofa.Component.Topology.Utility}); sofa::simpleapi::createObject(root, "DefaultAnimationLoop"); sofa::simpleapi::createObject(root, "EulerImplicitSolver"); diff --git a/Sofa/Component/LinearSolver/src/sofa/component/linearsolver/init.cpp b/Sofa/Component/LinearSolver/src/sofa/component/linearsolver/init.cpp index 3e4a9c37cee..e4f74f3fe12 100644 --- a/Sofa/Component/LinearSolver/src/sofa/component/linearsolver/init.cpp +++ b/Sofa/Component/LinearSolver/src/sofa/component/linearsolver/init.cpp @@ -28,6 +28,7 @@ #include #include +#include namespace sofa::component::linearsolver { @@ -56,10 +57,10 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.LinearSolver.Direct"); - factory->registerObjectsFromPlugin("Sofa.Component.LinearSolver.Iterative"); - factory->registerObjectsFromPlugin("Sofa.Component.LinearSolver.Ordering"); - factory->registerObjectsFromPlugin("Sofa.Component.LinearSolver.Preconditioner"); + factory->registerObjectsFromPlugin(Sofa.Component.LinearSolver.Direct); + factory->registerObjectsFromPlugin(Sofa.Component.LinearSolver.Iterative); + factory->registerObjectsFromPlugin(Sofa.Component.LinearSolver.Ordering); + factory->registerObjectsFromPlugin(Sofa.Component.LinearSolver.Preconditioner); } void init() diff --git a/Sofa/Component/LinearSystem/tests/MappingGraph_test.cpp b/Sofa/Component/LinearSystem/tests/MappingGraph_test.cpp index a8af9b59030..6595defef3a 100644 --- a/Sofa/Component/LinearSystem/tests/MappingGraph_test.cpp +++ b/Sofa/Component/LinearSystem/tests/MappingGraph_test.cpp @@ -176,7 +176,7 @@ TEST(MappingGraph, diamondMapping) sofa::simulation::Node::SPtr root = simulation->createNewGraph("root"); EXPECT_EQ(root->getName(), "root"); - sofa::simpleapi::importPlugin("Sofa.Component.Mapping.Linear"); + sofa::simpleapi::importPlugin(Sofa.Component.Mapping.Linear); const auto top = sofa::core::objectmodel::New >(); root->addObject(top); diff --git a/Sofa/Component/Mapping/NonLinear/tests/SquareDistanceMapping_test.cpp b/Sofa/Component/Mapping/NonLinear/tests/SquareDistanceMapping_test.cpp index a837a54366f..411a4fc7cd2 100644 --- a/Sofa/Component/Mapping/NonLinear/tests/SquareDistanceMapping_test.cpp +++ b/Sofa/Component/Mapping/NonLinear/tests/SquareDistanceMapping_test.cpp @@ -154,7 +154,7 @@ struct SquareDistanceMappingCompare_test : NumericTest { root = simulation::getSimulation()->createNewNode("root"); - simpleapi::createObject(root, "RequiredPlugin", {{"pluginName", "Sofa.Component"}}); + simpleapi::createObject(root, "RequiredPlugin", {{"pluginName", Sofa.Component}}); simpleapi::createObject(root, "DefaultAnimationLoop"); simpleapi::createObject(root, "StringMeshCreator", {{"name", "loader"}, {"resolution", "3"}}); diff --git a/Sofa/Component/Mapping/src/sofa/component/mapping/init.cpp b/Sofa/Component/Mapping/src/sofa/component/mapping/init.cpp index c3587764b84..82a3fa98dab 100644 --- a/Sofa/Component/Mapping/src/sofa/component/mapping/init.cpp +++ b/Sofa/Component/Mapping/src/sofa/component/mapping/init.cpp @@ -25,6 +25,7 @@ #include #include +#include namespace sofa::component::mapping { @@ -53,8 +54,8 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.Mapping.Linear"); - factory->registerObjectsFromPlugin("Sofa.Component.Mapping.NonLinear"); + factory->registerObjectsFromPlugin(Sofa.Component.Mapping.Linear); + factory->registerObjectsFromPlugin(Sofa.Component.Mapping.NonLinear); } void init() diff --git a/Sofa/Component/Mass/tests/DiagonalMass_test.cpp b/Sofa/Component/Mass/tests/DiagonalMass_test.cpp index 2fa55643d95..b2723dc04ac 100644 --- a/Sofa/Component/Mass/tests/DiagonalMass_test.cpp +++ b/Sofa/Component/Mass/tests/DiagonalMass_test.cpp @@ -98,10 +98,10 @@ class DiagonalMass_test : public BaseTest void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Grid"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Mass"); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Grid); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Mass); simulation = simulation::getSimulation(); root = simulation::getSimulation()->createNewGraph("root"); diff --git a/Sofa/Component/Mass/tests/MeshMatrixMass_test.cpp b/Sofa/Component/Mass/tests/MeshMatrixMass_test.cpp index 024bf21dd13..eda649530dd 100644 --- a/Sofa/Component/Mass/tests/MeshMatrixMass_test.cpp +++ b/Sofa/Component/Mass/tests/MeshMatrixMass_test.cpp @@ -101,10 +101,10 @@ class MeshMatrixMass_test : public BaseTest void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Grid"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Mass"); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Grid); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Mass); simulation = simulation::getSimulation(); root = simulation::getSimulation()->createNewGraph("root"); diff --git a/Sofa/Component/Mass/tests/UniformMass_test.cpp b/Sofa/Component/Mass/tests/UniformMass_test.cpp index ddfa5c0eabb..e4ef516ca76 100644 --- a/Sofa/Component/Mass/tests/UniformMass_test.cpp +++ b/Sofa/Component/Mass/tests/UniformMass_test.cpp @@ -79,8 +79,8 @@ struct UniformMassTest : public BaseTest void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Mass"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Mass); todo = true ; m_simu = sofa::simulation::getSimulation(); diff --git a/Sofa/Component/MechanicalLoad/tests/ConstantForceField_test.cpp b/Sofa/Component/MechanicalLoad/tests/ConstantForceField_test.cpp index a901c1ec931..dc7425b5ce8 100644 --- a/Sofa/Component/MechanicalLoad/tests/ConstantForceField_test.cpp +++ b/Sofa/Component/MechanicalLoad/tests/ConstantForceField_test.cpp @@ -74,11 +74,11 @@ struct ConstantForceField_test : public BaseSimulationTest, NumericTestsetGravity(Vec3(0,0,0)); - sofa::simpleapi::importPlugin("Sofa.Component.ODESolver"); - sofa::simpleapi::importPlugin("Sofa.Component.LinearSolver.Iterative"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Mass"); - sofa::simpleapi::importPlugin("Sofa.Component.Constraint.Projective"); - sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.Spring"); + sofa::simpleapi::importPlugin(Sofa.Component.ODESolver); + sofa::simpleapi::importPlugin(Sofa.Component.LinearSolver.Iterative); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Mass); + sofa::simpleapi::importPlugin(Sofa.Component.Constraint.Projective); + sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.Spring); // remove warnings simpleapi::createObject(root, "DefaultAnimationLoop", {}); simpleapi::createObject(root, "DefaultVisualManagerLoop", {}); diff --git a/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolver_withDamping_test.cpp b/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolver_withDamping_test.cpp index dc1089ed0a7..25f18328d7c 100644 --- a/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolver_withDamping_test.cpp +++ b/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolver_withDamping_test.cpp @@ -57,11 +57,11 @@ struct EulerImplicit_with_damping_forcefield : public BaseSimulationTest, Numeri //******* // load appropriate modules - sofa::simpleapi::importPlugin("Sofa.Component.ODESolver.Backward"); - sofa::simpleapi::importPlugin("Sofa.Component.LinearSolver.Iterative"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Mass"); - sofa::simpleapi::importPlugin("Sofa.Component.MechanicalLoad"); + sofa::simpleapi::importPlugin(Sofa.Component.ODESolver.Backward); + sofa::simpleapi::importPlugin(Sofa.Component.LinearSolver.Iterative); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Mass); + sofa::simpleapi::importPlugin(Sofa.Component.MechanicalLoad); // avoid warnings simpleapi::createObject(root, "DefaultAnimationLoop", {}); diff --git a/Sofa/Component/ODESolver/Backward/tests/StaticSolver_test.cpp b/Sofa/Component/ODESolver/Backward/tests/StaticSolver_test.cpp index 510b11bf89a..dd18b29a65a 100644 --- a/Sofa/Component/ODESolver/Backward/tests/StaticSolver_test.cpp +++ b/Sofa/Component/ODESolver/Backward/tests/StaticSolver_test.cpp @@ -55,7 +55,7 @@ class StaticSolverTest : public sofa::testing::BaseTest root = getSimulation()->createNewNode("root"); - createObject(root, "RequiredPlugin", {{"pluginName", "Sofa.Component"}}); + createObject(root, "RequiredPlugin", {{"pluginName", Sofa.Component}}); createObject(root, "DefaultAnimationLoop"); createObject(root, "RegularGridTopology", {{"name", "grid"}, {"min", "-7.5 -7.5 0"}, {"max", "7.5 7.5 80"}, {"n", "3 3 9"}}); const auto s = createObject(root, "StaticSolver", {{"newton_iterations", "10"}}); diff --git a/Sofa/Component/ODESolver/Testing/src/sofa/component/odesolver/testing/ODESolverSpringTest.h b/Sofa/Component/ODESolver/Testing/src/sofa/component/odesolver/testing/ODESolverSpringTest.h index 8d1cd2c5ad0..d86e90e1d09 100644 --- a/Sofa/Component/ODESolver/Testing/src/sofa/component/odesolver/testing/ODESolverSpringTest.h +++ b/Sofa/Component/ODESolver/Testing/src/sofa/component/odesolver/testing/ODESolverSpringTest.h @@ -21,6 +21,7 @@ ******************************************************************************/ #pragma once +#include #include using sofa::testing::BaseSimulationTest; @@ -43,12 +44,12 @@ struct ODESolverSpringTest : public BaseSimulationTest // Create the scene m_si.root->setGravity({ 0, -10, 0 }); - sofa::simpleapi::importPlugin("Sofa.Component.ODESolver"); - sofa::simpleapi::importPlugin("Sofa.Component.LinearSolver.Iterative"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Mass"); - sofa::simpleapi::importPlugin("Sofa.Component.Constraint.Projective"); - sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.Spring"); + sofa::simpleapi::importPlugin(Sofa.Component.ODESolver); + sofa::simpleapi::importPlugin(Sofa.Component.LinearSolver.Iterative); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Mass); + sofa::simpleapi::importPlugin(Sofa.Component.Constraint.Projective); + sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.Spring); // remove warnings simpleapi::createObject(m_si.root, "DefaultAnimationLoop", {}); diff --git a/Sofa/Component/ODESolver/src/sofa/component/odesolver/init.cpp b/Sofa/Component/ODESolver/src/sofa/component/odesolver/init.cpp index 7f06baa6206..4c86bf81b18 100644 --- a/Sofa/Component/ODESolver/src/sofa/component/odesolver/init.cpp +++ b/Sofa/Component/ODESolver/src/sofa/component/odesolver/init.cpp @@ -26,6 +26,7 @@ #include #include +#include namespace sofa::component::odesolver { @@ -54,8 +55,8 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.ODESolver.Backward"); - factory->registerObjectsFromPlugin("Sofa.Component.ODESolver.Forward"); + factory->registerObjectsFromPlugin(Sofa.Component.ODESolver.Backward); + factory->registerObjectsFromPlugin(Sofa.Component.ODESolver.Forward); } void init() diff --git a/Sofa/Component/Playback/tests/ReadState_test.cpp b/Sofa/Component/Playback/tests/ReadState_test.cpp index 67f543ea851..967d7a7579d 100644 --- a/Sofa/Component/Playback/tests/ReadState_test.cpp +++ b/Sofa/Component/Playback/tests/ReadState_test.cpp @@ -37,8 +37,8 @@ class ReadState_test : public BaseSimulationTest const double dt = 0.01; const auto simulation = sofa::simpleapi::createSimulation(); const Node::SPtr root = sofa::simpleapi::createRootNode(simulation, "root"); - sofa::simpleapi::createObject(root, "RequiredPlugin", { { "name","Sofa.Component.Playback" } }); - sofa::simpleapi::createObject(root, "RequiredPlugin", { { "name","Sofa.Component.StateContainer" } }); + sofa::simpleapi::createObject(root, "RequiredPlugin", { { "name",Sofa.Component.Playback } }); + sofa::simpleapi::createObject(root, "RequiredPlugin", { { "name",Sofa.Component.StateContainer } }); /// no need of gravity, the file .data is just read root->setGravity(Vec3(0.0,0.0,0.0)); @@ -68,8 +68,8 @@ class ReadState_test : public BaseSimulationTest { const auto simulation = sofa::simpleapi::createSimulation(); const Node::SPtr root = sofa::simpleapi::createRootNode(simulation, "root"); - sofa::simpleapi::createObject(root, "RequiredPlugin", { { "name","Sofa.Component.Playback" } }); - sofa::simpleapi::createObject(root, "RequiredPlugin", { { "name","Sofa.Component.StateContainer" } }); + sofa::simpleapi::createObject(root, "RequiredPlugin", { { "name",Sofa.Component.Playback } }); + sofa::simpleapi::createObject(root, "RequiredPlugin", { { "name",Sofa.Component.StateContainer } }); auto meca = sofa::simpleapi::createObject(root, "MechanicalObject", {{"size", "1"}}); diff --git a/Sofa/Component/SceneUtility/tests/AddResourceRepository_test.cpp b/Sofa/Component/SceneUtility/tests/AddResourceRepository_test.cpp index c7bebda42a6..e9bd07fd345 100644 --- a/Sofa/Component/SceneUtility/tests/AddResourceRepository_test.cpp +++ b/Sofa/Component/SceneUtility/tests/AddResourceRepository_test.cpp @@ -46,7 +46,7 @@ struct AddResourceRepository_test : public BaseSimulationTest void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.Component.SceneUtility"); + sofa::simpleapi::importPlugin(Sofa.Component.SceneUtility); m_testRepoDir = std::string(SOFA_COMPONENT_SCENEUTILITY_TEST_RESOURCES_DIR) + std::string("/repo"); } diff --git a/Sofa/Component/SceneUtility/tests/MakeAliasComponent_test.cpp b/Sofa/Component/SceneUtility/tests/MakeAliasComponent_test.cpp index e442de84203..552ad09b95a 100644 --- a/Sofa/Component/SceneUtility/tests/MakeAliasComponent_test.cpp +++ b/Sofa/Component/SceneUtility/tests/MakeAliasComponent_test.cpp @@ -72,7 +72,7 @@ bool inited = doInit(); void perTestInit() { - sofa::simpleapi::importPlugin("Sofa.Component.SceneUtility"); + sofa::simpleapi::importPlugin(Sofa.Component.SceneUtility); theSimulation = sofa::simulation::getSimulation(); diff --git a/Sofa/Component/SceneUtility/tests/MakeDataAliasComponent_test.cpp b/Sofa/Component/SceneUtility/tests/MakeDataAliasComponent_test.cpp index 15aaa483a2f..7a36ee55625 100644 --- a/Sofa/Component/SceneUtility/tests/MakeDataAliasComponent_test.cpp +++ b/Sofa/Component/SceneUtility/tests/MakeDataAliasComponent_test.cpp @@ -72,8 +72,8 @@ bool inited = doInit(); void perTestInit() { - sofa::simpleapi::importPlugin("Sofa.Component.SceneUtility"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); + sofa::simpleapi::importPlugin(Sofa.Component.SceneUtility); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); if(defaultHandler==nullptr) defaultHandler=new ConsoleMessageHandler(&RichConsoleStyleMessageFormatter::getInstance()) ; diff --git a/Sofa/Component/SceneUtility/tests/MessageHandlerComponent_test.cpp b/Sofa/Component/SceneUtility/tests/MessageHandlerComponent_test.cpp index 6cf6bbd792f..542ebc512b8 100644 --- a/Sofa/Component/SceneUtility/tests/MessageHandlerComponent_test.cpp +++ b/Sofa/Component/SceneUtility/tests/MessageHandlerComponent_test.cpp @@ -45,7 +45,7 @@ using sofa::helper::logging::MessageDispatcher ; bool perTestInit() { - sofa::simpleapi::importPlugin("Sofa.Component.SceneUtility"); + sofa::simpleapi::importPlugin(Sofa.Component.SceneUtility); /// THE TESTS HERE ARE NOT INHERITING FROM SOFA TEST SO WE NEED TO MANUALLY INSTALL THE HANDLER /// DO NO REMOVE diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/tests/BaseTetrahedronFEMForceField_test.h b/Sofa/Component/SolidMechanics/FEM/Elastic/tests/BaseTetrahedronFEMForceField_test.h index 7fbb0d13749..23d4b1ffc11 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/tests/BaseTetrahedronFEMForceField_test.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/tests/BaseTetrahedronFEMForceField_test.h @@ -93,10 +93,10 @@ class BaseTetrahedronFEMForceField_test : public sofa::testing::BaseTest simpleapi::createObject(m_root, "DefaultAnimationLoop"); simpleapi::createObject(m_root, "DefaultVisualManagerLoop"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic"); - sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.FEM.Elastic"); - sofa::simpleapi::importPlugin("Sofa.Component.Mass"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic); + sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.FEM.Elastic); + sofa::simpleapi::importPlugin(Sofa.Component.Mass); simpleapi::createObject(m_root, "MechanicalObject", { {"template", dataTypeName}, {"position", "0 0 0 1 0 0 0 1 0 0 0 1"} }); simpleapi::createObject(m_root, "TetrahedronSetTopologyContainer", { {"tetrahedra","2 3 1 0"} }); @@ -122,16 +122,16 @@ class BaseTetrahedronFEMForceField_test : public sofa::testing::BaseTest simpleapi::createObject(m_root, "DefaultVisualManagerLoop"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic"); - sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.FEM.Elastic"); - sofa::simpleapi::importPlugin("Sofa.Component.Mass"); - sofa::simpleapi::importPlugin("Sofa.Component.LinearSolver.Direct"); - sofa::simpleapi::importPlugin("Sofa.Component.ODESolver.Backward"); - sofa::simpleapi::importPlugin("Sofa.Component.Constraint.Lagrangian"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Mapping"); - sofa::simpleapi::importPlugin("Sofa.Component.Engine.Select"); - sofa::simpleapi::importPlugin("Sofa.Component.Constraint.Projective"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic); + sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.FEM.Elastic); + sofa::simpleapi::importPlugin(Sofa.Component.Mass); + sofa::simpleapi::importPlugin(Sofa.Component.LinearSolver.Direct); + sofa::simpleapi::importPlugin(Sofa.Component.ODESolver.Backward); + sofa::simpleapi::importPlugin(Sofa.Component.Constraint.Lagrangian); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Mapping); + sofa::simpleapi::importPlugin(Sofa.Component.Engine.Select); + sofa::simpleapi::importPlugin(Sofa.Component.Constraint.Projective); simpleapi::createObject(m_root, "GenericConstraintSolver", { {"tolerance", "1e-3"}, {"maxIt", "1000"} }); @@ -195,7 +195,7 @@ class BaseTetrahedronFEMForceField_test : public sofa::testing::BaseTest simpleapi::createObject(m_root, "DefaultAnimationLoop"); simpleapi::createObject(m_root, "DefaultVisualManagerLoop"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); simpleapi::createObject(m_root, "MechanicalObject", { {"template","Vec3"}, {"position", "0 0 0 1 0 0 0 1 0 0 0 1"} }); addTetraFEMForceField(m_root, 100, 0.3, "large"); @@ -214,8 +214,8 @@ class BaseTetrahedronFEMForceField_test : public sofa::testing::BaseTest simpleapi::createObject(m_root, "DefaultAnimationLoop"); simpleapi::createObject(m_root, "DefaultVisualManagerLoop"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic); simpleapi::createObject(m_root, "MechanicalObject", { {"template","Vec3"} }); simpleapi::createObject(m_root, "TetrahedronSetTopologyContainer"); @@ -234,9 +234,9 @@ class BaseTetrahedronFEMForceField_test : public sofa::testing::BaseTest simpleapi::createObject(m_root, "DefaultAnimationLoop"); simpleapi::createObject(m_root, "DefaultVisualManagerLoop"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic"); - sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.FEM.Elastic"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic); + sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.FEM.Elastic); simpleapi::createObject(m_root, "MechanicalObject", { {"template", dataTypeName}, {"position", "0 0 0 1 0 0 0 1 0 0 0 1"} }); simpleapi::createObject(m_root, "TetrahedronSetTopologyContainer", { {"tetrahedra","2 3 1 0"} }); diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/tests/BeamFEMForceField_test.cpp b/Sofa/Component/SolidMechanics/FEM/Elastic/tests/BeamFEMForceField_test.cpp index 78292aa26f6..59bd003f6ca 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/tests/BeamFEMForceField_test.cpp +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/tests/BeamFEMForceField_test.cpp @@ -68,7 +68,7 @@ class BeamFEMForceField_test : public BaseTest void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.Component"); + sofa::simpleapi::importPlugin(Sofa.Component); m_simulation = sofa::simulation::getSimulation(); } diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/tests/TriangleFEMForceField_test.cpp b/Sofa/Component/SolidMechanics/FEM/Elastic/tests/TriangleFEMForceField_test.cpp index 9ec55cb14cb..ed70fa3c39b 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/tests/TriangleFEMForceField_test.cpp +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/tests/TriangleFEMForceField_test.cpp @@ -97,10 +97,10 @@ class TriangleFEMForceField_test : public BaseTest createObject(m_root, "DefaultAnimationLoop"); createObject(m_root, "DefaultVisualManagerLoop"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic"); - sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.FEM.Elastic"); - sofa::simpleapi::importPlugin("Sofa.Component.Mass"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic); + sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.FEM.Elastic); + sofa::simpleapi::importPlugin(Sofa.Component.Mass); createObject(m_root, "MechanicalObject", {{"template",dataTypeName}, {"position", "0 0 0 1 0 0 0 1 0 1 1 1"} }); createObject(m_root, "TriangleSetTopologyContainer", { {"triangles","0 1 2 1 3 2"} }); @@ -138,7 +138,7 @@ class TriangleFEMForceField_test : public BaseTest createObject(m_root, "DefaultAnimationLoop"); createObject(m_root, "DefaultVisualManagerLoop"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Grid"); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Grid); createObject(m_root, "RegularGridTopology", { {"name", "grid"}, {"n", str(type::Vec3(nbrGrid, nbrGrid, 1))}, {"min", "0 0 0"}, {"max", "10 10 0"} }); @@ -175,12 +175,12 @@ class TriangleFEMForceField_test : public BaseTest { const Node::SPtr FEMNode = sofa::simpleapi::createChild(m_root, nodeName); - sofa::simpleapi::importPlugin("Sofa.Component.ODESolver.Backward"); - sofa::simpleapi::importPlugin("Sofa.Component.LinearSolver.Iterative"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic"); - sofa::simpleapi::importPlugin("Sofa.Component.Mass"); - sofa::simpleapi::importPlugin("Sofa.Component.Constraint.Projective"); + sofa::simpleapi::importPlugin(Sofa.Component.ODESolver.Backward); + sofa::simpleapi::importPlugin(Sofa.Component.LinearSolver.Iterative); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic); + sofa::simpleapi::importPlugin(Sofa.Component.Mass); + sofa::simpleapi::importPlugin(Sofa.Component.Constraint.Projective); createObject(FEMNode, "EulerImplicitSolver"); createObject(FEMNode, "CGLinearSolver", {{ "iterations", "20" }, { "tolerance", "1e-5" }, {"threshold", "1e-6"}}); @@ -259,8 +259,8 @@ class TriangleFEMForceField_test : public BaseTest createObject(m_root, "DefaultAnimationLoop"); createObject(m_root, "DefaultVisualManagerLoop"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.FEM.Elastic"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.FEM.Elastic); createObject(m_root, "MechanicalObject", { {"template",dataTypeName}, {"position", "0 0 0 1 0 0 0 1 0"} }); if (FEMType == 0) // TriangleModel @@ -291,9 +291,9 @@ class TriangleFEMForceField_test : public BaseTest createObject(m_root, "DefaultAnimationLoop"); createObject(m_root, "DefaultVisualManagerLoop"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic"); - sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.FEM.Elastic"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic); + sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.FEM.Elastic); createObject(m_root, "MechanicalObject", { {"template",dataTypeName} }); createObject(m_root, "TriangleSetTopologyContainer"); @@ -326,9 +326,9 @@ class TriangleFEMForceField_test : public BaseTest createObject(m_root, "DefaultAnimationLoop"); createObject(m_root, "DefaultVisualManagerLoop"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic"); - sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.FEM.Elastic"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic); + sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.FEM.Elastic); createObject(m_root, "MechanicalObject", { {"template",dataTypeName}, {"position", "0 0 0 1 0 0 0 1 0"} }); createObject(m_root, "TriangleSetTopologyContainer", { {"triangles","0 1 2"} }); diff --git a/Sofa/Component/SolidMechanics/FEM/src/sofa/component/solidmechanics/fem/init.cpp b/Sofa/Component/SolidMechanics/FEM/src/sofa/component/solidmechanics/fem/init.cpp index 06c8c86b4fd..9e60a6ad828 100644 --- a/Sofa/Component/SolidMechanics/FEM/src/sofa/component/solidmechanics/fem/init.cpp +++ b/Sofa/Component/SolidMechanics/FEM/src/sofa/component/solidmechanics/fem/init.cpp @@ -27,6 +27,7 @@ #include #include +#include namespace sofa::component::solidmechanics::fem { @@ -55,9 +56,9 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.SolidMechanics.FEM.Elastic"); - factory->registerObjectsFromPlugin("Sofa.Component.SolidMechanics.FEM.HyperElastic"); - factory->registerObjectsFromPlugin("Sofa.Component.SolidMechanics.FEM.NonUniform"); + factory->registerObjectsFromPlugin(Sofa.Component.SolidMechanics.FEM.Elastic); + factory->registerObjectsFromPlugin(Sofa.Component.SolidMechanics.FEM.HyperElastic); + factory->registerObjectsFromPlugin(Sofa.Component.SolidMechanics.FEM.NonUniform); } void init() diff --git a/Sofa/Component/SolidMechanics/Spring/tests/PolynomialRestShapeSpringsForceField_test.cpp b/Sofa/Component/SolidMechanics/Spring/tests/PolynomialRestShapeSpringsForceField_test.cpp index 0af527cfba3..3d987884321 100644 --- a/Sofa/Component/SolidMechanics/Spring/tests/PolynomialRestShapeSpringsForceField_test.cpp +++ b/Sofa/Component/SolidMechanics/Spring/tests/PolynomialRestShapeSpringsForceField_test.cpp @@ -42,9 +42,9 @@ class PolynomialRestShapeSpringsForceField_test : public BaseSimulationTest root->setGravity(Vec3(0.0,0.0,0.0)); root->setDt(dt); - sofa::simpleapi::importPlugin("Sofa.Component.ODESolver.Forward"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.Spring"); + sofa::simpleapi::importPlugin(Sofa.Component.ODESolver.Forward); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.Spring); const Node::SPtr childNode = sofa::simpleapi::createChild(root, "Particle"); sofa::simpleapi::createObject(childNode, "EulerExplicitSolver"); diff --git a/Sofa/Component/SolidMechanics/Spring/tests/RestShapeSpringsForceField_test.cpp b/Sofa/Component/SolidMechanics/Spring/tests/RestShapeSpringsForceField_test.cpp index 0a9c1f3bfe4..cc6d7bf5d39 100644 --- a/Sofa/Component/SolidMechanics/Spring/tests/RestShapeSpringsForceField_test.cpp +++ b/Sofa/Component/SolidMechanics/Spring/tests/RestShapeSpringsForceField_test.cpp @@ -58,10 +58,10 @@ sofa::simulation::Node::SPtr RestSpringsForceField_test::createScene(const std:: { const auto theSimulation = createSimulation(); auto theRoot = createRootNode(theSimulation, "root"); - sofa::simpleapi::importPlugin("Sofa.Component.ODESolver.Backward"); - sofa::simpleapi::importPlugin("Sofa.Component.LinearSolver.Iterative"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Mass"); + sofa::simpleapi::importPlugin(Sofa.Component.ODESolver.Backward); + sofa::simpleapi::importPlugin(Sofa.Component.LinearSolver.Iterative); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Mass); createObject(theRoot, "DefaultAnimationLoop"); createObject(theRoot, "EulerImplicitSolver"); diff --git a/Sofa/Component/SolidMechanics/Spring/tests/TriangularBendingSprings_test.cpp b/Sofa/Component/SolidMechanics/Spring/tests/TriangularBendingSprings_test.cpp index 0149f6d8c1c..fcb3e5b0e94 100644 --- a/Sofa/Component/SolidMechanics/Spring/tests/TriangularBendingSprings_test.cpp +++ b/Sofa/Component/SolidMechanics/Spring/tests/TriangularBendingSprings_test.cpp @@ -70,8 +70,8 @@ class TriangularBendingSprings_test : public BaseTest void SetUp() override { m_simulation = sofa::simulation::getSimulation(); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Grid"); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Grid); } void TearDown() override diff --git a/Sofa/Component/SolidMechanics/src/sofa/component/solidmechanics/init.cpp b/Sofa/Component/SolidMechanics/src/sofa/component/solidmechanics/init.cpp index a35ec25d9d9..8638bbdb020 100644 --- a/Sofa/Component/SolidMechanics/src/sofa/component/solidmechanics/init.cpp +++ b/Sofa/Component/SolidMechanics/src/sofa/component/solidmechanics/init.cpp @@ -27,6 +27,7 @@ #include #include +#include namespace sofa::component::solidmechanics { @@ -55,9 +56,9 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.SolidMechanics.FEM"); - factory->registerObjectsFromPlugin("Sofa.Component.SolidMechanics.Spring"); - factory->registerObjectsFromPlugin("Sofa.Component.SolidMechanics.TensorMass"); + factory->registerObjectsFromPlugin(Sofa.Component.SolidMechanics.FEM); + factory->registerObjectsFromPlugin(Sofa.Component.SolidMechanics.Spring); + factory->registerObjectsFromPlugin(Sofa.Component.SolidMechanics.TensorMass); } void init() diff --git a/Sofa/Component/Topology/Container/src/sofa/component/topology/container/init.cpp b/Sofa/Component/Topology/Container/src/sofa/component/topology/container/init.cpp index 99b3ffeac8d..bd43c782876 100644 --- a/Sofa/Component/Topology/Container/src/sofa/component/topology/container/init.cpp +++ b/Sofa/Component/Topology/Container/src/sofa/component/topology/container/init.cpp @@ -27,6 +27,7 @@ #include #include +#include namespace sofa::component::topology::container { @@ -55,9 +56,9 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.Topology.Container.Constant"); - factory->registerObjectsFromPlugin("Sofa.Component.Topology.Container.Dynamic"); - factory->registerObjectsFromPlugin("Sofa.Component.Topology.Container.Grid"); + factory->registerObjectsFromPlugin(Sofa.Component.Topology.Container.Constant); + factory->registerObjectsFromPlugin(Sofa.Component.Topology.Container.Dynamic); + factory->registerObjectsFromPlugin(Sofa.Component.Topology.Container.Grid); } void init() diff --git a/Sofa/Component/Topology/Testing/src/sofa/component/topology/testing/fake_TopologyScene.h b/Sofa/Component/Topology/Testing/src/sofa/component/topology/testing/fake_TopologyScene.h index bdd5bf4c915..fe2283294da 100644 --- a/Sofa/Component/Topology/Testing/src/sofa/component/topology/testing/fake_TopologyScene.h +++ b/Sofa/Component/Topology/Testing/src/sofa/component/topology/testing/fake_TopologyScene.h @@ -25,6 +25,7 @@ #include #include #include +#include class fake_TopologyScene { @@ -52,11 +53,11 @@ class fake_TopologyScene m_simu = createSimulation("DAG"); m_root = createRootNode(m_simu, "root"); - sofa::simpleapi::importPlugin("Sofa.Component.IO.Mesh"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Constant"); - sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic"); - sofa::simpleapi::importPlugin("Sofa.Component.Mass"); + sofa::simpleapi::importPlugin(Sofa.Component.IO.Mesh); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Constant); + sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic); + sofa::simpleapi::importPlugin(Sofa.Component.Mass); createObject(m_root, "DefaultAnimationLoop"); @@ -110,7 +111,7 @@ class fake_TopologyScene createObject(m_root, "MeshMatrixMass"); if (m_topoType == sofa::geometry::ElementType::EDGE) { - sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.Spring"); + sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.Spring); createObject(m_root, "VectorSpringForceField", { {"useTopology", "true"} }); } diff --git a/Sofa/Component/Topology/src/sofa/component/topology/init.cpp b/Sofa/Component/Topology/src/sofa/component/topology/init.cpp index 145ed36c9ec..550085ae7c1 100644 --- a/Sofa/Component/Topology/src/sofa/component/topology/init.cpp +++ b/Sofa/Component/Topology/src/sofa/component/topology/init.cpp @@ -27,6 +27,7 @@ #include #include +#include namespace sofa::component::topology { @@ -55,9 +56,9 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.Topology.Container"); - factory->registerObjectsFromPlugin("Sofa.Component.Topology.Mapping"); - factory->registerObjectsFromPlugin("Sofa.Component.Topology.Utility"); + factory->registerObjectsFromPlugin(Sofa.Component.Topology.Container); + factory->registerObjectsFromPlugin(Sofa.Component.Topology.Mapping); + factory->registerObjectsFromPlugin(Sofa.Component.Topology.Utility); } void init() diff --git a/Sofa/Component/src/sofa/component/init.cpp b/Sofa/Component/src/sofa/component/init.cpp index 00f7034fde6..6e1494deb84 100644 --- a/Sofa/Component/src/sofa/component/init.cpp +++ b/Sofa/Component/src/sofa/component/init.cpp @@ -45,6 +45,7 @@ #include #include +#include namespace sofa::component { @@ -73,27 +74,27 @@ const char* getModuleVersion() void registerObjects(sofa::core::ObjectFactory* factory) { - factory->registerObjectsFromPlugin("Sofa.Component.AnimationLoop"); - factory->registerObjectsFromPlugin("Sofa.Component.Collision"); - factory->registerObjectsFromPlugin("Sofa.Component.Constraint"); - factory->registerObjectsFromPlugin("Sofa.Component.Controller"); - factory->registerObjectsFromPlugin("Sofa.Component.Diffusion"); - factory->registerObjectsFromPlugin("Sofa.Component.Engine"); - factory->registerObjectsFromPlugin("Sofa.Component.Haptics"); - factory->registerObjectsFromPlugin("Sofa.Component.IO"); - factory->registerObjectsFromPlugin("Sofa.Component.LinearSolver"); - factory->registerObjectsFromPlugin("Sofa.Component.LinearSystem"); - factory->registerObjectsFromPlugin("Sofa.Component.Mapping"); - factory->registerObjectsFromPlugin("Sofa.Component.Mass"); - factory->registerObjectsFromPlugin("Sofa.Component.MechanicalLoad"); - factory->registerObjectsFromPlugin("Sofa.Component.ODESolver"); - factory->registerObjectsFromPlugin("Sofa.Component.Playback"); - factory->registerObjectsFromPlugin("Sofa.Component.SceneUtility"); - factory->registerObjectsFromPlugin("Sofa.Component.Setting"); - factory->registerObjectsFromPlugin("Sofa.Component.SolidMechanics"); - factory->registerObjectsFromPlugin("Sofa.Component.StateContainer"); - factory->registerObjectsFromPlugin("Sofa.Component.Topology"); - factory->registerObjectsFromPlugin("Sofa.Component.Visual"); + factory->registerObjectsFromPlugin(Sofa.Component.AnimationLoop); + factory->registerObjectsFromPlugin(Sofa.Component.Collision); + factory->registerObjectsFromPlugin(Sofa.Component.Constraint); + factory->registerObjectsFromPlugin(Sofa.Component.Controller); + factory->registerObjectsFromPlugin(Sofa.Component.Diffusion); + factory->registerObjectsFromPlugin(Sofa.Component.Engine); + factory->registerObjectsFromPlugin(Sofa.Component.Haptics); + factory->registerObjectsFromPlugin(Sofa.Component.IO); + factory->registerObjectsFromPlugin(Sofa.Component.LinearSolver); + factory->registerObjectsFromPlugin(Sofa.Component.LinearSystem); + factory->registerObjectsFromPlugin(Sofa.Component.Mapping); + factory->registerObjectsFromPlugin(Sofa.Component.Mass); + factory->registerObjectsFromPlugin(Sofa.Component.MechanicalLoad); + factory->registerObjectsFromPlugin(Sofa.Component.ODESolver); + factory->registerObjectsFromPlugin(Sofa.Component.Playback); + factory->registerObjectsFromPlugin(Sofa.Component.SceneUtility); + factory->registerObjectsFromPlugin(Sofa.Component.Setting); + factory->registerObjectsFromPlugin(Sofa.Component.SolidMechanics); + factory->registerObjectsFromPlugin(Sofa.Component.StateContainer); + factory->registerObjectsFromPlugin(Sofa.Component.Topology); + factory->registerObjectsFromPlugin(Sofa.Component.Visual); } void init() diff --git a/Sofa/Component/test/CMakeLists.txt b/Sofa/Component/test/CMakeLists.txt new file mode 100644 index 00000000000..ae42441ddc2 --- /dev/null +++ b/Sofa/Component/test/CMakeLists.txt @@ -0,0 +1,37 @@ +cmake_minimum_required(VERSION 3.22) + +project(Sofa.Component_test) + +set(SOURCE_FILES + Modules_test.cpp +) + +set(HEADER_FILES + Modules_test.h.in +) + +# The following block of code will generate a unit test for each of the target starting with Sofa.Component.* +# It checks that there is a corresponding data structure in Sofa.Config (otherwise it does not compile), and that the +# data structure converts to a string matching the target name. +set(ALL_SOFA_MODULES) +sofa_get_all_targets(all_targets "${CMAKE_SOURCE_DIR}") +foreach(target ${all_targets}) + if(target MATCHES "Sofa.Component.*" + AND NOT target MATCHES ".*_relocatable_install" + AND NOT target MATCHES ".*_test" + AND NOT target MATCHES ".*_simutest" + AND NOT target MATCHES ".*Testing") + string(REPLACE "." "" noDotTarget ${target}) #gtest does not like dots in test names + set(ALL_SOFA_MODULES "${ALL_SOFA_MODULES}\\\nTEST(SofaComponent, ${noDotTarget}){EXPECT_EQ(static_cast(${target}), \"${target}\");}") + endif() +endforeach() + +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/Modules_test.h.in + ${CMAKE_CURRENT_BINARY_DIR}/Modules_test.h) + +add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES}) +target_link_libraries(${PROJECT_NAME} Sofa.Testing) +target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") + +add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}) diff --git a/Sofa/Component/test/Modules_test.cpp b/Sofa/Component/test/Modules_test.cpp new file mode 100644 index 00000000000..389379fef85 --- /dev/null +++ b/Sofa/Component/test/Modules_test.cpp @@ -0,0 +1,25 @@ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2006 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 of the License, or (at * +* your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, but WITHOUT * +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Authors: The SOFA Team and external contributors (see Authors.txt) * +* * +* Contact information: contact@sofa-framework.org * +******************************************************************************/ +#include +#include + +ALL_SOFA_MODULES diff --git a/Sofa/Component/test/Modules_test.h.in b/Sofa/Component/test/Modules_test.h.in new file mode 100644 index 00000000000..85dd4b6b3bf --- /dev/null +++ b/Sofa/Component/test/Modules_test.h.in @@ -0,0 +1,25 @@ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2006 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 of the License, or (at * +* your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, but WITHOUT * +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Authors: The SOFA Team and external contributors (see Authors.txt) * +* * +* Contact information: contact@sofa-framework.org * +******************************************************************************/ +#include +#include + +#cmakedefine ALL_SOFA_MODULES @ALL_SOFA_MODULES@ diff --git a/Sofa/GL/Component/Rendering2D/tests/OglLabel_test.cpp b/Sofa/GL/Component/Rendering2D/tests/OglLabel_test.cpp index 384a424251b..018a6064405 100644 --- a/Sofa/GL/Component/Rendering2D/tests/OglLabel_test.cpp +++ b/Sofa/GL/Component/Rendering2D/tests/OglLabel_test.cpp @@ -55,7 +55,7 @@ class OglLabelTest : public BaseTest public: void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.GL.Component.Rendering2D"); + sofa::simpleapi::importPlugin(Sofa.GL.Component.Rendering2D); } void checkExcludingAttributes() diff --git a/Sofa/GL/Component/Rendering3D/tests/ClipPlane_test.cpp b/Sofa/GL/Component/Rendering3D/tests/ClipPlane_test.cpp index f596ef6ebe9..f8f9adb6e64 100644 --- a/Sofa/GL/Component/Rendering3D/tests/ClipPlane_test.cpp +++ b/Sofa/GL/Component/Rendering3D/tests/ClipPlane_test.cpp @@ -62,8 +62,8 @@ class TestClipPlane : public BaseTest { public: void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.GL.Component.Rendering3D"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); + sofa::simpleapi::importPlugin(Sofa.GL.Component.Rendering3D); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); } void checkClipPlaneValidAttributes(); diff --git a/Sofa/GL/Component/Shader/tests/LightManager_test.cpp b/Sofa/GL/Component/Shader/tests/LightManager_test.cpp index cde4ddc5a17..672906f07dc 100644 --- a/Sofa/GL/Component/Shader/tests/LightManager_test.cpp +++ b/Sofa/GL/Component/Shader/tests/LightManager_test.cpp @@ -55,8 +55,8 @@ struct TestLightManager : public BaseTest { void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.GL.Component.Shader"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); + sofa::simpleapi::importPlugin(Sofa.GL.Component.Shader); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); } }; @@ -94,7 +94,7 @@ void checkAttributes() TEST_F(TestLightManager, checkAttributes) { - sofa::simpleapi::importPlugin("Sofa.GL.Component.Shader"); + sofa::simpleapi::importPlugin(Sofa.GL.Component.Shader); checkAttributes(); } diff --git a/Sofa/GL/Component/Shader/tests/Light_test.cpp b/Sofa/GL/Component/Shader/tests/Light_test.cpp index 29fbf100cf3..165e974cb33 100644 --- a/Sofa/GL/Component/Shader/tests/Light_test.cpp +++ b/Sofa/GL/Component/Shader/tests/Light_test.cpp @@ -50,8 +50,8 @@ class TestLight : public BaseTest { void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.GL.Component.Shader"); - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); + sofa::simpleapi::importPlugin(Sofa.GL.Component.Shader); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); } void checkSpotLightValidAttributes(); diff --git a/Sofa/framework/Config/CMakeLists.txt b/Sofa/framework/Config/CMakeLists.txt index 6d72f023115..e1374daf83c 100644 --- a/Sofa/framework/Config/CMakeLists.txt +++ b/Sofa/framework/Config/CMakeLists.txt @@ -85,6 +85,7 @@ set(HEADER_FILES ${SOFACONFIGSRC_ROOT}/config.h.in ${SOFACONFIGSRC_ROOT}/version.h.in ${SOFACONFIGSRC_ROOT}/url.h.in + ${SOFACONFIGSRC_ROOT}/Modules.h ) set(SOURCE_FILES ${SOFACONFIGSRC_ROOT}/initSofaConfig.cpp # necessary to build a library diff --git a/Sofa/framework/Config/cmake/SofaMacrosUtils.cmake b/Sofa/framework/Config/cmake/SofaMacrosUtils.cmake index bff05bcce1f..bb4aa5490cc 100644 --- a/Sofa/framework/Config/cmake/SofaMacrosUtils.cmake +++ b/Sofa/framework/Config/cmake/SofaMacrosUtils.cmake @@ -42,6 +42,12 @@ endmacro() function(sofa_get_all_targets var) set(targets) - __get_all_targets_recursive(targets ${CMAKE_CURRENT_SOURCE_DIR}) + + set(source_dir ${ARGV1}) #optional argument to define the source directory + if(NOT DEFINED source_dir) + set(source_dir "${CMAKE_CURRENT_SOURCE_DIR}") # Set a default value + endif() + + __get_all_targets_recursive(targets ${source_dir}) set(${var} ${targets} PARENT_SCOPE) endfunction() diff --git a/Sofa/framework/Config/src/sofa/Modules.h b/Sofa/framework/Config/src/sofa/Modules.h new file mode 100644 index 00000000000..a02c7962c1e --- /dev/null +++ b/Sofa/framework/Config/src/sofa/Modules.h @@ -0,0 +1,179 @@ +/****************************************************************************** +* SOFA, Simulation Open-Framework Architecture * +* (c) 2006 INRIA, USTL, UJF, CNRS, MGH * +* * +* This program is free software; you can redistribute it and/or modify it * +* under the terms of the GNU Lesser General Public License as published by * +* the Free Software Foundation; either version 2.1 of the License, or (at * +* your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, but WITHOUT * +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * +* for more details. * +* * +* You should have received a copy of the GNU Lesser General Public License * +* along with this program. If not, see . * +******************************************************************************* +* Authors: The SOFA Team and external contributors (see Authors.txt) * +* * +* Contact information: contact@sofa-framework.org * +******************************************************************************/ +#pragma once +#include + +/** + * The macro allows a simpler definition and maintenance of the module data + * structure + * @param name Module name + */ +#define START_MODULE(name, fullModuleName)\ + private:\ + struct Module ## name\ + {\ + private:\ + static constexpr const char* moduleName = fullModuleName;\ + public:\ + Module ## name() = default;\ + Module ## name(const Module ## name&) = delete;\ + Module ## name& operator=(const Module ## name&) = delete;\ + operator std::string() const { return moduleName; } + +#define END_MODULE(name)\ + };\ + public:\ + Module ## name name; + +#define MODULE(name, fullModuleName) \ + START_MODULE(name, fullModuleName) END_MODULE(name) + +inline struct ModuleSofa +{ +private: + static constexpr const char* moduleName = "Sofa"; +public: + ModuleSofa() = default; + ModuleSofa(const ModuleSofa&) = delete; + ModuleSofa& operator=(const ModuleSofa&) = delete; + operator std::string() const { return moduleName; } + + START_MODULE(Component, "Sofa.Component") + MODULE(AnimationLoop, "Sofa.Component.AnimationLoop") + START_MODULE(Collision, "Sofa.Component.Collision") + START_MODULE(Detection, "Sofa.Component.Collision.Detection") + MODULE(Algorithm, "Sofa.Component.Collision.Detection.Algorithm") + MODULE(Intersection, "Sofa.Component.Collision.Detection.Intersection") + END_MODULE(Detection) + MODULE(Geometry, "Sofa.Component.Collision.Geometry") + START_MODULE(Response, "Sofa.Component.Collision.Response") + MODULE(Contact, "Sofa.Component.Collision.Response.Contact") + MODULE(Mapper, "Sofa.Component.Collision.Response.Mapper") + END_MODULE(Response) + END_MODULE(Collision) + + START_MODULE(Constraint, "Sofa.Component.Constraint") + START_MODULE(Lagrangian, "Sofa.Component.Constraint.Lagrangian") + MODULE(Correction, "Sofa.Component.Constraint.Lagrangian.Correction") + MODULE(Model, "Sofa.Component.Constraint.Lagrangian.Model") + MODULE(Solver, "Sofa.Component.Constraint.Lagrangian.Solver") + END_MODULE(Lagrangian) + + MODULE(Projective, "Sofa.Component.Constraint.Projective") + END_MODULE(Constraint) + + MODULE(Controller, "Sofa.Component.Controller") + MODULE(Diffusion, "Sofa.Component.Diffusion") + + START_MODULE(Engine, "Sofa.Component.Engine") + MODULE(Analyze, "Sofa.Component.Engine.Analyze") + MODULE(Generate, "Sofa.Component.Engine.Generate") + MODULE(Select, "Sofa.Component.Engine.Select") + MODULE(Transform, "Sofa.Component.Engine.Transform") + END_MODULE(Engine) + + MODULE(Haptics, "Sofa.Component.Haptics") + + START_MODULE(IO, "Sofa.Component.IO") + MODULE(Mesh, "Sofa.Component.IO.Mesh") + END_MODULE(IO) + + START_MODULE(LinearSolver, "Sofa.Component.LinearSolver") + MODULE(Direct, "Sofa.Component.LinearSolver.Direct") + MODULE(Iterative, "Sofa.Component.LinearSolver.Iterative") + MODULE(Ordering, "Sofa.Component.LinearSolver.Ordering") + MODULE(Preconditioner, "Sofa.Component.LinearSolver.Preconditioner") + END_MODULE(LinearSolver) + + MODULE(LinearSystem, "Sofa.Component.LinearSystem") + + START_MODULE(Mapping, "Sofa.Component.Mapping") + MODULE(Linear, "Sofa.Component.Mapping.Linear") + MODULE(MappedMatrix, "Sofa.Component.Mapping.MappedMatrix") + MODULE(NonLinear, "Sofa.Component.Mapping.NonLinear") + END_MODULE(Mapping) + + MODULE(Mass, "Sofa.Component.Mass") + MODULE(MechanicalLoad, "Sofa.Component.MechanicalLoad") + + START_MODULE(ODESolver, "Sofa.Component.ODESolver") + MODULE(Backward, "Sofa.Component.ODESolver.Backward") + MODULE(Forward, "Sofa.Component.ODESolver.Forward") + END_MODULE(ODESolver) + + MODULE(Playback, "Sofa.Component.Playback") + MODULE(SceneUtility, "Sofa.Component.SceneUtility") + MODULE(Setting, "Sofa.Component.Setting") + + START_MODULE(SolidMechanics, "Sofa.Component.SolidMechanics") + START_MODULE(FEM, "Sofa.Component.SolidMechanics.FEM") + MODULE(Elastic, "Sofa.Component.SolidMechanics.FEM.Elastic") + MODULE(HyperElastic, "Sofa.Component.SolidMechanics.FEM.HyperElastic") + MODULE(NonUniform, "Sofa.Component.SolidMechanics.FEM.NonUniform") + END_MODULE(FEM) + + MODULE(Spring, "Sofa.Component.SolidMechanics.Spring") + MODULE(TensorMass, "Sofa.Component.SolidMechanics.TensorMass") + END_MODULE(SolidMechanics) + + MODULE(StateContainer, "Sofa.Component.StateContainer") + + START_MODULE(Topology, "Sofa.Component.Topology") + START_MODULE(Container, "Sofa.Component.Topology.Container") + MODULE(Constant, "Sofa.Component.Topology.Container.Constant") + MODULE(Dynamic, "Sofa.Component.Topology.Container.Dynamic") + MODULE(Grid, "Sofa.Component.Topology.Container.Grid") + END_MODULE(Container) + MODULE(Mapping, "Sofa.Component.Topology.Mapping") + MODULE(Utility, "Sofa.Component.Topology.Utility") + END_MODULE(Topology) + + MODULE(Visual, "Sofa.Component.Visual") + END_MODULE(Component) + + START_MODULE(GL, "Sofa.GL") + START_MODULE(Component, "Sofa.GL.Component") + MODULE(Engine, "Sofa.GL.Component.Engine") + MODULE(Rendering2D, "Sofa.GL.Component.Rendering2D") + MODULE(Rendering3D, "Sofa.GL.Component.Rendering3D") + MODULE(Shader, "Sofa.GL.Component.Shader") + END_MODULE(Component) + END_MODULE(GL) + + START_MODULE(GUI, "Sofa.GUI") + MODULE(Component, "Sofa.GUI.Component") + END_MODULE(GUI) + +} +/** + * Nested data structure reproducing the architecture of SOFA modules (tree-like + * structure). All modules and submodules can convert implicitly to std::string. + * This allows to use this structure as a string in functions accepting a module + * name as a string. From the developer point of view, the use of this data + * structure is less error-prone compared to any string and the auto-completion + * allows faster developments. + */ +Sofa; + +#undef START_MODULE +#undef END_MODULE +#undef MODULE diff --git a/Sofa/framework/Core/test/ObjectFactoryJson_test.cpp b/Sofa/framework/Core/test/ObjectFactoryJson_test.cpp index 1306c64b794..ce051811eb5 100644 --- a/Sofa/framework/Core/test/ObjectFactoryJson_test.cpp +++ b/Sofa/framework/Core/test/ObjectFactoryJson_test.cpp @@ -25,6 +25,7 @@ #include #include #include +#include namespace sofa @@ -70,7 +71,7 @@ TEST(ObjectFactoryJson, oneTemplatedObject) TEST(ObjectFactoryJson, mainInstance) { - EXPECT_TRUE(sofa::simpleapi::importPlugin("Sofa.Component")); + EXPECT_TRUE(sofa::simpleapi::importPlugin(Sofa.Component)); const auto dump = core::ObjectFactoryJson::dump(core::ObjectFactory::getInstance()); EXPECT_NE(dump.find("MechanicalObject"), std::string::npos); } diff --git a/Sofa/framework/Core/test/VecId_test.cpp b/Sofa/framework/Core/test/VecId_test.cpp index 00833a8a72f..ed15bbb961f 100644 --- a/Sofa/framework/Core/test/VecId_test.cpp +++ b/Sofa/framework/Core/test/VecId_test.cpp @@ -21,6 +21,7 @@ ******************************************************************************/ #include #include +#include class DerivedBaseVecId : public sofa::core::BaseVecId { @@ -98,4 +99,7 @@ TEST(VecId, name) EXPECT_EQ(sofa::core::vec_id::read_access::dforce.getName(), "dforce(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::dforce.getName(), "dforce(V_DERIV)"); + const std::string s = Sofa.Component.Collision; + EXPECT_EQ(s, std::string("Sofa.Component.Collision")); + } diff --git a/Sofa/framework/Helper/src/sofa/helper/ComponentChange.cpp b/Sofa/framework/Helper/src/sofa/helper/ComponentChange.cpp index fcfb5e13734..29d9abf57d8 100644 --- a/Sofa/framework/Helper/src/sofa/helper/ComponentChange.cpp +++ b/Sofa/framework/Helper/src/sofa/helper/ComponentChange.cpp @@ -20,7 +20,7 @@ * Contact information: contact@sofa-framework.org * ******************************************************************************/ #include - +#include namespace sofa::helper::lifecycle { @@ -78,551 +78,551 @@ const std::map > movedComponents = { { "GlobalSystemMatrixExporter", Moved("v22.06", "SofaBaseLinearSolver", "SofaMatrix") }, // SofaMiscSolver was deprecated in #2571 - { "DampVelocitySolver", Moved("v22.06", "SofaMiscSolver", "Sofa.Component.ODESolver.Forward") }, - { "NewmarkImplicitSolver", Moved("v22.06", "SofaMiscSolver", "Sofa.Component.ODESolver.Backward") }, + { "DampVelocitySolver", Moved("v22.06", "SofaMiscSolver", Sofa.Component.ODESolver.Forward) }, + { "NewmarkImplicitSolver", Moved("v22.06", "SofaMiscSolver", Sofa.Component.ODESolver.Backward) }, // SofaExplicitOdeSolver was deprecated in #2571 - { "EulerExplicitSolver", Moved("v22.06", "SofaExplicitOdeSolver", "Sofa.Component.ODESolver.Forward") }, + { "EulerExplicitSolver", Moved("v22.06", "SofaExplicitOdeSolver", Sofa.Component.ODESolver.Forward) }, // SofaImplicitOdeSolver was deprecated in #2571 - { "EulerImplicitSolver", Moved("v22.06", "SofaImplicitOdeSolver", "Sofa.Component.ODESolver.Backward") }, - { "StaticSolver", Moved("v22.06", "SofaImplicitOdeSolver", "Sofa.Component.ODESolver.Backward") }, + { "EulerImplicitSolver", Moved("v22.06", "SofaImplicitOdeSolver", Sofa.Component.ODESolver.Backward) }, + { "StaticSolver", Moved("v22.06", "SofaImplicitOdeSolver", Sofa.Component.ODESolver.Backward) }, // SofaGeneralExplicitOdeSolver was deprecated in #2571 - { "CentralDifferenceSolver", Moved("v22.06", "SofaGeneralExplicitOdeSolver", "Sofa.Component.ODESolver.Forward") }, - { "RungeKutta2Solver", Moved("v22.06", "SofaGeneralExplicitOdeSolver", "Sofa.Component.ODESolver.Forward") }, - { "RungeKutta4Solver", Moved("v22.06", "SofaGeneralExplicitOdeSolver", "Sofa.Component.ODESolver.Forward") }, + { "CentralDifferenceSolver", Moved("v22.06", "SofaGeneralExplicitOdeSolver", Sofa.Component.ODESolver.Forward) }, + { "RungeKutta2Solver", Moved("v22.06", "SofaGeneralExplicitOdeSolver", Sofa.Component.ODESolver.Forward) }, + { "RungeKutta4Solver", Moved("v22.06", "SofaGeneralExplicitOdeSolver", Sofa.Component.ODESolver.Forward) }, // SofaGeneralImplicitOdeSolver was deprecated in #2571 - { "VariationalSymplecticSolver", Moved("v22.06", "SofaGeneralImplicitOdeSolver", "Sofa.Component.ODESolver.Backward") }, + { "VariationalSymplecticSolver", Moved("v22.06", "SofaGeneralImplicitOdeSolver", Sofa.Component.ODESolver.Backward) }, // SofaLoader was deprecated in #2582 - { "MeshOBJLoader", Moved("v22.06", "SofaLoader", "Sofa.Component.IO.Mesh") }, - { "MeshVTKLoader", Moved("v22.06", "SofaLoader", "Sofa.Component.IO.Mesh") }, + { "MeshOBJLoader", Moved("v22.06", "SofaLoader", Sofa.Component.IO.Mesh) }, + { "MeshVTKLoader", Moved("v22.06", "SofaLoader", Sofa.Component.IO.Mesh) }, // SofaGeneralLoader was deprecated in #2582 - { "MeshGmshLoader", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.IO.Mesh") }, - { "GIDMeshLoader", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.IO.Mesh") }, - { "GridMeshCreator", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.IO.Mesh") }, - { "MeshOffLoader", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.IO.Mesh") }, - { "MeshSTLLoader", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.IO.Mesh") }, - { "MeshTrianLoader", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.IO.Mesh") }, - { "MeshXspLoader", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.IO.Mesh") }, - { "OffSequenceLoader", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.IO.Mesh") }, - { "SphereLoader", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.IO.Mesh") }, - { "StringMeshCreator", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.IO.Mesh") }, - { "VoxelGridLoader", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.IO.Mesh") }, - { "ReadState", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.Playback") }, - { "ReadTopology", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.Playback") }, - { "InputEventReader", Moved("v22.06", "SofaGeneralLoader", "Sofa.Component.Playback") }, + { "MeshGmshLoader", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.IO.Mesh) }, + { "GIDMeshLoader", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.IO.Mesh) }, + { "GridMeshCreator", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.IO.Mesh) }, + { "MeshOffLoader", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.IO.Mesh) }, + { "MeshSTLLoader", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.IO.Mesh) }, + { "MeshTrianLoader", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.IO.Mesh) }, + { "MeshXspLoader", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.IO.Mesh) }, + { "OffSequenceLoader", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.IO.Mesh) }, + { "SphereLoader", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.IO.Mesh) }, + { "StringMeshCreator", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.IO.Mesh) }, + { "VoxelGridLoader", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.IO.Mesh) }, + { "ReadState", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.Playback) }, + { "ReadTopology", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.Playback) }, + { "InputEventReader", Moved("v22.06", "SofaGeneralLoader", Sofa.Component.Playback) }, // SofaExporter was deprecated in #2582 - { "BlenderExporter", Moved("v22.06", "SofaExporter", "Sofa.Component.IO.Mesh") }, - { "MeshExporter", Moved("v22.06", "SofaExporter", "Sofa.Component.IO.Mesh") }, - { "STLExporter", Moved("v22.06", "SofaExporter", "Sofa.Component.IO.Mesh") }, - { "VisualModelOBJExporter", Moved("v22.06", "SofaExporter", "Sofa.Component.IO.Mesh") }, - { "VTKExporter", Moved("v22.06", "SofaExporter", "Sofa.Component.IO.Mesh") }, - { "WriteState", Moved("v22.06", "SofaExporter", "Sofa.Component.Playback") }, - { "WriteTopology", Moved("v22.06", "SofaExporter", "Sofa.Component.Playback") }, + { "BlenderExporter", Moved("v22.06", "SofaExporter", Sofa.Component.IO.Mesh) }, + { "MeshExporter", Moved("v22.06", "SofaExporter", Sofa.Component.IO.Mesh) }, + { "STLExporter", Moved("v22.06", "SofaExporter", Sofa.Component.IO.Mesh) }, + { "VisualModelOBJExporter", Moved("v22.06", "SofaExporter", Sofa.Component.IO.Mesh) }, + { "VTKExporter", Moved("v22.06", "SofaExporter", Sofa.Component.IO.Mesh) }, + { "WriteState", Moved("v22.06", "SofaExporter", Sofa.Component.Playback) }, + { "WriteTopology", Moved("v22.06", "SofaExporter", Sofa.Component.Playback) }, // SofaBaseUtils was deprecated in #2605 - { "AddResourceRepository", Moved("v22.06", "SofaBaseUtils", "Sofa.Component.SceneUtility") }, - { "MakeAliasComponent", Moved("v22.06", "SofaBaseUtils", "Sofa.Component.SceneUtility") }, - { "MakeDataAliasComponent", Moved("v22.06", "SofaBaseUtils", "Sofa.Component.SceneUtility") }, - { "MessageHandlerComponent", Moved("v22.06", "SofaBaseUtils", "Sofa.Component.SceneUtility") }, - { "FileMessageHandlerComponent", Moved("v22.06", "SofaBaseUtils", "Sofa.Component.SceneUtility") }, - { "InfoComponent", Moved("v22.06", "SofaBaseUtils", "Sofa.Component.SceneUtility") }, + { "AddResourceRepository", Moved("v22.06", "SofaBaseUtils", Sofa.Component.SceneUtility) }, + { "MakeAliasComponent", Moved("v22.06", "SofaBaseUtils", Sofa.Component.SceneUtility) }, + { "MakeDataAliasComponent", Moved("v22.06", "SofaBaseUtils", Sofa.Component.SceneUtility) }, + { "MessageHandlerComponent", Moved("v22.06", "SofaBaseUtils", Sofa.Component.SceneUtility) }, + { "FileMessageHandlerComponent", Moved("v22.06", "SofaBaseUtils", Sofa.Component.SceneUtility) }, + { "InfoComponent", Moved("v22.06", "SofaBaseUtils", Sofa.Component.SceneUtility) }, { "RequiredPlugin", Moved("v22.06", "SofaBaseUtils", "Sofa.Core") }, // SofaGraphComponent was deprecated in #2605, #2843 and #2895 - { "AddFrameButtonSetting", Moved("v22.06", "SofaGraphComponent", "Sofa.GUI.Component") }, - { "AddRecordedCameraButtonSetting", Moved("v22.06", "SofaGraphComponent", "Sofa.GUI.Component") }, - { "StartNavigationButtonSetting", Moved("v22.06", "SofaGraphComponent", "Sofa.Component.Setting") }, - { "AttachBodyButtonSetting", Moved("v22.06", "SofaGraphComponent", "Sofa.GUI.Component") }, - { "FixPickedParticleButtonSetting", Moved("v22.06", "SofaGraphComponent", "Sofa.GUI.Component") }, - { "SofaDefaultPathSetting", Moved("v22.06", "SofaGraphComponent", "Sofa.Component.Setting") }, - { "StatsSetting", Moved("v22.06", "SofaGraphComponent", "Sofa.Component.Setting") }, - { "ViewerSetting", Moved("v22.06", "SofaGraphComponent", "Sofa.Component.Setting") }, - { "APIVersion", Moved("v22.06", "SofaGraphComponent", "Sofa.Component.Setting") }, + { "AddFrameButtonSetting", Moved("v22.06", "SofaGraphComponent", Sofa.GUI.Component) }, + { "AddRecordedCameraButtonSetting", Moved("v22.06", "SofaGraphComponent", Sofa.GUI.Component) }, + { "StartNavigationButtonSetting", Moved("v22.06", "SofaGraphComponent", Sofa.Component.Setting) }, + { "AttachBodyButtonSetting", Moved("v22.06", "SofaGraphComponent", Sofa.GUI.Component) }, + { "FixPickedParticleButtonSetting", Moved("v22.06", "SofaGraphComponent", Sofa.GUI.Component) }, + { "SofaDefaultPathSetting", Moved("v22.06", "SofaGraphComponent", Sofa.Component.Setting) }, + { "StatsSetting", Moved("v22.06", "SofaGraphComponent", Sofa.Component.Setting) }, + { "ViewerSetting", Moved("v22.06", "SofaGraphComponent", Sofa.Component.Setting) }, + { "APIVersion", Moved("v22.06", "SofaGraphComponent", Sofa.Component.Setting) }, // SofaBaseTopology was deprecated in #2612 - { "EdgeSetGeometryAlgorithms", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "EdgeSetTopologyAlgorithms", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "EdgeSetTopologyContainer", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "EdgeSetTopologyModifier", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "HexahedronSetGeometryAlgorithms", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "HexahedronSetTopologyAlgorithms", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "HexahedronSetTopologyContainer", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "HexahedronSetTopologyModifier", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "PointSetGeometryAlgorithms", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "PointSetTopologyAlgorithms", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "PointSetTopologyContainer", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "PointSetTopologyModifier", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "QuadSetGeometryAlgorithms", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "QuadSetTopologyAlgorithms", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "QuadSetTopologyContainer", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "QuadSetTopologyModifier", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "TetrahedronSetGeometryAlgorithms", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "TetrahedronSetTopologyAlgorithms", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "TetrahedronSetTopologyContainer", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "TetrahedronSetTopologyModifier", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "TriangleSetGeometryAlgorithms", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "TriangleSetTopologyAlgorithms", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "TriangleSetTopologyContainer", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "TriangleSetTopologyModifier", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Dynamic") }, - { "MeshTopology", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Constant") }, - { "GridTopology", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Grid") }, - { "RegularGridTopology", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Grid") }, - { "SparseGridTopology", Moved("v22.06", "SofaBaseTopology", "Sofa.Component.Topology.Container.Grid") }, + { "EdgeSetGeometryAlgorithms", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "EdgeSetTopologyAlgorithms", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "EdgeSetTopologyContainer", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "EdgeSetTopologyModifier", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "HexahedronSetGeometryAlgorithms", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "HexahedronSetTopologyAlgorithms", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "HexahedronSetTopologyContainer", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "HexahedronSetTopologyModifier", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "PointSetGeometryAlgorithms", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "PointSetTopologyAlgorithms", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "PointSetTopologyContainer", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "PointSetTopologyModifier", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "QuadSetGeometryAlgorithms", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "QuadSetTopologyAlgorithms", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "QuadSetTopologyContainer", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "QuadSetTopologyModifier", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "TetrahedronSetGeometryAlgorithms", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "TetrahedronSetTopologyAlgorithms", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "TetrahedronSetTopologyContainer", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "TetrahedronSetTopologyModifier", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "TriangleSetGeometryAlgorithms", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "TriangleSetTopologyAlgorithms", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "TriangleSetTopologyContainer", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "TriangleSetTopologyModifier", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Dynamic) }, + { "MeshTopology", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Constant) }, + { "GridTopology", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Grid) }, + { "RegularGridTopology", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Grid) }, + { "SparseGridTopology", Moved("v22.06", "SofaBaseTopology", Sofa.Component.Topology.Container.Grid) }, // SofaGeneralTopology was deprecated in #2612 - { "CubeTopology", Moved("v22.06", "SofaGeneralTopology", "Sofa.Component.Topology.Container.Constant") }, - { "SphereQuadTopology", Moved("v22.06", "SofaGeneralTopology", "Sofa.Component.Topology.Container.Constant") }, - { "CylinderGridTopology", Moved("v22.06", "SofaGeneralTopology", "Sofa.Component.Topology.Container.Grid") }, - { "SphereGridTopology", Moved("v22.06", "SofaGeneralTopology", "Sofa.Component.Topology.Container.Grid") }, + { "CubeTopology", Moved("v22.06", "SofaGeneralTopology", Sofa.Component.Topology.Container.Constant) }, + { "SphereQuadTopology", Moved("v22.06", "SofaGeneralTopology", Sofa.Component.Topology.Container.Constant) }, + { "CylinderGridTopology", Moved("v22.06", "SofaGeneralTopology", Sofa.Component.Topology.Container.Grid) }, + { "SphereGridTopology", Moved("v22.06", "SofaGeneralTopology", Sofa.Component.Topology.Container.Grid) }, // SofaNonUniformFem was deprecated in #2612 and #2759 - { "DynamicSparseGridGeometryAlgorithms", Moved("v22.06", "SofaNonUniformFem", "Sofa.Component.Topology.Container.Dynamic") }, - { "DynamicSparseGridTopologyAlgorithms", Moved("v22.06", "SofaNonUniformFem", "Sofa.Component.Topology.Container.Dynamic") }, - { "DynamicSparseGridTopologyContainer", Moved("v22.06", "SofaNonUniformFem", "Sofa.Component.Topology.Container.Dynamic") }, - { "DynamicSparseGridTopologyModifier", Moved("v22.06", "SofaNonUniformFem", "Sofa.Component.Topology.Container.Dynamic") }, - { "MultilevelHexahedronSetTopologyContainer", Moved("v22.06", "SofaNonUniformFem", "Sofa.Component.Topology.Container.Dynamic") }, - { "SparseGridMultipleTopology", Moved("v22.06", "SofaNonUniformFem", "Sofa.Component.Topology.Container.Grid") }, - { "SparseGridRamificationTopology", Moved("v22.06", "SofaNonUniformFem", "Sofa.Component.Topology.Container.Grid") }, - { "NonUniformHexahedralFEMForceFieldAndMass", Moved("v22.06", "SofaNonUniformFem", "Sofa.Component.SolidMechanics.FEM.NonUniform") }, - { "NonUniformHexahedronFEMForceFieldAndMass", Moved("v22.06", "SofaNonUniformFem", "Sofa.Component.SolidMechanics.FEM.NonUniform") }, - { "HexahedronCompositeFEMForceFieldAndMass", Moved("v22.06", "SofaNonUniformFem", "Sofa.Component.SolidMechanics.FEM.NonUniform") }, - { "HexahedronCompositeFEMMapping", Moved("v22.06", "SofaNonUniformFem", "Sofa.Component.SolidMechanics.FEM.NonUniform") }, + { "DynamicSparseGridGeometryAlgorithms", Moved("v22.06", "SofaNonUniformFem", Sofa.Component.Topology.Container.Dynamic) }, + { "DynamicSparseGridTopologyAlgorithms", Moved("v22.06", "SofaNonUniformFem", Sofa.Component.Topology.Container.Dynamic) }, + { "DynamicSparseGridTopologyContainer", Moved("v22.06", "SofaNonUniformFem", Sofa.Component.Topology.Container.Dynamic) }, + { "DynamicSparseGridTopologyModifier", Moved("v22.06", "SofaNonUniformFem", Sofa.Component.Topology.Container.Dynamic) }, + { "MultilevelHexahedronSetTopologyContainer", Moved("v22.06", "SofaNonUniformFem", Sofa.Component.Topology.Container.Dynamic) }, + { "SparseGridMultipleTopology", Moved("v22.06", "SofaNonUniformFem", Sofa.Component.Topology.Container.Grid) }, + { "SparseGridRamificationTopology", Moved("v22.06", "SofaNonUniformFem", Sofa.Component.Topology.Container.Grid) }, + { "NonUniformHexahedralFEMForceFieldAndMass", Moved("v22.06", "SofaNonUniformFem", Sofa.Component.SolidMechanics.FEM.NonUniform) }, + { "NonUniformHexahedronFEMForceFieldAndMass", Moved("v22.06", "SofaNonUniformFem", Sofa.Component.SolidMechanics.FEM.NonUniform) }, + { "HexahedronCompositeFEMForceFieldAndMass", Moved("v22.06", "SofaNonUniformFem", Sofa.Component.SolidMechanics.FEM.NonUniform) }, + { "HexahedronCompositeFEMMapping", Moved("v22.06", "SofaNonUniformFem", Sofa.Component.SolidMechanics.FEM.NonUniform) }, // SofaTopologicalMapping was deprecated in #2612 and #XXXX - { "CenterPointTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Topology.Mapping") }, - { "Edge2QuadTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Topology.Mapping") }, - { "Hexa2QuadTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Topology.Mapping") }, - { "Hexa2TetraTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Topology.Mapping") }, - { "IdentityTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Topology.Mapping") }, - { "Mesh2PointTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Topology.Mapping") }, - { "Quad2TriangleTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Topology.Mapping") }, - { "SimpleTesselatedHexaTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Topology.Mapping") }, - { "SimpleTesselatedTetraTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Topology.Mapping") }, - { "SubsetTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Topology.Mapping") }, - { "Tetra2TriangleTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Topology.Mapping") }, - { "Triangle2EdgeTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Topology.Mapping") }, - { "Mesh2PointMechanicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Mapping.Linear") }, - { "SimpleTesselatedTetraMechanicalMapping", Moved("v22.06", "SofaTopologicalMapping", "Sofa.Component.Mapping.Linear") }, + { "CenterPointTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Topology.Mapping) }, + { "Edge2QuadTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Topology.Mapping) }, + { "Hexa2QuadTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Topology.Mapping) }, + { "Hexa2TetraTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Topology.Mapping) }, + { "IdentityTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Topology.Mapping) }, + { "Mesh2PointTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Topology.Mapping) }, + { "Quad2TriangleTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Topology.Mapping) }, + { "SimpleTesselatedHexaTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Topology.Mapping) }, + { "SimpleTesselatedTetraTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Topology.Mapping) }, + { "SubsetTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Topology.Mapping) }, + { "Tetra2TriangleTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Topology.Mapping) }, + { "Triangle2EdgeTopologicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Topology.Mapping) }, + { "Mesh2PointMechanicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Mapping.Linear) }, + { "SimpleTesselatedTetraMechanicalMapping", Moved("v22.06", "SofaTopologicalMapping", Sofa.Component.Mapping.Linear) }, // SofaMiscTopology was deprecated in #2612 - { "TopologicalChangeProcessor", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Topology.Utility") }, - { "TopologyBoundingTrasher", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Topology.Utility") }, - { "TopologyChecker", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Topology.Utility") }, + { "TopologicalChangeProcessor", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Topology.Utility) }, + { "TopologyBoundingTrasher", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Topology.Utility) }, + { "TopologyChecker", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Topology.Utility) }, // SofaBaseVisual was deprecated in #2679 and #XXXX - { "Camera", Moved("v22.06", "SofaBaseVisual", "Sofa.Component.Visual") }, - { "InteractiveCamera", Moved("v22.06", "SofaBaseVisual", "Sofa.Component.Visual") }, - { "VisualModelImpl", Moved("v22.06", "SofaBaseVisual", "Sofa.Component.Visual") }, - { "VisualStyle", Moved("v22.06", "SofaBaseVisual", "Sofa.Component.Visual") }, - { "BackgroundSetting", Moved("v22.06", "SofaBaseVisual", "Sofa.Component.Setting") }, + { "Camera", Moved("v22.06", "SofaBaseVisual", Sofa.Component.Visual) }, + { "InteractiveCamera", Moved("v22.06", "SofaBaseVisual", Sofa.Component.Visual) }, + { "VisualModelImpl", Moved("v22.06", "SofaBaseVisual", Sofa.Component.Visual) }, + { "VisualStyle", Moved("v22.06", "SofaBaseVisual", Sofa.Component.Visual) }, + { "BackgroundSetting", Moved("v22.06", "SofaBaseVisual", Sofa.Component.Setting) }, // SofaGeneralVisual was deprecated in #2679 - { "RecordedCamera", Moved("v22.06", "SofaGeneralVisual", "Sofa.Component.Visual") }, - { "Visual3DText", Moved("v22.06", "SofaGeneralVisual", "Sofa.Component.Visual") }, - { "VisualTransform", Moved("v22.06", "SofaGeneralVisual", "Sofa.Component.Visual") }, + { "RecordedCamera", Moved("v22.06", "SofaGeneralVisual", Sofa.Component.Visual) }, + { "Visual3DText", Moved("v22.06", "SofaGeneralVisual", Sofa.Component.Visual) }, + { "VisualTransform", Moved("v22.06", "SofaGeneralVisual", Sofa.Component.Visual) }, // SofaSimpleFem was deprecated in #2753 and .... - { "TetrahedronDiffusionFEMForceField", Moved("v22.06", "SofaSimpleFem", "Sofa.Component.Diffusion") }, + { "TetrahedronDiffusionFEMForceField", Moved("v22.06", "SofaSimpleFem", Sofa.Component.Diffusion) }, // SofaOpenglVisual was deprecated in #2709 - { "OglSceneFrame", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Rendering3D") }, - { "DataDisplay", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Rendering3D") }, - { "MergeVisualModels", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Rendering3D") }, - { "OglCylinderModel", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Rendering3D") }, - { "OglModel", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Rendering3D") }, - { "PointSplatModel", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Rendering3D") }, - { "SlicedVolumetricModel", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Rendering3D") }, - { "OglColorMap", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Rendering2D") }, - { "OglLabel", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Rendering2D") }, - { "OglViewport", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Rendering2D") }, - { "ClipPlane", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "CompositingVisualLoop", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "DirectionalLight", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "PositionalLight", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "SpotLight", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "LightManager", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglFloatAttribute", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglFloat2Attribute", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglFloat3Attribute", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglFloat4Attribute", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglIntAttribute", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglInt2Attribute", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglInt3Attribute", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglInt4Attribute", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglUIntAttribute", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglUInt2Attribute", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglUInt3Attribute", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglUInt4Attribute", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglOITShader", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglRenderingSRGB", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglShader", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglShaderMacro", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglShaderVisualModel", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglShadowShader", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglTexture", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglTexture2D", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglIntVariable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglInt2Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglInt3Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglInt4Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglFloatVariable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglFloat2Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglFloat3Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglFloat4Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglIntVectorVariable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglInt2VectorVariable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglInt3VectorVariable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglInt4VectorVariable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglFloatVectorVariable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglFloat2VectorVariable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglFloat3VectorVariable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglFloat4VectorVariable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglMatrix2Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglMatrix3Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglMatrix4Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglMatrix2x3Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglMatrix3x2Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglMatrix2x4Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglMatrix4x2Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglMatrix3x4Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglMatrix4x3Variable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OglMatrix4VectorVariable", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "OrderIndependentTransparencyManager", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "PostProcessManager", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "VisualManagerPass", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "VisualManagerSecondaryPass", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Shader") }, - { "TextureInterpolation", Moved("v22.06", "SofaOpenglVisual", "Sofa.GL.Component.Engine") }, + { "OglSceneFrame", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Rendering3D) }, + { "DataDisplay", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Rendering3D) }, + { "MergeVisualModels", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Rendering3D) }, + { "OglCylinderModel", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Rendering3D) }, + { "OglModel", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Rendering3D) }, + { "PointSplatModel", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Rendering3D) }, + { "SlicedVolumetricModel", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Rendering3D) }, + { "OglColorMap", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Rendering2D) }, + { "OglLabel", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Rendering2D) }, + { "OglViewport", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Rendering2D) }, + { "ClipPlane", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "CompositingVisualLoop", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "DirectionalLight", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "PositionalLight", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "SpotLight", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "LightManager", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglFloatAttribute", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglFloat2Attribute", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglFloat3Attribute", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglFloat4Attribute", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglIntAttribute", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglInt2Attribute", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglInt3Attribute", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglInt4Attribute", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglUIntAttribute", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglUInt2Attribute", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglUInt3Attribute", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglUInt4Attribute", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglOITShader", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglRenderingSRGB", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglShader", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglShaderMacro", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglShaderVisualModel", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglShadowShader", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglTexture", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglTexture2D", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglIntVariable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglInt2Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglInt3Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglInt4Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglFloatVariable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglFloat2Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglFloat3Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglFloat4Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglIntVectorVariable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglInt2VectorVariable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglInt3VectorVariable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglInt4VectorVariable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglFloatVectorVariable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglFloat2VectorVariable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglFloat3VectorVariable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglFloat4VectorVariable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglMatrix2Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglMatrix3Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglMatrix4Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglMatrix2x3Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglMatrix3x2Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglMatrix2x4Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglMatrix4x2Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglMatrix3x4Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglMatrix4x3Variable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OglMatrix4VectorVariable", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "OrderIndependentTransparencyManager", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "PostProcessManager", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "VisualManagerPass", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "VisualManagerSecondaryPass", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Shader) }, + { "TextureInterpolation", Moved("v22.06", "SofaOpenglVisual", Sofa.GL.Component.Engine) }, // SofaBaseLinearSolver was deprecated in #2717 - { "CGLinearSolver", Moved("v22.06", "SofaBaseLinearSolver", "Sofa.Component.LinearSolver.Iterative") }, + { "CGLinearSolver", Moved("v22.06", "SofaBaseLinearSolver", Sofa.Component.LinearSolver.Iterative) }, // SofaGeneralLinearSolver was deprecated in #2717 - { "MinResLinearSolver", Moved("v22.06", "SofaGeneralLinearSolver", "Sofa.Component.LinearSolver.Iterative") }, - { "BTDLinearSolver", Moved("v22.06", "SofaGeneralLinearSolver", "Sofa.Component.LinearSolver.Direct") }, - { "CholeskySolver", Moved("v22.06", "SofaGeneralLinearSolver", "Sofa.Component.LinearSolver.Direct") }, + { "MinResLinearSolver", Moved("v22.06", "SofaGeneralLinearSolver", Sofa.Component.LinearSolver.Iterative) }, + { "BTDLinearSolver", Moved("v22.06", "SofaGeneralLinearSolver", Sofa.Component.LinearSolver.Direct) }, + { "CholeskySolver", Moved("v22.06", "SofaGeneralLinearSolver", Sofa.Component.LinearSolver.Direct) }, // SofaSparseSolver was deprecated in #2717 - { "FillReducingOrdering", Moved("v22.06", "SofaGeneralLinearSolver", "Sofa.Component.LinearSolver.Direct") }, - { "PrecomputedLinearSolver", Moved("v22.06", "SofaGeneralLinearSolver", "Sofa.Component.LinearSolver.Direct") }, - { "SparseLDLSolver", Moved("v22.06", "SofaSparseSolver", "Sofa.Component.LinearSolver.Direct") }, + { "FillReducingOrdering", Moved("v22.06", "SofaGeneralLinearSolver", Sofa.Component.LinearSolver.Direct) }, + { "PrecomputedLinearSolver", Moved("v22.06", "SofaGeneralLinearSolver", Sofa.Component.LinearSolver.Direct) }, + { "SparseLDLSolver", Moved("v22.06", "SofaSparseSolver", Sofa.Component.LinearSolver.Direct) }, // SofaDenseSolver was deprecated in #2717 - { "SVDLinearSolver", Moved("v22.06", "SofaDenseSolver", "Sofa.Component.LinearSolver.Direct") }, + { "SVDLinearSolver", Moved("v22.06", "SofaDenseSolver", Sofa.Component.LinearSolver.Direct) }, // SofaPreconditioner was deprecated in #2717 - { "ShewchukPCGLinearSolver", Moved("v22.06", "SofaPreconditioner", "Sofa.Component.LinearSolver.Iterative") }, - { "JacobiPreconditioner", Moved("v22.06", "SofaPreconditioner", "Sofa.Component.LinearSolver.Preconditioner") }, - { "BlockJacobiPreconditioner", Moved("v22.06", "SofaPreconditioner", "Sofa.Component.LinearSolver.Preconditioner") }, - { "PrecomputedWarpPreconditioner", Moved("v22.06", "SofaPreconditioner", "Sofa.Component.LinearSolver.Preconditioner") }, - { "SSORPreconditioner", Moved("v22.06", "SofaPreconditioner", "Sofa.Component.LinearSolver.Preconditioner") }, - { "WarpPreconditioner", Moved("v22.06", "SofaPreconditioner", "Sofa.Component.LinearSolver.Preconditioner") }, + { "ShewchukPCGLinearSolver", Moved("v22.06", "SofaPreconditioner", Sofa.Component.LinearSolver.Iterative) }, + { "JacobiPreconditioner", Moved("v22.06", "SofaPreconditioner", Sofa.Component.LinearSolver.Preconditioner) }, + { "BlockJacobiPreconditioner", Moved("v22.06", "SofaPreconditioner", Sofa.Component.LinearSolver.Preconditioner) }, + { "PrecomputedWarpPreconditioner", Moved("v22.06", "SofaPreconditioner", Sofa.Component.LinearSolver.Preconditioner) }, + { "SSORPreconditioner", Moved("v22.06", "SofaPreconditioner", Sofa.Component.LinearSolver.Preconditioner) }, + { "WarpPreconditioner", Moved("v22.06", "SofaPreconditioner", Sofa.Component.LinearSolver.Preconditioner) }, // SofaBaseMechanics was deprecated in #2752, #2635 and #2766 - { "DiagonalMass", Moved("v22.06", "SofaBaseMechanics", "Sofa.Component.Mass") }, - { "UniformMass", Moved("v22.06", "SofaBaseMechanics", "Sofa.Component.Mass") }, - { "BarycentricMapping", Moved("v22.06", "SofaBaseMechanics", "Sofa.Component.Mapping.Linear") }, - { "IdentityMapping", Moved("v22.06", "SofaBaseMechanics", "Sofa.Component.Mapping.Linear") }, - { "SubsetMapping", Moved("v22.06", "SofaBaseMechanics", "Sofa.Component.Mapping.Linear") }, - { "MechanicalObject", Moved("v22.06", "SofaBaseMechanics", "Sofa.Component.StateContainer") }, - { "MappedObject", Moved("v22.06", "SofaBaseMechanics", "Sofa.Component.StateContainer") }, + { "DiagonalMass", Moved("v22.06", "SofaBaseMechanics", Sofa.Component.Mass) }, + { "UniformMass", Moved("v22.06", "SofaBaseMechanics", Sofa.Component.Mass) }, + { "BarycentricMapping", Moved("v22.06", "SofaBaseMechanics", Sofa.Component.Mapping.Linear) }, + { "IdentityMapping", Moved("v22.06", "SofaBaseMechanics", Sofa.Component.Mapping.Linear) }, + { "SubsetMapping", Moved("v22.06", "SofaBaseMechanics", Sofa.Component.Mapping.Linear) }, + { "MechanicalObject", Moved("v22.06", "SofaBaseMechanics", Sofa.Component.StateContainer) }, + { "MappedObject", Moved("v22.06", "SofaBaseMechanics", Sofa.Component.StateContainer) }, // SofaMiscForceField was deprecated in #2752 and ... - { "MeshMatrixMass", Moved("v22.06", "SofaMiscForceField", "Sofa.Component.Mass") }, - { "GearSpringForceField", Moved("v22.06", "SofaMiscForceField", "Sofa.Component.SolidMechanics.Spring") }, + { "MeshMatrixMass", Moved("v22.06", "SofaMiscForceField", Sofa.Component.Mass) }, + { "GearSpringForceField", Moved("v22.06", "SofaMiscForceField", Sofa.Component.SolidMechanics.Spring) }, // SofaRigid was deprecated in #2635 and #2759 - { "RigidMapping", Moved("v22.06", "SofaRigid", "Sofa.Component.Mapping.NonLinear") }, - { "RigidRigidMapping", Moved("v22.06", "SofaRigid", "Sofa.Component.Mapping.NonLinear") }, - { "JointSpringForceField", Moved("v22.06", "SofaRigid", "Sofa.Component.SolidMechanics.Spring") }, + { "RigidMapping", Moved("v22.06", "SofaRigid", Sofa.Component.Mapping.NonLinear) }, + { "RigidRigidMapping", Moved("v22.06", "SofaRigid", Sofa.Component.Mapping.NonLinear) }, + { "JointSpringForceField", Moved("v22.06", "SofaRigid", Sofa.Component.SolidMechanics.Spring) }, // Movedgid was deprecated in #2635 and ... - { "LineSetSkinningMapping", Moved("v22.06", "Movedgid", "Sofa.Component.Mapping.Linear") }, - { "SkinningMapping", Moved("v22.06", "Movedgid", "Sofa.Component.Mapping.Linear") }, + { "LineSetSkinningMapping", Moved("v22.06", "Movedgid", Sofa.Component.Mapping.Linear) }, + { "SkinningMapping", Moved("v22.06", "Movedgid", Sofa.Component.Mapping.Linear) }, { "ArticulatedHierarchyContainer", Moved("v22.06", "Movedgid", "ArticulatedSystemPlugin") }, { "ArticulationCenter", Moved("v22.06", "Movedgid", "ArticulatedSystemPlugin") }, { "Articulation", Moved("v22.06", "Movedgid", "ArticulatedSystemPlugin") }, { "ArticulatedSystemMapping", Moved("v22.06", "Movedgid", "ArticulatedSystemPlugin") }, // SofaMiscMapping was deprecated in #2635 - { "BeamLinearMapping", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Mapping.Linear") }, - { "CenterOfMassMapping", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Mapping.Linear") }, - { "CenterOfMassMulti2Mapping", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Mapping.Linear") }, - { "CenterOfMassMultiMapping", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Mapping.Linear") }, - { "DeformableOnRigidFrameMapping", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Mapping.Linear") }, - { "DistanceFromTargetMapping", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Mapping.NonLinear") }, - { "DistanceMapping", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Mapping.NonLinear") }, - { "IdentityMultiMapping", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Mapping.Linear") }, - { "SquareMapping", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Mapping.NonLinear") }, - { "SquareDistanceMapping", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Mapping.NonLinear") }, - { "SubsetMultiMapping", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Mapping.Linear") }, - { "TubularMapping", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Mapping.Linear") }, - { "VoidMapping", Moved("v22.06", "SofaMiscMapping", "Sofa.Component.Mapping.Linear") }, + { "BeamLinearMapping", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Mapping.Linear) }, + { "CenterOfMassMapping", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Mapping.Linear) }, + { "CenterOfMassMulti2Mapping", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Mapping.Linear) }, + { "CenterOfMassMultiMapping", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Mapping.Linear) }, + { "DeformableOnRigidFrameMapping", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Mapping.Linear) }, + { "DistanceFromTargetMapping", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Mapping.NonLinear) }, + { "DistanceMapping", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Mapping.NonLinear) }, + { "IdentityMultiMapping", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Mapping.Linear) }, + { "SquareMapping", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Mapping.NonLinear) }, + { "SquareDistanceMapping", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Mapping.NonLinear) }, + { "SubsetMultiMapping", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Mapping.Linear) }, + { "TubularMapping", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Mapping.Linear) }, + { "VoidMapping", Moved("v22.06", "SofaMiscMapping", Sofa.Component.Mapping.Linear) }, // SofaConstraint was deprecated in #2635, #2790, #2796, #2813 and ... - { "BilateralInteractionConstraint", Moved("v22.06", "SofaConstraint", "Sofa.Component.Constraint.Lagrangian.Model") }, - { "GenericConstraintCorrection", Moved("v22.06", "SofaConstraint", "Sofa.Component.Constraint.Lagrangian.Correction") }, - { "GenericConstraintSolver", Moved("v22.06", "SofaConstraint", "Sofa.Component.Constraint.Lagrangian.Solver") }, - { "LCPConstraintSolver", Moved("v22.06", "SofaConstraint", "Sofa.Component.Constraint.Lagrangian.Solver") }, - { "LinearSolverConstraintCorrection", Moved("v22.06", "SofaConstraint", "Sofa.Component.Constraint.Lagrangian.Correction") }, - { "PrecomputedConstraintCorrection", Moved("v22.06", "SofaConstraint", "Sofa.Component.Constraint.Lagrangian.Correction") }, - { "SlidingConstraint", Moved("v22.06", "SofaConstraint", "Sofa.Component.Constraint.Lagrangian.Model") }, - { "StopperConstraint", Moved("v22.06", "SofaConstraint", "Sofa.Component.Constraint.Lagrangian.Model") }, - { "UncoupledConstraintCorrection", Moved("v22.06", "SofaConstraint", "Sofa.Component.Constraint.Lagrangian.Correction") }, - { "UniformConstraint", Moved("v22.06", "SofaConstraint", "Sofa.Component.Constraint.Lagrangian.Model") }, - { "UnilateralInteractionConstraint", Moved("v22.06", "SofaConstraint", "Sofa.Component.Constraint.Lagrangian.Model") }, - { "ConstraintAnimationLoop", Moved("v22.06", "SofaConstraint", "Sofa.Component.AnimationLoop") }, - { "FreeMotionAnimationLoop", Moved("v22.06", "SofaConstraint", "Sofa.Component.AnimationLoop") }, - { "LocalMinDistance", Moved("v22.06", "SofaConstraint", "Sofa.Component.Collision.Detection.Intersection") }, + { "BilateralInteractionConstraint", Moved("v22.06", "SofaConstraint", Sofa.Component.Constraint.Lagrangian.Model) }, + { "GenericConstraintCorrection", Moved("v22.06", "SofaConstraint", Sofa.Component.Constraint.Lagrangian.Correction) }, + { "GenericConstraintSolver", Moved("v22.06", "SofaConstraint", Sofa.Component.Constraint.Lagrangian.Solver) }, + { "LCPConstraintSolver", Moved("v22.06", "SofaConstraint", Sofa.Component.Constraint.Lagrangian.Solver) }, + { "LinearSolverConstraintCorrection", Moved("v22.06", "SofaConstraint", Sofa.Component.Constraint.Lagrangian.Correction) }, + { "PrecomputedConstraintCorrection", Moved("v22.06", "SofaConstraint", Sofa.Component.Constraint.Lagrangian.Correction) }, + { "SlidingConstraint", Moved("v22.06", "SofaConstraint", Sofa.Component.Constraint.Lagrangian.Model) }, + { "StopperConstraint", Moved("v22.06", "SofaConstraint", Sofa.Component.Constraint.Lagrangian.Model) }, + { "UncoupledConstraintCorrection", Moved("v22.06", "SofaConstraint", Sofa.Component.Constraint.Lagrangian.Correction) }, + { "UniformConstraint", Moved("v22.06", "SofaConstraint", Sofa.Component.Constraint.Lagrangian.Model) }, + { "UnilateralInteractionConstraint", Moved("v22.06", "SofaConstraint", Sofa.Component.Constraint.Lagrangian.Model) }, + { "ConstraintAnimationLoop", Moved("v22.06", "SofaConstraint", Sofa.Component.AnimationLoop) }, + { "FreeMotionAnimationLoop", Moved("v22.06", "SofaConstraint", Sofa.Component.AnimationLoop) }, + { "LocalMinDistance", Moved("v22.06", "SofaConstraint", Sofa.Component.Collision.Detection.Intersection) }, // SofaGeneralAnimationLoop was deprecated in #2635 and #2796 - { "MultiStepAnimationLoop", Moved("v22.06", "SofaGeneralAnimationLoop", "Sofa.Component.AnimationLoop") }, - { "MultiTagAnimationLoop", Moved("v22.06", "SofaGeneralAnimationLoop", "Sofa.Component.AnimationLoop") }, + { "MultiStepAnimationLoop", Moved("v22.06", "SofaGeneralAnimationLoop", Sofa.Component.AnimationLoop) }, + { "MultiTagAnimationLoop", Moved("v22.06", "SofaGeneralAnimationLoop", Sofa.Component.AnimationLoop) }, // SofaSimpleFem was deprecated in #2759 - { "HexahedronFEMForceField", Moved("v22.06", "SofaSimpleFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, - { "TetrahedronFEMForceField", Moved("v22.06", "SofaSimpleFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, + { "HexahedronFEMForceField", Moved("v22.06", "SofaSimpleFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, + { "TetrahedronFEMForceField", Moved("v22.06", "SofaSimpleFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, // SofaGeneralSimpleFem was deprecated in #2759 - { "BeamFEMForceField", Moved("v22.06", "SofaGeneralSimpleFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, - { "HexahedralFEMForceField", Moved("v22.06", "SofaGeneralSimpleFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, - { "HexahedralFEMForceFieldAndMass", Moved("v22.06", "SofaGeneralSimpleFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, - { "HexahedronFEMForceFieldAndMass", Moved("v22.06", "SofaGeneralSimpleFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, - { "TetrahedralCorotationalFEMForceField", Moved("v22.06", "SofaGeneralSimpleFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, - { "TriangularFEMForceFieldOptim", Moved("v22.06", "SofaGeneralSimpleFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, + { "BeamFEMForceField", Moved("v22.06", "SofaGeneralSimpleFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, + { "HexahedralFEMForceField", Moved("v22.06", "SofaGeneralSimpleFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, + { "HexahedralFEMForceFieldAndMass", Moved("v22.06", "SofaGeneralSimpleFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, + { "HexahedronFEMForceFieldAndMass", Moved("v22.06", "SofaGeneralSimpleFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, + { "TetrahedralCorotationalFEMForceField", Moved("v22.06", "SofaGeneralSimpleFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, + { "TriangularFEMForceFieldOptim", Moved("v22.06", "SofaGeneralSimpleFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, // SofaMiscFem was deprecated in #2759 - { "FastTetrahedralCorotationalForceField", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, - { "StandardTetrahedralFEMForceField", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, - { "TriangleFEMForceField", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, - { "TriangularAnisotropicFEMForceField", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, - { "TriangularFEMForceField", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, - { "QuadBendingFEMForceField", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.Elastic") }, - { "BoyceAndArruda", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.HyperElastic") }, - { "Costa", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.HyperElastic") }, - { "HyperelasticMaterial", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.HyperElastic") }, - { "MooneyRivlin", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.HyperElastic") }, - { "NeoHookean", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.HyperElastic") }, - { "Ogden", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.HyperElastic") }, - { "PlasticMaterial", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.HyperElastic") }, - { "StandardTetrahedralFEMForceField", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.HyperElastic") }, - { "STVenantKirchhoff", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.HyperElastic") }, - { "TetrahedronHyperelasticityFEMForceField", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.HyperElastic") }, - { "VerondaWestman", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.HyperElastic") }, - { "TetrahedralTensorMassForceField", Moved("v22.06", "SofaMiscFem", "Sofa.Component.SolidMechanics.FEM.TensorMass") }, + { "FastTetrahedralCorotationalForceField", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, + { "StandardTetrahedralFEMForceField", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, + { "TriangleFEMForceField", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, + { "TriangularAnisotropicFEMForceField", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, + { "TriangularFEMForceField", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, + { "QuadBendingFEMForceField", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.Elastic) }, + { "BoyceAndArruda", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.HyperElastic) }, + { "Costa", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.HyperElastic) }, + { "HyperelasticMaterial", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.HyperElastic) }, + { "MooneyRivlin", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.HyperElastic) }, + { "NeoHookean", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.HyperElastic) }, + { "Ogden", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.HyperElastic) }, + { "PlasticMaterial", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.HyperElastic) }, + { "StandardTetrahedralFEMForceField", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.HyperElastic) }, + { "STVenantKirchhoff", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.HyperElastic) }, + { "TetrahedronHyperelasticityFEMForceField", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.HyperElastic) }, + { "VerondaWestman", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.FEM.HyperElastic) }, + { "TetrahedralTensorMassForceField", Moved("v22.06", "SofaMiscFem", Sofa.Component.SolidMechanics.TensorMass) }, // SofaDeformable was deprecated in #2759 - { "AngularSpringForceField", Moved("v22.06", "SofaDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "MeshSpringForceField", Moved("v22.06", "SofaDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "RestShapeSpringsForceField", Moved("v22.06", "SofaDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "PolynomialRestShapeSpringsForceField", Moved("v22.06", "SofaDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "SpringForceField", Moved("v22.06", "SofaDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "StiffSpringForceField", Moved("v22.06", "SofaDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "PolynomialSpringsForceField", Moved("v22.06", "SofaDeformable", "Sofa.Component.SolidMechanics.Spring") }, + { "AngularSpringForceField", Moved("v22.06", "SofaDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "MeshSpringForceField", Moved("v22.06", "SofaDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "RestShapeSpringsForceField", Moved("v22.06", "SofaDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "PolynomialRestShapeSpringsForceField", Moved("v22.06", "SofaDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "SpringForceField", Moved("v22.06", "SofaDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "StiffSpringForceField", Moved("v22.06", "SofaDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "PolynomialSpringsForceField", Moved("v22.06", "SofaDeformable", Sofa.Component.SolidMechanics.Spring) }, // SofaGeneralDeformable was deprecated in #2759 - { "FastTriangularBendingSprings", Moved("v22.06", "SofaGeneralDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "FrameSpringForceField", Moved("v22.06", "SofaGeneralDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "QuadBendingSprings", Moved("v22.06", "SofaGeneralDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "QuadularBendingSprings", Moved("v22.06", "SofaGeneralDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "RegularGridSpringForceField", Moved("v22.06", "SofaGeneralDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "TriangleBendingSprings", Moved("v22.06", "SofaGeneralDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "TriangularBendingSprings", Moved("v22.06", "SofaGeneralDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "TriangleBendingSprings", Moved("v22.06", "SofaGeneralDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "TriangularBiquadraticSpringsForceField", Moved("v22.06", "SofaGeneralDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "TriangularQuadraticSpringsForceField", Moved("v22.06", "SofaGeneralDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "VectorSpringForceField", Moved("v22.06", "SofaGeneralDeformable", "Sofa.Component.SolidMechanics.Spring") }, - { "TriangularTensorMassForceField", Moved("v22.06", "SofaGeneralDeformable", "Sofa.Component.SolidMechanics.TensorMass") }, + { "FastTriangularBendingSprings", Moved("v22.06", "SofaGeneralDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "FrameSpringForceField", Moved("v22.06", "SofaGeneralDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "QuadBendingSprings", Moved("v22.06", "SofaGeneralDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "QuadularBendingSprings", Moved("v22.06", "SofaGeneralDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "RegularGridSpringForceField", Moved("v22.06", "SofaGeneralDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "TriangleBendingSprings", Moved("v22.06", "SofaGeneralDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "TriangularBendingSprings", Moved("v22.06", "SofaGeneralDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "TriangleBendingSprings", Moved("v22.06", "SofaGeneralDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "TriangularBiquadraticSpringsForceField", Moved("v22.06", "SofaGeneralDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "TriangularQuadraticSpringsForceField", Moved("v22.06", "SofaGeneralDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "VectorSpringForceField", Moved("v22.06", "SofaGeneralDeformable", Sofa.Component.SolidMechanics.Spring) }, + { "TriangularTensorMassForceField", Moved("v22.06", "SofaGeneralDeformable", Sofa.Component.SolidMechanics.TensorMass) }, // SofaGeneralObjectInteraction was deprecated in #2759 and #3039 - { "RepulsiveSpringForceField", Moved("v22.06", "SofaGeneralObjectInteraction", "Sofa.Component.SolidMechanics.Spring") }, - { "InteractionEllipsoidForceField", Moved("v22.06", "SofaGeneralObjectInteraction", "Sofa.Component.MechanicalLoad") }, + { "RepulsiveSpringForceField", Moved("v22.06", "SofaGeneralObjectInteraction", Sofa.Component.SolidMechanics.Spring) }, + { "InteractionEllipsoidForceField", Moved("v22.06", "SofaGeneralObjectInteraction", Sofa.Component.MechanicalLoad) }, // SofaGeneralObjectInteraction was deprecated in #2790 and ... - { "AttachConstraint", Moved("v22.06", "SofaGeneralObjectInteraction", "Sofa.Component.Constraint.Projective") }, + { "AttachConstraint", Moved("v22.06", "SofaGeneralObjectInteraction", Sofa.Component.Constraint.Projective) }, // SofaBoundaryCondition was deprecated in #2790 and #2759 - { "AffineMovementConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "FixedConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "FixedPlaneConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "FixedRotationConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "FixedTranslationConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "HermiteSplineConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "LinearMovementConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "LinearVelocityConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "OscillatorConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "ParabolicConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "PartialFixedConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "PartialLinearMovementConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "PatchTestMovementConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "PointConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "PositionBasedDynamicsConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "ProjectDirectionConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "ProjectToLineConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "ProjectToPlaneConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "ProjectToPointConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "AttachConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "SkeletalMotionConstraint", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.Constraint.Projective") }, - { "ConicalForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "ConstantForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "DiagonalVelocityDampingForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "EdgePressureForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "EllipsoidForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "LinearForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "OscillatingTorsionPressureForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "PlaneForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "QuadPressureForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "SphereForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "SurfacePressureForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "TaitSurfacePressureForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "TorsionForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "TrianglePressureForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, - { "UniformVelocityDampingForceField", Moved("v22.06", "SofaBoundaryCondition", "Sofa.Component.MechanicalLoad") }, + { "AffineMovementConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "FixedConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "FixedPlaneConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "FixedRotationConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "FixedTranslationConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "HermiteSplineConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "LinearMovementConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "LinearVelocityConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "OscillatorConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "ParabolicConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "PartialFixedConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "PartialLinearMovementConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "PatchTestMovementConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "PointConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "PositionBasedDynamicsConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "ProjectDirectionConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "ProjectToLineConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "ProjectToPlaneConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "ProjectToPointConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "AttachConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "SkeletalMotionConstraint", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.Constraint.Projective) }, + { "ConicalForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "ConstantForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "DiagonalVelocityDampingForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "EdgePressureForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "EllipsoidForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "LinearForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "OscillatingTorsionPressureForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "PlaneForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "QuadPressureForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "SphereForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "SurfacePressureForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "TaitSurfacePressureForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "TorsionForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "TrianglePressureForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, + { "UniformVelocityDampingForceField", Moved("v22.06", "SofaBoundaryCondition", Sofa.Component.MechanicalLoad) }, // SofaBaseCollision was deprecated in #2813 - { "BruteForceBroadPhase", Moved("v22.06", "SofaBaseCollision", "Sofa.Component.Collision.Detection.Algorithm") }, - { "BruteForceDetection", Moved("v22.06", "SofaBaseCollision", "Sofa.Component.Collision.Detection.Algorithm") }, - { "BVHNarrowPhase", Moved("v22.06", "SofaBaseCollision", "Sofa.Component.Collision.Detection.Algorithm") }, - { "DefaultPipeline", Moved("v22.06", "SofaBaseCollision", "Sofa.Component.Collision.Detection.Algorithm") }, - { "DiscreteIntersection", Moved("v22.06", "SofaBaseCollision", "Sofa.Component.Collision.Detection.Intersection") }, - { "MinProximityIntersection", Moved("v22.06", "SofaBaseCollision", "Sofa.Component.Collision.Detection.Intersection") }, - { "NewProximityIntersection", Moved("v22.06", "SofaBaseCollision", "Sofa.Component.Collision.Detection.Intersection") }, - { "CubeCollisionModel", Moved("v22.06", "SofaBaseCollision", "Sofa.Component.Collision.Geometry") }, - { "SphereCollisionModel", Moved("v22.06", "SofaBaseCollision", "Sofa.Component.Collision.Geometry") }, - { "CylinderCollisionModel", Moved("v22.06", "SofaBaseCollision", "Sofa.Component.Collision.Geometry") }, - { "DefaultContactManager", Moved("v22.06", "SofaBaseCollision", "Sofa.Component.Collision.Response.Contact") }, - { "ContactListener", Moved("v22.06", "SofaBaseCollision", "Sofa.Component.Collision.Response.Contact") }, + { "BruteForceBroadPhase", Moved("v22.06", "SofaBaseCollision", Sofa.Component.Collision.Detection.Algorithm) }, + { "BruteForceDetection", Moved("v22.06", "SofaBaseCollision", Sofa.Component.Collision.Detection.Algorithm) }, + { "BVHNarrowPhase", Moved("v22.06", "SofaBaseCollision", Sofa.Component.Collision.Detection.Algorithm) }, + { "DefaultPipeline", Moved("v22.06", "SofaBaseCollision", Sofa.Component.Collision.Detection.Algorithm) }, + { "DiscreteIntersection", Moved("v22.06", "SofaBaseCollision", Sofa.Component.Collision.Detection.Intersection) }, + { "MinProximityIntersection", Moved("v22.06", "SofaBaseCollision", Sofa.Component.Collision.Detection.Intersection) }, + { "NewProximityIntersection", Moved("v22.06", "SofaBaseCollision", Sofa.Component.Collision.Detection.Intersection) }, + { "CubeCollisionModel", Moved("v22.06", "SofaBaseCollision", Sofa.Component.Collision.Geometry) }, + { "SphereCollisionModel", Moved("v22.06", "SofaBaseCollision", Sofa.Component.Collision.Geometry) }, + { "CylinderCollisionModel", Moved("v22.06", "SofaBaseCollision", Sofa.Component.Collision.Geometry) }, + { "DefaultContactManager", Moved("v22.06", "SofaBaseCollision", Sofa.Component.Collision.Response.Contact) }, + { "ContactListener", Moved("v22.06", "SofaBaseCollision", Sofa.Component.Collision.Response.Contact) }, // SofaMeshCollision was deprecated in #2813 - { "PointCollisionModel", Moved("v22.06", "SofaMeshCollision", "Sofa.Component.Collision.Geometry") }, - { "LineCollisionModel", Moved("v22.06", "SofaMeshCollision", "Sofa.Component.Collision.Geometry") }, - { "TriangleCollisionModel", Moved("v22.06", "SofaMeshCollision", "Sofa.Component.Collision.Geometry") }, + { "PointCollisionModel", Moved("v22.06", "SofaMeshCollision", Sofa.Component.Collision.Geometry) }, + { "LineCollisionModel", Moved("v22.06", "SofaMeshCollision", Sofa.Component.Collision.Geometry) }, + { "TriangleCollisionModel", Moved("v22.06", "SofaMeshCollision", Sofa.Component.Collision.Geometry) }, // SofaGeneralMeshCollision was deprecated in #2813 - { "DirectSAP", Moved("v22.06", "SofaGeneralMeshCollision", "Sofa.Component.Collision.Detection.Algorithm") }, - { "DirectSAPNarrowPhase", Moved("v22.06", "SofaGeneralMeshCollision", "Sofa.Component.Collision.Detection.Algorithm") }, - { "IncrSAPClassSofaVector", Moved("v22.06", "SofaGeneralMeshCollision", "Sofa.Component.Collision.Detection.Algorithm") }, - { "RayTraceNarrowPhase", Moved("v22.06", "SofaGeneralMeshCollision", "Sofa.Component.Collision.Detection.Algorithm") }, - { "RayTraceDetection", Moved("v22.06", "SofaGeneralMeshCollision", "Sofa.Component.Collision.Detection.Algorithm") }, - { "TriangleOctreeModel", Moved("v22.06", "SofaGeneralMeshCollision", "Sofa.Component.Collision.Geometry") }, + { "DirectSAP", Moved("v22.06", "SofaGeneralMeshCollision", Sofa.Component.Collision.Detection.Algorithm) }, + { "DirectSAPNarrowPhase", Moved("v22.06", "SofaGeneralMeshCollision", Sofa.Component.Collision.Detection.Algorithm) }, + { "IncrSAPClassSofaVector", Moved("v22.06", "SofaGeneralMeshCollision", Sofa.Component.Collision.Detection.Algorithm) }, + { "RayTraceNarrowPhase", Moved("v22.06", "SofaGeneralMeshCollision", Sofa.Component.Collision.Detection.Algorithm) }, + { "RayTraceDetection", Moved("v22.06", "SofaGeneralMeshCollision", Sofa.Component.Collision.Detection.Algorithm) }, + { "TriangleOctreeModel", Moved("v22.06", "SofaGeneralMeshCollision", Sofa.Component.Collision.Geometry) }, // SofaUserInteraction was deprecated in #2813 - { "RayCollisionModel", Moved("v22.06", "SofaUserInteraction", "Sofa.Component.Collision.Geometry") }, - { "Controller", Moved("v22.06", "SofaUserInteraction", "Sofa.Component.Controller") }, - { "MechanicalStateController", Moved("v22.06", "SofaUserInteraction", "Sofa.Component.Controller") }, + { "RayCollisionModel", Moved("v22.06", "SofaUserInteraction", Sofa.Component.Collision.Geometry) }, + { "Controller", Moved("v22.06", "SofaUserInteraction", Sofa.Component.Controller) }, + { "MechanicalStateController", Moved("v22.06", "SofaUserInteraction", Sofa.Component.Controller) }, // SofaObjectInteraction was deprecated in #2813 - { "PenalityContactForceField", Moved("v22.06", "SofaObjectInteraction", "Sofa.Component.Collision.Response.Contact") }, + { "PenalityContactForceField", Moved("v22.06", "SofaObjectInteraction", Sofa.Component.Collision.Response.Contact) }, // SofaEngine was deprecated in #2812 - { "BoxROI", Moved("v22.06", "SofaEngine", "Sofa.Component.Engine.Select") }, + { "BoxROI", Moved("v22.06", "SofaEngine", Sofa.Component.Engine.Select) }, // SofaGeneralEngine was deprecated in #2812 - { "AverageCoord", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Analyze") }, - { "BoxROI", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "ClusteringEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Analyze") }, - { "ComplementaryROI", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "DifferenceEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "DilateEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "DisplacementTransformEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "ExtrudeEdgesAndGenerateQuads", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "ExtrudeQuadsAndGenerateHexas", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "ExtrudeSurface", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "GenerateCylinder", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "GenerateGrid", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "GenerateRigidMass", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "GenerateSphere", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "GroupFilterYoungModulus", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "HausdorffDistance", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Analyze") }, - { "IndexValueMapper", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "Indices2ValuesMapper", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "IndicesFromValues", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "InvertTransformMatrixEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "JoinPoints", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "MapIndices", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "MathOp", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "MergeMeshes", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "MergePoints", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "MergeROIs", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "MergeSets", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "MergeVectors", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "MeshBarycentricMapperEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "MeshBoundaryROI", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "MeshClosingEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "MeshROI", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "MeshSampler", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "MeshSplittingEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "MeshSubsetEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "NearestPointROI", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "NormEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "NormalsFromPoints", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "PairBoxROI", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "PlaneROI", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "PointsFromIndices", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "ProximityROI", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "QuatToRigidEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "ROIValueMapper", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "RandomPointDistributionInSurface", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "RigidToQuatEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "RotateTransformMatrixEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "ScaleTransformMatrixEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "SelectConnectedLabelsROI", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "SelectLabelROI", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "ShapeMatching", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Analyze") }, - { "SmoothMeshEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "SphereROI", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "Spiral", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Generate") }, - { "SubsetTopology", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "SumEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Analyze") }, - { "TransformEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "TransformPosition", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "TranslateTransformMatrixEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "ValuesFromIndices", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "ValuesFromPositions", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Select") }, - { "Vertex2Frame", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, + { "AverageCoord", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Analyze) }, + { "BoxROI", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "ClusteringEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Analyze) }, + { "ComplementaryROI", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "DifferenceEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "DilateEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "DisplacementTransformEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "ExtrudeEdgesAndGenerateQuads", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "ExtrudeQuadsAndGenerateHexas", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "ExtrudeSurface", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "GenerateCylinder", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "GenerateGrid", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "GenerateRigidMass", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "GenerateSphere", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "GroupFilterYoungModulus", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "HausdorffDistance", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Analyze) }, + { "IndexValueMapper", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "Indices2ValuesMapper", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "IndicesFromValues", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "InvertTransformMatrixEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "JoinPoints", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "MapIndices", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "MathOp", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "MergeMeshes", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "MergePoints", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "MergeROIs", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "MergeSets", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "MergeVectors", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "MeshBarycentricMapperEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "MeshBoundaryROI", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "MeshClosingEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "MeshROI", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "MeshSampler", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "MeshSplittingEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "MeshSubsetEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "NearestPointROI", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "NormEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "NormalsFromPoints", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "PairBoxROI", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "PlaneROI", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "PointsFromIndices", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "ProximityROI", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "QuatToRigidEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "ROIValueMapper", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "RandomPointDistributionInSurface", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "RigidToQuatEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "RotateTransformMatrixEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "ScaleTransformMatrixEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "SelectConnectedLabelsROI", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "SelectLabelROI", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "ShapeMatching", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Analyze) }, + { "SmoothMeshEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "SphereROI", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "Spiral", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Generate) }, + { "SubsetTopology", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "SumEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Analyze) }, + { "TransformEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "TransformPosition", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "TranslateTransformMatrixEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "ValuesFromIndices", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "ValuesFromPositions", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Select) }, + { "Vertex2Frame", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, // SofaMiscEngine was deprecated in #2812 - { "Distances", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Analyze") }, - { "DisplacementMatrixEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, - { "ProjectiveTransformEngine", Moved("v22.06", "SofaGeneralEngine", "Sofa.Component.Engine.Transform") }, + { "Distances", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Analyze) }, + { "DisplacementMatrixEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, + { "ProjectiveTransformEngine", Moved("v22.06", "SofaGeneralEngine", Sofa.Component.Engine.Transform) }, // SofaMiscExtra was deprecated in #2917 - { "MeshTetraStuffing", Moved("v22.06", "SofaMiscExtra", "Sofa.Component.Engine.Generate") }, + { "MeshTetraStuffing", Moved("v22.06", "SofaMiscExtra", Sofa.Component.Engine.Generate) }, // SofaMiscCollision was deprecated in #2813 and #2820 { "OBBModel", Moved("v22.06", "SofaMiscCollision", "CollisionOBBCapsule") }, { "RigidCapsuleCollisionModel", Moved("v22.06", "SofaMiscCollision", "CollisionOBBCapsule") }, { "CapsuleCollisionModel", Moved("v22.06", "SofaMiscCollision", "CollisionOBBCapsule") }, - { "TriangleModelInRegularGrid", Moved("v22.06", "SofaMiscCollision", "Sofa.Component.Collision.Geometry") }, - { "TetrahedronCollisionModel", Moved("v22.06", "SofaMiscCollision", "Sofa.Component.Collision.Geometry") }, - { "RuleBasedContactManager", Moved("v22.06", "SofaMiscCollision", "Sofa.Component.Collision.Response.Contact") }, + { "TriangleModelInRegularGrid", Moved("v22.06", "SofaMiscCollision", Sofa.Component.Collision.Geometry) }, + { "TetrahedronCollisionModel", Moved("v22.06", "SofaMiscCollision", Sofa.Component.Collision.Geometry) }, + { "RuleBasedContactManager", Moved("v22.06", "SofaMiscCollision", Sofa.Component.Collision.Response.Contact) }, // SofaHaptics was deprecated in #3039 - { "ForceFeedback", Moved("v22.06", "SofaHaptics", "Sofa.Component.Haptics") }, - { "LCPForceFeedback", Moved("v22.06", "SofaHaptics", "Sofa.Component.Haptics") }, - { "MechanicalStateForceFeedback", Moved("v22.06", "SofaHaptics", "Sofa.Component.Haptics") }, - { "NullForceFeedback", Moved("v22.06", "SofaHaptics", "Sofa.Component.Haptics") }, + { "ForceFeedback", Moved("v22.06", "SofaHaptics", Sofa.Component.Haptics) }, + { "LCPForceFeedback", Moved("v22.06", "SofaHaptics", Sofa.Component.Haptics) }, + { "MechanicalStateForceFeedback", Moved("v22.06", "SofaHaptics", Sofa.Component.Haptics) }, + { "NullForceFeedback", Moved("v22.06", "SofaHaptics", Sofa.Component.Haptics) }, // SofaValidation was deprecated in #3039 - { "CompareState", Moved("v22.06", "SofaValidation", "Sofa.Component.Playback") }, - { "CompareTopology", Moved("v22.06", "SofaValidation", "Sofa.Component.Playback") }, + { "CompareState", Moved("v22.06", "SofaValidation", Sofa.Component.Playback) }, + { "CompareTopology", Moved("v22.06", "SofaValidation", Sofa.Component.Playback) }, // Removed in #4040, deprecated in #2777 { "MechanicalMatrixMapper", Removed("v23.06", "v23.12") }, { "MappingGeometricStiffnessForceField", Removed("v23.06", "v23.12") }, // Moved to CSparseSolvers - { "SparseCholeskySolver", Moved("v23.12", "Sofa.Component.LinearSolver.Direct", "CSparseSolvers") }, - { "SparseLUSolver", Moved("v23.12", "Sofa.Component.LinearSolver.Direct", "CSparseSolvers") }, + { "SparseCholeskySolver", Moved("v23.12", Sofa.Component.LinearSolver.Direct, "CSparseSolvers") }, + { "SparseLUSolver", Moved("v23.12", Sofa.Component.LinearSolver.Direct, "CSparseSolvers") }, // Moved to Sofa.Component.MechanicalLoad - { "Gravity", Moved("v24.12", "SofaGraphComponent", "Sofa.Component.Mechanicalload") }, + { "Gravity", Moved("v24.12", "SofaGraphComponent", Sofa.Component.MechanicalLoad) }, { "OglCylinderModel", Moved("v24.12", "Sofa.GL.Component.Rendering3D", "Sofa.Component.Visual")} }; diff --git a/Sofa/framework/SimpleApi/test/SimpleApi_test.cpp b/Sofa/framework/SimpleApi/test/SimpleApi_test.cpp index f9c26dfccd7..2ce3a2cbb08 100644 --- a/Sofa/framework/SimpleApi/test/SimpleApi_test.cpp +++ b/Sofa/framework/SimpleApi/test/SimpleApi_test.cpp @@ -38,7 +38,7 @@ bool SimpleApi_test::testParamAPI() const Simulation::SPtr simu = createSimulation("DAG") ; const Node::SPtr root = createRootNode(simu, "root") ; - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); const auto meca1 = createObject(root, "MechanicalObject", { {"name", "aMechanicalObject1"}, @@ -62,7 +62,7 @@ bool SimpleApi_test::testParamString() const Simulation::SPtr simu = createSimulation("DAG") ; const Node::SPtr root = createRootNode(simu, "root") ; - simpleapi::importPlugin("Sofa.Component.StateContainer"); + simpleapi::importPlugin(Sofa.Component.StateContainer); const auto meca1 = createObject(root, "MechanicalObject", { {"name", "aMechanicalObject1"}, diff --git a/Sofa/framework/Simulation/Core/simutest/NodeContext_test.cpp b/Sofa/framework/Simulation/Core/simutest/NodeContext_test.cpp index 188d5daa5cd..0ee595d2963 100644 --- a/Sofa/framework/Simulation/Core/simutest/NodeContext_test.cpp +++ b/Sofa/framework/Simulation/Core/simutest/NodeContext_test.cpp @@ -41,8 +41,8 @@ class NodeContext_test: public BaseSimulationTest NodeContext_test() { - sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); - sofa::simpleapi::importPlugin("Sofa.Component.SceneUtility"); + sofa::simpleapi::importPlugin(Sofa.Component.StateContainer); + sofa::simpleapi::importPlugin(Sofa.Component.SceneUtility); } void testGetNodeObjects() diff --git a/Sofa/framework/Testing/src/sofa/testing/BaseTest.h b/Sofa/framework/Testing/src/sofa/testing/BaseTest.h index c42cdedfb0e..feb60096065 100644 --- a/Sofa/framework/Testing/src/sofa/testing/BaseTest.h +++ b/Sofa/framework/Testing/src/sofa/testing/BaseTest.h @@ -23,6 +23,7 @@ #include #include +#include #include #include diff --git a/applications/plugins/MultiThreading/test/ParallelImplementationsRegistry_test.cpp b/applications/plugins/MultiThreading/test/ParallelImplementationsRegistry_test.cpp index 8ecd3f7e407..6bb03c78cdf 100644 --- a/applications/plugins/MultiThreading/test/ParallelImplementationsRegistry_test.cpp +++ b/applications/plugins/MultiThreading/test/ParallelImplementationsRegistry_test.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include @@ -32,10 +33,10 @@ namespace multithreading TEST(ParallelImplementationsRegistry, existInObjectFactory) { // sequential versions will be added to the ObjectFactory - sofa::simpleapi::importPlugin("Sofa.Component.LinearSolver.Iterative"); - sofa::simpleapi::importPlugin("Sofa.Component.Collision.Detection.Algorithm"); - sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.FEM.Elastic"); - sofa::simpleapi::importPlugin("Sofa.Component.Mapping.Linear"); + sofa::simpleapi::importPlugin(Sofa.Component.LinearSolver.Iterative); + sofa::simpleapi::importPlugin(Sofa.Component.Collision.Detection.Algorithm); + sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.FEM.Elastic); + sofa::simpleapi::importPlugin(Sofa.Component.Mapping.Linear); sofa::simpleapi::importPlugin("MultiThreading"); const auto implementations = ParallelImplementationsRegistry::getImplementations(); diff --git a/applications/plugins/SceneCreator/SceneCreator_test/SceneCreator_test.cpp b/applications/plugins/SceneCreator/SceneCreator_test/SceneCreator_test.cpp index 4168eec9f92..cc97a19ab38 100644 --- a/applications/plugins/SceneCreator/SceneCreator_test/SceneCreator_test.cpp +++ b/applications/plugins/SceneCreator/SceneCreator_test/SceneCreator_test.cpp @@ -60,8 +60,8 @@ class SceneCreator_test : public BaseSimulationTest public: void SetUp() override { - sofa::simpleapi::importPlugin("Sofa.Component"); - sofa::simpleapi::importPlugin("Sofa.GL.Component.Rendering3D"); + sofa::simpleapi::importPlugin(Sofa.Component); + sofa::simpleapi::importPlugin(Sofa.GL.Component.Rendering3D); } bool createCubeFailed(); diff --git a/applications/plugins/SceneCreator/src/SceneCreator/SceneCreator.cpp b/applications/plugins/SceneCreator/src/SceneCreator/SceneCreator.cpp index e1519db54d7..943f28fbb1c 100644 --- a/applications/plugins/SceneCreator/src/SceneCreator/SceneCreator.cpp +++ b/applications/plugins/SceneCreator/src/SceneCreator/SceneCreator.cpp @@ -21,6 +21,7 @@ ******************************************************************************/ #include "SceneCreator.h" #include +#include #include #include @@ -87,15 +88,15 @@ Node::SPtr createEulerSolverNode(Node::SPtr parent, const std::string& name, co if (scheme == "Explicit") { - simpleapi::createObject(parent, "RequiredPlugin", {{"name", "Sofa.Component.ODESolver.Forward"}}); + simpleapi::createObject(parent, "RequiredPlugin", {{"name", Sofa.Component.ODESolver.Forward}}); simpleapi::createObject(node, "EulerExplicitSolver", {{"name","Euler Explicit"}}); return node ; } if (scheme == "Implicit") { - simpleapi::createObject(parent, "RequiredPlugin", {{"name", "Sofa.Component.ODESolver.Backward"}}); - simpleapi::createObject(parent, "RequiredPlugin", {{"name", "Sofa.Component.LinearSolver.Iterative"}}); + simpleapi::createObject(parent, "RequiredPlugin", {{"name", Sofa.Component.ODESolver.Backward}}); + simpleapi::createObject(parent, "RequiredPlugin", {{"name", Sofa.Component.LinearSolver.Iterative}}); simpleapi::createObject(node, "EulerImplicitSolver", {{"name","Euler Implicit"}, {"rayleighStiffness","0.01"}, {"rayleighMass", "1.0"}}) ; @@ -109,8 +110,8 @@ Node::SPtr createEulerSolverNode(Node::SPtr parent, const std::string& name, co if (scheme == "Implicit_SparseLDL") { - simpleapi::createObject(parent, "RequiredPlugin", {{"name", "Sofa.Component.ODESolver.Backward"}}); - simpleapi::createObject(parent, "RequiredPlugin", {{"name", "Sofa.Component.LinearSolver.Direct"}}); + simpleapi::createObject(parent, "RequiredPlugin", {{"name", Sofa.Component.ODESolver.Backward}}); + simpleapi::createObject(parent, "RequiredPlugin", {{"name", Sofa.Component.LinearSolver.Direct}}); simpleapi::createObject(node, "EulerImplicitSolver", {{"name","Euler Implicit"}, {"rayleighStiffness","0.01"}, {"rayleighMass", "1.0"}}) ; diff --git a/applications/projects/SceneChecking/tests/SceneChecker_test.cpp b/applications/projects/SceneChecking/tests/SceneChecker_test.cpp index 2ccaba88ecb..2d6111bf964 100644 --- a/applications/projects/SceneChecking/tests/SceneChecker_test.cpp +++ b/applications/projects/SceneChecking/tests/SceneChecker_test.cpp @@ -82,7 +82,7 @@ struct SceneChecker_test : public BaseSimulationTest void checkRequiredPlugin(bool missing) { - sofa::simpleapi::importPlugin("Sofa.Component.ODESolver.Forward"); + sofa::simpleapi::importPlugin(Sofa.Component.ODESolver.Forward); const std::string missStr = missing ? "" : " \n"; std::stringstream scene;