refresh for Sofa v25.12

Author: fredroy

CMakeLists.txt

@@ -13,12 +13,13 @@ set(PLUGIN_SKELETONIZATION_SRC_DIR src/MeshSkeletonizationPlugin)
 
 set(HEADER_FILES
     ${PLUGIN_SKELETONIZATION_SRC_DIR}/config.h.in
+    ${PLUGIN_SKELETONIZATION_SRC_DIR}/init.h
     ${PLUGIN_SKELETONIZATION_SRC_DIR}/MeshSkeletonization.h
     ${PLUGIN_SKELETONIZATION_SRC_DIR}/MeshSkeletonization.inl
 )
 
 set(SOURCE_FILES
-    ${PLUGIN_SKELETONIZATION_SRC_DIR}/initMeshSkeletonizationPlugin.cpp
+    ${PLUGIN_SKELETONIZATION_SRC_DIR}/init.cpp
     ${PLUGIN_SKELETONIZATION_SRC_DIR}/MeshSkeletonization.cpp
 )
 

src/MeshSkeletonizationPlugin/MeshSkeletonization.cpp

@@ -34,9 +34,11 @@ namespace meshskeletonizationplugin
 
 using namespace sofa::defaulttype;
 
-const int MeshSkeletonizationClass = sofa::core::RegisterObject("Ouput the skeleton of a triangulated mesh, from .off file or .obj (MeshLoader) using CGAL")
-        .add< MeshSkeletonization<Vec3Types> >()
-        ;
+void registerMeshSkeletonization(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Ouput the skeleton of a triangulated mesh, from .off file or .obj (MeshLoader) using CGAL")
+             .add< MeshSkeletonization<Vec3Types> >());
+}
 
 template class SOFA_MESHSKELETONIZATIONPLUGIN_API MeshSkeletonization<Vec3Types>;
 

src/MeshSkeletonizationPlugin/config.h.in

@@ -22,12 +22,17 @@
 #pragma once
 
 #include <sofa/config.h>
-
-#define MESHSKELETONIZATIONPLUGIN_VERSION @PROJECT_VERSION@
+#include <sofa/config/sharedlibrary_defines.h>
 
 #ifdef SOFA_BUILD_MESHSKELETONIZATIONPLUGIN
 #  define SOFA_TARGET @PROJECT_NAME@
 #  define SOFA_MESHSKELETONIZATIONPLUGIN_API SOFA_EXPORT_DYNAMIC_LIBRARY
 #else
 #  define SOFA_MESHSKELETONIZATIONPLUGIN_API SOFA_IMPORT_DYNAMIC_LIBRARY
 #endif
+
+namespace meshskeletonizationplugin
+{
+    constexpr const char* MODULE_NAME = "@PROJECT_NAME@";
+    constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@";
+} // namespace meshskeletonizationplugin

…Plugin/initMeshSkeletonizationPlugin.cpp src/MeshSkeletonizationPlugin/init.cppsrc/MeshSkeletonizationPlugin/initMeshSkeletonizationPlugin.cpp renamed to src/MeshSkeletonizationPlugin/init.cpp src/MeshSkeletonizationPlugin/initMeshSkeletonizationPlugin.cpp renamed to src/MeshSkeletonizationPlugin/init.cpp

@@ -19,49 +19,66 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include <MeshSkeletonizationPlugin/config.h>
+#include <MeshSkeletonizationPlugin/init.h>
+
+#include <sofa/core/ObjectFactory.h>
+#include <sofa/helper/system/PluginManager.h>
 
 namespace meshskeletonizationplugin
 {
 
-//Here are just several convenient functions to help users know what the plugin contains 
+extern void registerMeshSkeletonization(sofa::core::ObjectFactory* factory);
 
+//Here are just several convenient functions to help users know what the plugin contains
 extern "C" {
-    SOFA_MESHSKELETONIZATIONPLUGIN_API void initExternalModule();
-    SOFA_MESHSKELETONIZATIONPLUGIN_API const char* getModuleName();
-    SOFA_MESHSKELETONIZATIONPLUGIN_API const char* getModuleVersion();
-    SOFA_MESHSKELETONIZATIONPLUGIN_API const char* getModuleLicense();
-    SOFA_MESHSKELETONIZATIONPLUGIN_API const char* getModuleDescription();
+    SOFA_EXPORT_DYNAMIC_LIBRARY void initExternalModule();
+    SOFA_EXPORT_DYNAMIC_LIBRARY const char* getModuleName();
+    SOFA_EXPORT_DYNAMIC_LIBRARY const char* getModuleVersion();
+    SOFA_EXPORT_DYNAMIC_LIBRARY const char* getModuleLicense();
+    SOFA_EXPORT_DYNAMIC_LIBRARY const char* getModuleDescription();
+    SOFA_EXPORT_DYNAMIC_LIBRARY void registerObjects(sofa::core::ObjectFactory* factory);
 }
 
 void initExternalModule()
 {
-    static bool first = true;
-    if (first)
-    {
-        first = false;
-    }
+    init();
 }
 
 const char* getModuleName()
 {
-    return sofa_tostring(SOFA_TARGET);
+    return MODULE_NAME;
 }
 
 const char* getModuleVersion()
 {
-    return sofa_tostring(MESHSKELETONIZATIONPLUGIN_VERSION);
+    return MODULE_VERSION;
 }
 
 const char* getModuleLicense()
 {
     return "GPL";
 }
 
-
 const char* getModuleDescription()
 {
     return "Use CGAL to generate mesh skeleton";
 }
 
+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;
+    }
+}
+
+void registerObjects(sofa::core::ObjectFactory* factory)
+{
+    registerMeshSkeletonization(factory);
+}
+
 }

src/MeshSkeletonizationPlugin/init.h

@@ -0,0 +1,29 @@
+/******************************************************************************
+*                 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 <http://www.gnu.org/licenses/>.        *
+*******************************************************************************
+* Authors: The SOFA Team and external contributors (see Authors.txt)          *
+*                                                                             *
+* Contact information: contact@sofa-framework.org                             *
+******************************************************************************/
+#pragma once
+
+#include <MeshSkeletonizationPlugin/config.h>
+
+namespace meshskeletonizationplugin
+{
+    SOFA_MESHSKELETONIZATIONPLUGIN_API void init();
+} // namespace meshskeletonizationplugin