[SceneUtility] Apply new factory registration mechanism

Sofa/Component/SceneUtility/src/sofa/component/sceneutility/APIVersion.cpp

@@ -26,13 +26,15 @@ using sofa::core::objectmodel::BaseNode ;
 
 #include <sofa/core/ObjectFactory.h>
 using sofa::core::ObjectFactory ;
-using sofa::core::RegisterObject ;
 
 #include <sofa/component/sceneutility/APIVersion.h>
 #include <sofa/version.h>
 #include <numeric>
 
-namespace sofa::component::sceneutility::_apiversion_
+namespace sofa::component::sceneutility
+{
+
+namespace _apiversion_
 {
 
 APIVersion::APIVersion() :
@@ -76,7 +78,12 @@ const std::string& APIVersion::getApiLevel()
     return d_level.getValue() ;
 }
 
-int APIVersionClass = core::RegisterObject("Specify the APIVersion of the component used in a scene.")
-        .add< APIVersion >();
+} // namespace _apiversion_
+
+void registerAPIVersion(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Specify the APIVersion of the component used in a scene.")
+        .add< APIVersion >());
+}
 
 } // namespace sofa::component::sceneutility

Sofa/Component/SceneUtility/src/sofa/component/sceneutility/AddResourceRepository.cpp

@@ -107,14 +107,16 @@ void BaseAddResourceRepository::cleanup()
     m_repository->removePath(m_currentAddedPath);
 }
 
+void registerAddDataRepository(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Add a path to DataRepository.")
+        .add< AddDataRepository >());
+}
 
-static int AddDataRepositoryClass = core::RegisterObject("Add a path to DataRepository")
-    .add< AddDataRepository >()
-    .addAlias("AddResourceRepository") // Backward compatibility
-    ;
-
-static int AddPluginRepositoryClass = core::RegisterObject("Add a path to PluginRepository")
-    .add< AddPluginRepository >();
-
+void registerAddPluginRepository(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Add a path to PluginRepository.")
+        .add< AddPluginRepository >());
+}
 
 } // namespace sofa::component::sceneutility

Sofa/Component/SceneUtility/src/sofa/component/sceneutility/InfoComponent.cpp

@@ -25,8 +25,13 @@ using sofa::core::RegisterObject ;
 
 #include <sofa/component/sceneutility/InfoComponent.h>
 
-namespace sofa::component::sceneutility::infocomponent
+namespace sofa::component::sceneutility
 {
-int InfoComponentClass = RegisterObject("This object retain the info/error message")
-        .add< InfoComponent >();
-} // namespace sofa::component::sceneutility::infocomponent
+
+void registerInfoComponent(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("This object retain the info/error message.")
+        .add< InfoComponent >());
+}
+
+} // namespace sofa::component::sceneutility

Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MakeAliasComponent.cpp

@@ -30,7 +30,10 @@ using sofa::core::objectmodel::ComponentState ;
 
 using std::string;
 
-namespace sofa::component::sceneutility::makealiascomponent
+namespace sofa::component::sceneutility
+{
+
+namespace makealiascomponent
 {
 
 MakeAliasComponent::MakeAliasComponent() :
@@ -77,8 +80,12 @@ void MakeAliasComponent::parse ( core::objectmodel::BaseObjectDescription* arg )
     d_componentState.setValue(ComponentState::Valid) ;
 }
 
-int MakeAliasComponentClass = RegisterObject("This object create an alias to a component name to make the scene more readable. ")
-        .add< MakeAliasComponent >()
-        ;
+} // namespace makealiascomponent
+
+void registerMakeAliasComponent(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("This object creates an alias to a component name to make the scene more readable.")
+        .add< MakeAliasComponent >());
+}
 
-} // namespace sofa::component::sceneutility::makealiascomponent
+} // namespace sofa::component::sceneutility

Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MakeDataAliasComponent.cpp

@@ -30,7 +30,10 @@ using sofa::core::objectmodel::ComponentState ;
 
 using std::string;
 
-namespace sofa::component::sceneutility::makedataaliascomponent
+namespace sofa::component::sceneutility
+{
+
+namespace makedataaliascomponent
 {
 
 MakeDataAliasComponent::MakeDataAliasComponent()
@@ -107,9 +110,12 @@ void MakeDataAliasComponent::parse ( core::objectmodel::BaseObjectDescription* a
 
     d_componentState.setValue(ComponentState::Valid);
 }
+} // namespace makedataaliascomponent
 
-int MakeDataAliasComponentClass = RegisterObject("This object create an alias to a data field. ")
-        .add< MakeDataAliasComponent >()
-        ;
+void registerMakeDataAliasComponent(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("This object creates an alias to a data field.")
+        .add< MakeDataAliasComponent >());
+}
 
-} // namespace sofa::component::sceneutility::makedataaliascomponent
+} // namespace sofa::component::sceneutility

Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MessageHandlerComponent.cpp

@@ -99,12 +99,12 @@ void MessageHandlerComponent::parse ( core::objectmodel::BaseObjectDescription*
     m_isValid = true ;
 }
 
-int MessageHandlerComponentClass = RegisterObject("This object controls the way Sofa print's "
-                                                  "info/warning/error/fatal messages. ")
-        .add< MessageHandlerComponent >()
-        ;
-
-
+void registerMessageHandlerComponent(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("This object controls the way Sofa print's "
+                                                          "info/warning/error/fatal messages. ")
+        .add< MessageHandlerComponent >());
+}
 
 ////////////////////////// FileMessageHandlerComponent ////////////////////////////////////
 FileMessageHandlerComponent::FileMessageHandlerComponent() :

Sofa/Component/SceneUtility/src/sofa/component/sceneutility/PauseAnimationOnEvent.cpp

@@ -57,10 +57,10 @@ void PauseAnimationOnEvent::handleEvent(sofa::core::objectmodel::Event* event)
     }
 }
 
-int PauseAnimationOnEventClass = core::RegisterObject("PauseAnimationOnEvent")
-        .add< PauseAnimationOnEvent >();
-
-
-
+void registerPauseAnimationOnEvent(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("This component pauses the simulation when receiving a PauseEvent.")
+        .add< PauseAnimationOnEvent >());
+}
 
 } // namespace sofa::component::sceneutility

Sofa/Component/SceneUtility/src/sofa/component/sceneutility/init.cpp

@@ -21,13 +21,25 @@
 ******************************************************************************/
 #include <sofa/component/sceneutility/init.h>
 #include <sofa/core/ObjectFactory.h>
+#include <sofa/helper/system/PluginManager.h>
+
 namespace sofa::component::sceneutility
 {
 
+extern void registerAddDataRepository(sofa::core::ObjectFactory* factory);
+extern void registerAddPluginRepository(sofa::core::ObjectFactory* factory);
+extern void registerAPIVersion(sofa::core::ObjectFactory* factory);
+extern void registerInfoComponent(sofa::core::ObjectFactory* factory);;
+extern void registerMakeAliasComponent(sofa::core::ObjectFactory* factory);
+extern void registerMakeDataAliasComponent(sofa::core::ObjectFactory* factory);
+extern void registerMessageHandlerComponent(sofa::core::ObjectFactory* factory);
+extern void registerPauseAnimationOnEvent(sofa::core::ObjectFactory* factory);
+
 extern "C" {
     SOFA_EXPORT_DYNAMIC_LIBRARY void initExternalModule();
     SOFA_EXPORT_DYNAMIC_LIBRARY const char* getModuleName();
     SOFA_EXPORT_DYNAMIC_LIBRARY const char* getModuleVersion();
+    SOFA_EXPORT_DYNAMIC_LIBRARY void registerObjects(sofa::core::ObjectFactory* factory);
 }
 
 void initExternalModule()
@@ -45,11 +57,26 @@ const char* getModuleVersion()
     return MODULE_VERSION;
 }
 
+void registerObjects(sofa::core::ObjectFactory* factory)
+{
+    registerAddDataRepository(factory);
+    registerAddPluginRepository(factory);
+    registerAPIVersion(factory);
+    registerInfoComponent(factory);;
+    registerMakeAliasComponent(factory);
+    registerMakeDataAliasComponent(factory);
+    registerMessageHandlerComponent(factory);
+    registerPauseAnimationOnEvent(factory);
+}
+
 void init()
 {
     static bool first = true;
     if (first)
     {
+        // make sure that this plugin is registered into the PluginManager
+        sofa::helper::system::PluginManager::getInstance().registerPlugin(MODULE_NAME);
+
         first = false;
     }
 }

Sofa/Component/src/sofa/component/init.cpp

@@ -77,6 +77,7 @@ void registerObjects(sofa::core::ObjectFactory* factory)
     factory->registerObjectsFromPlugin("Sofa.Component.StateContainer");
     factory->registerObjectsFromPlugin("Sofa.Component.Setting");
     factory->registerObjectsFromPlugin("Sofa.Component.Visual");
+    factory->registerObjectsFromPlugin("Sofa.Component.SceneUtility");
 }
 
 void init()