Merge pull request #7 from hugtalbot/202502_clean_and_registration

 Update with the new registration mechanism

Author: fredroy

src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp

@@ -34,9 +34,11 @@ namespace sofa::component::forcefield
 using namespace sofa::defaulttype;
 
 // Register in the Factory
-int MJEDTetrahedralForceFieldClass = core::RegisterObject("Tetrahedral FEM model of visco-hyperelastic material using MJED")
-        .add< MJEDTetrahedralForceField<Vec3Types> >()
-        ;
+void registerMJEDTetrahedralForceField(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(core::ObjectRegistrationData("Tetrahedral FEM model of visco-hyperelastic material using MJED")
+                                     .add< MJEDTetrahedralForceField<Vec3Types> >());
+}
 
 template class SOFA_MJED_FEM_API MJEDTetrahedralForceField<Vec3Types>;
 

src/SofaMJEDFEM/MJEDTetrahedralForceField.inl

@@ -114,7 +114,6 @@ void MJEDTetrahedralForceField<DataTypes>::createTetrahedronRestInformation(unsi
     materialTermArray = myMaterial->getMaterialTermArray();
     typename vector<HyperelasticMatTerm *>::iterator it;
     it=materialTermArray.begin();
-    int id=0;
     std::vector<Real> number;
     Real coefficient=0;
     tinfo.coeff.resize(0);
@@ -181,7 +180,6 @@ void MJEDTetrahedralForceField<DataTypes>::createTetrahedronRestInformation(unsi
         tinfo.Lij_second_k.push_back(  Lijsecond );
       }
 
-      id++;
       tinfo.functionf.push_back(1);
       tinfo.functiong.push_back(1);
       tinfo.functionDf.push_back(0);

src/SofaMJEDFEM/config.h.in

@@ -32,3 +32,9 @@
 #else
 #  define SOFA_MJED_FEM_API  SOFA_IMPORT_DYNAMIC_LIBRARY
 #endif
+
+namespace sofamjedfem
+{
+constexpr const char* MODULE_NAME = "@PROJECT_NAME@";
+constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@";
+} // namespace sofamjedfem

src/SofaMJEDFEM/initSofaMJEDFEM.cpp

@@ -21,54 +21,72 @@
 ******************************************************************************/
 #include <SofaMJEDFEM/config.h>
 #include <sofa/core/ObjectFactory.h>
+#include <sofa/helper/system/PluginManager.h>
+
 using sofa::core::ObjectFactory;
 
-namespace sofa::component
+namespace sofamjedfem
 {
+    extern void registerMJEDTetrahedralForceField(sofa::core::ObjectFactory *factory);
+} // namespace sofamjedfem
 
-extern "C" {
-    SOFA_MJED_FEM_API void initExternalModule();
-    SOFA_MJED_FEM_API const char* getModuleName();
-    SOFA_MJED_FEM_API const char* getModuleVersion();
-    SOFA_MJED_FEM_API const char* getModuleLicense();
-    SOFA_MJED_FEM_API const char* getModuleDescription();
-    SOFA_MJED_FEM_API const char* getModuleComponentList();
-}
 
-void initExternalModule()
+namespace sofa::component
 {
-    static bool first = true;
-    if (first)
+    using namespace sofamjedfem;
+
+    extern "C" {
+        SOFA_MJED_FEM_API void initExternalModule();
+        SOFA_MJED_FEM_API const char* getModuleName();
+        SOFA_MJED_FEM_API const char* getModuleVersion();
+        SOFA_MJED_FEM_API const char* getModuleLicense();
+        SOFA_MJED_FEM_API const char* getModuleDescription();
+        SOFA_MJED_FEM_API const char* getModuleComponentList();
+        SOFA_MJED_FEM_API void registerObjects(sofa::core::ObjectFactory* factory);
+    }
+
+    void initExternalModule()
     {
-        first = false;
+        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;
+        }
     }
-}
 
-const char* getModuleName()
-{
-    return sofa_tostring(SOFA_TARGET);
-}
+    const char* getModuleName()
+    {
+        return sofa_tostring(SOFA_TARGET);
+    }
 
-const char* getModuleVersion()
-{
-    return sofa_tostring(SOFAMJEDFEM_VERSION);
-}
+    const char* getModuleVersion()
+    {
+        return sofa_tostring(SOFAMJEDFEM_VERSION);
+    }
 
-const char* getModuleLicense()
-{
-    return "LGPL";
-}
+    const char* getModuleLicense()
+    {
+        return "LGPL";
+    }
 
-const char* getModuleDescription()
-{
-    return "This plugin implements the Multiplicative Jacobian Energy Decomposition or MJED method.";
-}
+    const char* getModuleDescription()
+    {
+        return "This plugin implements the Multiplicative Jacobian Energy Decomposition or MJED method.";
+    }
 
-const char* getModuleComponentList()
-{
-    /// string containing the names of the classes provided by the plugin
-    static std::string classes = ObjectFactory::getInstance()->listClassesFromTarget(sofa_tostring(SOFA_TARGET));
-    return classes.c_str();
-}
+    const char* getModuleComponentList()
+    {
+        /// string containing the names of the classes provided by the plugin
+        static std::string classes = ObjectFactory::getInstance()->listClassesFromTarget(sofa_tostring(SOFA_TARGET));
+        return classes.c_str();
+    }
+
+    void registerObjects(sofa::core::ObjectFactory* factory)
+    {
+        registerMJEDTetrahedralForceField(factory);
+    }
 
 } // namespace sofa::component