apply new register mechanism to the "essential" components

Author: fredroy

Sofa/framework/Simulation/Core/src/sofa/simulation/DefaultAnimationLoop.cpp

@@ -56,15 +56,18 @@
 namespace sofa::simulation
 {
 
-int DefaultAnimationLoopClass = core::RegisterObject("Simulation loop to use in scene without constraints nor contact.")
-                                .add<DefaultAnimationLoop>()
-                                .addDocumentationURL(std::string(sofa::SOFA_DOCUMENTATION_URL) + std::string("components/animationloops/defaultanimationloop/"))
-                                .addDescription(R"(
+void registerDefaultAnimationLoop(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Simulation loop to use in scene without constraints nor contact.")
+        .add<DefaultAnimationLoop>()
+        .addDocumentationURL(std::string(sofa::SOFA_DOCUMENTATION_URL) + std::string("components/animationloops/defaultanimationloop/"))
+        .addDescription(R"(
 This loop triggers the following steps:
 - build and solve all linear systems in the scene : collision and time integration to compute the new values of the dofs
 - update the context (dt++)
 - update the mappings
-- update the bounding box (volume covering all objects of the scene))");
+- update the bounding box (volume covering all objects of the scene))"));
+}
 
 DefaultAnimationLoop::DefaultAnimationLoop(simulation::Node* _m_node)
     : Inherit()

Sofa/framework/Simulation/Core/src/sofa/simulation/DefaultVisualManagerLoop.cpp

@@ -35,9 +35,11 @@ namespace sofa::core::objectmodel {
 namespace sofa::simulation
 {
 
-int DefaultVisualManagerLoopClass = core::RegisterObject("The simplest Visual Loop Manager, created by default when user do not put on scene")
-        .add< DefaultVisualManagerLoop >()
-        ;
+void registerDefaultVisualManagerLoop(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("The simplest Visual Loop Manager, created by default when user does not put one in the scene.")
+        .add< DefaultVisualManagerLoop >());
+}
 
 DefaultVisualManagerLoop::DefaultVisualManagerLoop() :
     l_node(initLink("targetNode","Link to the scene's node where the rendering will take place"))

Sofa/framework/Simulation/Core/src/sofa/simulation/RequiredPlugin.cpp

@@ -33,8 +33,11 @@ using sofa::helper::system::PluginManager;
 namespace sofa::simulation
 {
 
-int RequiredPluginClass = core::RegisterObject("Load the required plugins")
-        .add< RequiredPlugin >();
+void registerRequiredPlugin(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Load the required plugins.")
+        .add< RequiredPlugin >());
+}
 
 RequiredPlugin::RequiredPlugin()
     : d_pluginName( initData(&d_pluginName, "pluginName", "plugin name (or several names if you need to load different plugins or a plugin with several alternate names)"))

Sofa/framework/Simulation/Core/src/sofa/simulation/init.cpp

@@ -26,19 +26,33 @@
 
 #include <sofa/simulation/MainTaskSchedulerRegistry.h>
 
+#include <sofa/core/ObjectFactory.h>
 
-namespace sofa::simulation::core
+namespace sofa::simulation
+{
+
+extern void registerRequiredPlugin(sofa::core::ObjectFactory* factory);
+extern void registerDefaultVisualManagerLoop(sofa::core::ObjectFactory* factory);
+extern void registerDefaultAnimationLoop(sofa::core::ObjectFactory* factory);
+
+namespace core
 {
 
 static bool s_initialized = false;
 static bool s_cleanedUp = false;
 
+
 SOFA_SIMULATION_CORE_API void init()
 {
     if (!s_initialized)
     {
         sofa::core::init();
         s_initialized = true;
+
+        auto* factory = sofa::core::ObjectFactory::getInstance();
+        registerRequiredPlugin(factory);
+        registerDefaultVisualManagerLoop(factory);
+        registerDefaultAnimationLoop(factory);
     }
 }
 
@@ -73,7 +87,9 @@ static const struct CleanupCheck
     }
 } check;
 
-} // namespace sofa::simulation::core
+} // namespace core
+
+} // namespace sofa::simulation
 
 
 

Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGSimulation.cpp

@@ -57,12 +57,4 @@ Node::SPtr DAGSimulation::createNewNode(const std::string& name)
     return sofa::core::objectmodel::New<DAGNode>(name);
 }
 
-
-
-// Register in the Factory
-//int DAGSimulationClass = core::RegisterObject ( "Main simulation algorithm, based on tree graph" )
-//.add< DAGSimulation >()
-//;
-
-
 } // namespace sofa::simulation::graph