[IO] Apply new factory registration mechanism

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BlenderExporter.cpp

@@ -22,13 +22,16 @@
 #include <sofa/component/io/mesh/BlenderExporter.inl>
 #include <sofa/core/ObjectFactory.h>
 
-namespace sofa::component::_blenderexporter_
+namespace sofa::component::io::mesh
 {
+
 using namespace defaulttype;
 
-int BlenderExportClass = core::RegisterObject("Export the simulation result as blender point cache files")
+void registerBlenderExporter(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Export the simulation result as blender point cache files.")
         .add< BlenderExporter<Vec3dTypes> >()
-        .add< BlenderExporter<Rigid3Types> >()
-        ;
+        .add< BlenderExporter<Rigid3Types> >());
+}
 
-} // sofa::component::_blenderexporter_
+} // namespace sofa::component::io::mesh

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BlenderExporter.h

@@ -133,9 +133,11 @@ class SOFA_COMPONENT_IO_MESH_API BlenderExporter: public core::objectmodel::Base
 
 } // namespace _blenderexporter_
 
-namespace exporter {
+namespace io::mesh 
+{
     template<class T>
     using BlenderExporter = _blenderexporter_::BlenderExporter<T>;
-} // namespace exporter
+
+} // namespace io::mesh 
 
 } // namespace sofa::component

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/GIDMeshLoader.cpp

@@ -31,8 +31,11 @@ using namespace sofa::helper;
 namespace sofa::component::io::mesh
 {
 
-int GIDMeshLoaderClass = core::RegisterObject("Loads volumetric meshes generated by GID. Some element types are not implemented.")
-        .add< GIDMeshLoader >();
+void registerGIDMeshLoader(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Load volumetric meshes generated by GID. Some element types are not implemented.")
+        .add< GIDMeshLoader >());
+}
 
 GIDMeshLoader::GIDMeshLoader() :
     MeshLoader()

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/GridMeshCreator.cpp

@@ -32,11 +32,11 @@ using namespace sofa::helper;
 using namespace sofa::core::loader;
 using type::vector;
 
-int GridMeshCreatorClass = core::RegisterObject("Procedural creation of a two-dimensional mesh.")
-        .add< GridMeshCreator >()
-        ;
-
-
+void registerGridMeshCreator(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Procedural creation of a two-dimensional mesh.")
+        .add< GridMeshCreator >());
+}
 
 GridMeshCreator::GridMeshCreator(): MeshLoader()
     , d_resolution(initData(&d_resolution, Vec2i(2, 2), "resolution", "Number of vertices in each direction"))

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshExporter.cpp

@@ -36,17 +36,6 @@ using sofa::core::objectmodel::ComponentState ;
 namespace sofa::component::_meshexporter_
 {
 
-int MeshExporterClass = core::RegisterObject("Export topology and positions into file. " msgendl
-                                             "Supported format are: " msgendl
-                                             "- vtkxml" msgendl
-                                             "- vtk" msgendl
-                                             "- netgen" msgendl
-                                             "- teten" msgendl
-                                             "- gmsh" msgendl
-                                             "- obj" msgendl)
-
-        .add< MeshExporter >();
-
 MeshExporter::MeshExporter()
     : d_fileFormat( initData(&d_fileFormat, {"ALL","vtkxml","vtk","netgen","tetgen","gmsh","obj"}, "format", "File format to use"))
     , d_position( initData(&d_position, "position", "points position (will use points from topology or mechanical state if this is empty)"))
@@ -889,3 +878,20 @@ void MeshExporter::handleEvent(sofa::core::objectmodel::Event *event)
 }
 
 } // namespace sofa::component::_meshexporter_
+
+namespace sofa::component::io::mesh
+{
+    void registerMeshExporter(sofa::core::ObjectFactory* factory)
+    {
+        factory->registerObjects(core::ObjectRegistrationData("Export topology and positions into file. " msgendl
+            "Supported format are: " msgendl
+            "- vtkxml" msgendl
+            "- vtk" msgendl
+            "- netgen" msgendl
+            "- teten" msgendl
+            "- gmsh" msgendl
+            "- obj" msgendl)
+            .add< MeshExporter >());
+    }
+
+} // namespace sofa::component::io::mesh

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshGmshLoader.cpp

@@ -37,9 +37,11 @@ using namespace sofa::helper;
 using std::string;
 using std::stringstream;
 
-int MeshGmshLoaderClass = core::RegisterObject("Specific mesh loader for Gmsh file format.")
-        .add< MeshGmshLoader >()
-        ;
+void registerMeshGmshLoader(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Specific mesh loader for Gmsh file format.")
+        .add< MeshGmshLoader >());
+}
 
 bool MeshGmshLoader::doLoad()
 {

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshOBJLoader.cpp

@@ -35,9 +35,11 @@ using namespace sofa::defaulttype;
 using namespace sofa::core::loader;
 using sofa::helper::getWriteOnlyAccessor;
 
-int MeshOBJLoaderClass = core::RegisterObject("Specific mesh loader for OBJ file format.")
-.add< MeshOBJLoader >()
-.addAlias("MeshObjLoader");
+void registerMeshOBJLoader(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Specific mesh loader for OBJ file format.")
+        .add< MeshOBJLoader >());
+}
 
 MeshOBJLoader::MeshOBJLoader()
     : MeshLoader()

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshOffLoader.cpp

@@ -31,9 +31,11 @@ using namespace sofa::type;
 using namespace sofa::defaulttype;
 using namespace sofa::helper;
 
-int MeshOffLoaderClass = core::RegisterObject("Specific mesh loader for Off file format.")
-        .add< MeshOffLoader >()
-        ;
+void registerMeshOffLoader(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Specific mesh loader for Off file format.")
+        .add< MeshOffLoader >());
+}
 
 bool MeshOffLoader::doLoad()
 {

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshSTLLoader.cpp

@@ -38,8 +38,11 @@ using sofa::helper::getWriteOnlyAccessor;
 using namespace sofa::type;
 using namespace sofa::defaulttype;
 
-static int MeshSTLLoaderClass = core::RegisterObject("Loader for the STL file format. STL can be used to represent the surface of object using with a triangulation.")
-        .add< MeshSTLLoader >();
+void registerMeshSTLLoader(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Loader for the STL file format. STL can be used to represent the surface of object using with a triangulation.")
+        .add< MeshSTLLoader >());
+}
 
 //Base VTK Loader
 MeshSTLLoader::MeshSTLLoader() : MeshLoader()

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshTrianLoader.cpp

@@ -34,9 +34,11 @@ namespace sofa::component::io::mesh
 using namespace sofa::type;
 using namespace sofa::defaulttype;
 
-int MeshTrianLoaderClass = core::RegisterObject("Specific mesh loader for trian (only triangulations) file format.")
-        .add< MeshTrianLoader >()
-        ;
+void registerMeshTrianLoader(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Specific mesh loader for trian (only triangulations) file format.")
+        .add< MeshTrianLoader >());
+}
 
 MeshTrianLoader::MeshTrianLoader() : MeshLoader()
     , d_trian2(initData(&d_trian2, (bool)false, "trian2", "Set to true if the mesh is a trian2 format."))

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshVTKLoader.cpp

@@ -1257,13 +1257,10 @@ bool XMLVTKReader::loadImageData(tinyxml2::XMLHandle datasetFormatHandle)
     return false;
 }
 
-
-//////////////////////////////////////////// REGISTERING TO FACTORY /////////////////////////////////////////
-/// Registering the component
-/// see: https://www.sofa-framework.org/community/doc/programming-with-sofa/components-api/the-objectfactory/
-/// 2-RegisterObject("description") + .add<> : Register the component
-int MeshVTKLoaderClass = core::RegisterObject("Mesh loader for the VTK/VTU file format.")
-        .add< MeshVTKLoader >();
+void registerMeshVTKLoader(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Mesh loader for the VTK/VTU file format.")
+        .add< MeshVTKLoader >());
+}
 
 } /// namespace sofa::component::io::mesh
-

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshXspLoader.cpp

@@ -98,6 +98,10 @@ void MeshXspLoader::doClearBuffers()
     /// Nothing to do if no output is added to the "filename" dataTrackerEngine.
 }
 
-int MeshXspLoaderClass = core::RegisterObject("Specific mesh loader for Xsp file format.")
-        .add< MeshXspLoader >();
+void registerMeshXspLoader(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Specific mesh loader for Xsp file format.")
+        .add< MeshXspLoader >());
+}
+
 } //namespace sofa::component::io::mesh

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/OffSequenceLoader.cpp

@@ -31,11 +31,11 @@
 namespace sofa::component::io::mesh
 {
 
-using namespace sofa::defaulttype;
-
-int OffSequenceLoaderClass = core::RegisterObject("Read and load an .off file at each timestep")
-        .add< OffSequenceLoader >();
-
+void registerOffSequenceLoader(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Read and load an .off file at each timestep.")
+        .add< OffSequenceLoader >());
+}
 
 OffSequenceLoader::OffSequenceLoader()
     : MeshOffLoader()

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/STLExporter.cpp

@@ -39,9 +39,6 @@ using sofa::core::objectmodel::ComponentState ;
 namespace sofa::component::_stlexporter_
 {
 
-int STLExporterClass = core::RegisterObject("Save a topology in file")
-        .add< STLExporter >();
-
 STLExporter::STLExporter()
     : d_binaryFormat( initData(&d_binaryFormat, (bool)true, "binaryformat", "if true, save in binary format, otherwise in ascii"))
     , d_position( initData(&d_position, "position", "points coordinates"))
@@ -323,3 +320,14 @@ void STLExporter::handleEvent(Event *event)
 }
 
 } // namespace sofa::component::_stlexporter_
+
+namespace sofa::component::io::mesh
+{
+
+void registerSTLExporter(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Save a topology in file.")
+        .add< STLExporter >());
+}
+
+} // namespace sofa::component::io::mesh

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/SphereLoader.cpp

@@ -34,8 +34,11 @@ using namespace sofa::type;
 namespace sofa::component::io::mesh
 {
 
-int SphereLoaderClass = core::RegisterObject("Loader for sphere model description files")
-        .add<SphereLoader>();
+void registerSphereLoader(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Loader for sphere model description files.")
+        .add< SphereLoader >());
+}
 
 SphereLoader::SphereLoader()
     :BaseLoader(),

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/StringMeshCreator.cpp

@@ -31,11 +31,11 @@ using namespace sofa::defaulttype;
 using namespace sofa::core::loader;
 using type::vector;
 
-int StringMeshCreatorClass = core::RegisterObject("Procedural creation of a one-dimensional mesh.")
-        .add< StringMeshCreator >()
-        ;
-
-
+void registerStringMeshCreator(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Procedural creation of a one-dimensional mesh.")
+        .add< StringMeshCreator >());
+}
 
 StringMeshCreator::StringMeshCreator(): MeshLoader()
   , d_resolution(initData(&d_resolution, (unsigned)2, "resolution", "Number of vertices"))

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/VTKExporter.cpp

@@ -30,9 +30,6 @@
 namespace sofa::component::_vtkexporter_
 {
 
-int VTKExporterClass = core::RegisterObject("Save State vectors from file at each timestep")
-        .add< VTKExporter >();
-
 VTKExporter::VTKExporter()
     : m_stepCounter(0), outfile(nullptr)
     , d_vtkFilename(initData(&d_vtkFilename, "filename", "output VTK file name"))
@@ -1015,3 +1012,14 @@ void VTKExporter::cleanup()
 }
 
 } // namespace sofa::component::_vtkexporter_
+
+namespace sofa::component::io::mesh
+{
+
+void registerVTKExporter(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Export a given mesh in a VTK file.")
+        .add< VTKExporter >());
+}
+
+} // namespace sofa::component::io::mesh

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/VisualModelOBJExporter.cpp

@@ -32,13 +32,6 @@ using sofa::core::objectmodel::KeypressedEvent ;
 namespace sofa::component::_visualmodelobjexporter_
 {
 
-int VisualModelOBJExporterClass = core::RegisterObject("Export the scene under the Wavefront OBJ format."
-                                            "When several frames are exported the file name have the following pattern: outfile000.obj outfile001.obj.")
-        .add< VisualModelOBJExporter >()
-        .addAlias("ObjExporter")
-        .addAlias("OBJExporter");
-
-
 VisualModelOBJExporter::~VisualModelOBJExporter()
 {
 }
@@ -96,3 +89,15 @@ void VisualModelOBJExporter::handleEvent(Event *event)
 }
 
 } // namespace sofa::component::_visualmodelobjexporter_
+
+namespace sofa::component::io::mesh
+{
+
+void registerVisualModelOBJExporter(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Export the scene under the Wavefront OBJ format."
+        "When several frames are exported the file name have the following pattern: outfile000.obj outfile001.obj.")
+        .add< VisualModelOBJExporter >());
+}
+
+} // namespace sofa::component::io::mesh

Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/VoxelGridLoader.cpp

@@ -37,7 +37,11 @@ using namespace sofa::defaulttype;
 using namespace sofa::core::loader;
 using namespace sofa::core;
 
-int VoxelGridLoaderClass = RegisterObject("Voxel loader based on RAW files").add<VoxelGridLoader>();
+void registerVoxelGridLoader(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Voxel loader based on RAW files.")
+        .add< VoxelGridLoader >());
+}
 
 VoxelGridLoader::VoxelGridLoader()
     : VoxelLoader(),