Merge pull request #9 from hugtalbot/202506_new_registration_mechanism

fredroy · web-flow · commit 36688173f0b7 · 2025-06-11T11:53:10.000+02:00
Apply new factory registration mechanism
diff --git a/src/ShapeMatchingPlugin/ShapeMatchingForceField.cpp b/src/ShapeMatchingPlugin/ShapeMatchingForceField.cpp
@@ -25,15 +25,17 @@
 #include <sofa/defaulttype/VecTypes.h>
 #include <sofa/core/ObjectFactory.h>
 
-namespace sofa::component::forcefield
+namespace shapematchingplugin
 {
 
 using namespace sofa::defaulttype;
 
-int ShapeMatchingForceFieldClass = core::RegisterObject("Meshless deformations based on shape matching")
-.add< ShapeMatchingForceField<Vec3Types> >()
-;
+void registerShapeMatchingForceField(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Meshless deformations based on shape matching")
+    .add< ShapeMatchingForceField<Vec3Types> >());
+}
 
 template class SOFA_SHAPEMATCHINGPLUGIN_API ShapeMatchingForceField<Vec3Types>;
 
-} // namespace sofa::component::forcefield
+} // namespace shapematchingplugin
diff --git a/src/ShapeMatchingPlugin/ShapeMatchingForceField.h b/src/ShapeMatchingPlugin/ShapeMatchingForceField.h
@@ -30,7 +30,7 @@
 
 #include <ShapeMatchingPlugin/ShapeMatchingRotationFinder.h>
 
-namespace sofa::component::forcefield
+namespace shapematchingplugin
 {
 
 /// Meshless deformations based on shape matching
@@ -57,7 +57,7 @@ class ShapeMatchingForceField : public core::behavior::ForceField<DataTypes>
     ShapeMatchingForceField();
 
 public:
-    SingleLink<ShapeMatchingForceField<DataTypes>, container::ShapeMatchingRotationFinder<DataTypes>, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_rotationFinder;
+    SingleLink<ShapeMatchingForceField<DataTypes>, ShapeMatchingRotationFinder<DataTypes>, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_rotationFinder;
     Data<Real> d_stiffness;
 
     void init() override;
@@ -74,4 +74,4 @@ class ShapeMatchingForceField : public core::behavior::ForceField<DataTypes>
 extern template class SOFA_SHAPEMATCHINGPLUGIN_API ShapeMatchingForceField<defaulttype::Vec3Types>;
 #endif // !defined(SOFA_COMPONENT_FORCEFIELD_SHAPEMATCHINGFORCEFIELD_CPP)
 
-} // namespace sofa::component::forcefield
+} // namespace shapematchingplugin
diff --git a/src/ShapeMatchingPlugin/ShapeMatchingForceField.inl b/src/ShapeMatchingPlugin/ShapeMatchingForceField.inl
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <iostream>
 
-namespace sofa::component::forcefield
+namespace shapematchingplugin
 {
 
 template<class DataTypes>
@@ -47,7 +47,7 @@ void ShapeMatchingForceField<DataTypes>::init()
 
     if (!l_rotationFinder.get())
     {
-        sofa::core::sptr< container::ShapeMatchingRotationFinder<DataTypes>> rotationFinder;
+        sofa::core::sptr< ShapeMatchingRotationFinder<DataTypes>> rotationFinder;
         this->getContext()->get(rotationFinder);
         if (!rotationFinder)
         {
@@ -148,4 +148,4 @@ void ShapeMatchingForceField<DataTypes>::draw(const core::visual::VisualParams*
 }
 
 
-} // namespace sofa::component::forcefield
+} // namespace shapematchingplugin
diff --git a/src/ShapeMatchingPlugin/ShapeMatchingRotationFinder.cpp b/src/ShapeMatchingPlugin/ShapeMatchingRotationFinder.cpp
@@ -32,17 +32,19 @@
 #include <ShapeMatchingPlugin/ShapeMatchingRotationFinder.inl>
 #include <sofa/core/ObjectFactory.h>
 
-namespace sofa::component::container
+namespace shapematchingplugin
 {
 
 using namespace sofa::defaulttype;
 
 // Register in the Factory
-int ShapeMatchingRotationFinderClass = core::RegisterObject("ShapeMatchingRotationFinder")
-.add< ShapeMatchingRotationFinder< Vec3Types > >()
-.addAlias("RotationFinder")
-;
+void registerShapeMatchingRotationFinder(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("ShapeMatchingRotationFinder")
+    .add< ShapeMatchingRotationFinder< Vec3Types > >()
+    .addAlias("RotationFinder"));
+}
 
 template class SOFA_SHAPEMATCHINGPLUGIN_API ShapeMatchingRotationFinder< defaulttype::Vec3Types >;
 
-} // namespace sofa::component::container
+} // namespace shapematchingplugin
diff --git a/src/ShapeMatchingPlugin/ShapeMatchingRotationFinder.h b/src/ShapeMatchingPlugin/ShapeMatchingRotationFinder.h
@@ -36,7 +36,7 @@
  *	"Meshless Deformations Based on Shape Matching" (Muller, Heidelberger, Teschner and Gross)
  *
  */
-namespace sofa::component::container
+namespace shapematchingplugin
 {
 
 template <class DataTypes>
@@ -120,4 +120,4 @@ class ShapeMatchingRotationFinder : public sofa::core::behavior::RotationFinder<
 extern template class SOFA_SHAPEMATCHINGPLUGIN_API ShapeMatchingRotationFinder< defaulttype::Vec3Types >;
 #endif
 
-} // namespace sofa::component::container
+} // namespace shapematchingplugin
diff --git a/src/ShapeMatchingPlugin/ShapeMatchingRotationFinder.inl b/src/ShapeMatchingPlugin/ShapeMatchingRotationFinder.inl
@@ -31,7 +31,7 @@
 #include <ShapeMatchingPlugin/polar_decomposition_3x3.h>
 
 
-namespace sofa::component::container
+namespace shapematchingplugin
 {
 
 using namespace sofa::core::topology;
@@ -619,4 +619,4 @@ void ShapeMatchingRotationFinder<DataTypes>::draw(const core::visual::VisualPara
 	vparams->drawTool()->restoreLastState();
 }
 
-} // namespace sofa::component::container
+} // namespace shapematchingplugin
diff --git a/src/ShapeMatchingPlugin/config.h.in b/src/ShapeMatchingPlugin/config.h.in
@@ -24,6 +24,8 @@
 #include <sofa/config.h>
 #include <sofa/config/sharedlibrary_defines.h>
 
+using namespace sofa;
+
 #define SHAPEMATCHINGPLUGIN_VERSION @PROJECT_VERSION@
 
 #ifdef SOFA_BUILD_SHAPEMATCHINGPLUGIN
@@ -33,7 +35,7 @@
 #  define SOFA_SHAPEMATCHINGPLUGIN_API SOFA_IMPORT_DYNAMIC_LIBRARY
 #endif
 
-namespace shapematching
+namespace shapematchingplugin
 {
     constexpr const char* MODULE_NAME = "@PROJECT_NAME@";
     constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@";
diff --git a/src/ShapeMatchingPlugin/initShapeMatchingPlugin.cpp b/src/ShapeMatchingPlugin/initShapeMatchingPlugin.cpp
@@ -24,17 +24,21 @@
 ******************************************************************************/
 #include <ShapeMatchingPlugin/initShapeMatchingPlugin.h>
 #include <sofa/core/ObjectFactory.h>
+#include <sofa/helper/system/PluginManager.h>
 
-namespace sofa::component
+namespace shapematchingplugin
 {
 
+	extern void registerShapeMatchingForceField(sofa::core::ObjectFactory* factory);
+	extern void registerShapeMatchingRotationFinder(sofa::core::ObjectFactory* factory);
+
 	extern "C" {
 		SOFA_SHAPEMATCHINGPLUGIN_API void initExternalModule();
 		SOFA_SHAPEMATCHINGPLUGIN_API const char* getModuleName();
 		SOFA_SHAPEMATCHINGPLUGIN_API const char* getModuleVersion();
 		SOFA_SHAPEMATCHINGPLUGIN_API const char* getModuleLicense();
 		SOFA_SHAPEMATCHINGPLUGIN_API const char* getModuleDescription();
-		SOFA_SHAPEMATCHINGPLUGIN_API const char* getModuleComponentList();
+		SOFA_SHAPEMATCHINGPLUGIN_API void registerObjects(sofa::core::ObjectFactory* factory);
 	}
 
 	void initShapeMatchingPlugin()
@@ -44,6 +48,9 @@ namespace sofa::component
 
 	void initExternalModule()
 	{
+		// make sure that this plugin is registered into the PluginManager
+        sofa::helper::system::PluginManager::getInstance().registerPlugin(MODULE_NAME);
+
 		static bool first = true;
 		if (first)
 		{
@@ -53,12 +60,12 @@ namespace sofa::component
 
 	const char* getModuleName()
 	{
-		return shapematching::MODULE_NAME;
+		return MODULE_NAME;
 	}
 
 	const char* getModuleVersion()
 	{
-		return shapematching::MODULE_VERSION;
+		return MODULE_VERSION;
 	}
 
 	const char* getModuleLicense()
@@ -71,11 +78,10 @@ namespace sofa::component
 		return "Plugin with ShapeMatchingPlugin";
 	}
 
-	const char* getModuleComponentList()
+	void registerObjects(sofa::core::ObjectFactory* factory)
 	{
-		/// string containing the names of the classes provided by the plugin
-		static std::string classes = sofa::core::ObjectFactory::getInstance()->listClassesFromTarget(sofa_tostring(SOFA_TARGET));
-		return classes.c_str();
+		registerShapeMatchingForceField(factory);
+		registerShapeMatchingRotationFinder(factory);
 	}
 
-} // namespace sofa::component
+} // namespace shapematchingplugin
diff --git a/src/ShapeMatchingPlugin/initShapeMatchingPlugin.h b/src/ShapeMatchingPlugin/initShapeMatchingPlugin.h
@@ -24,9 +24,9 @@
 ******************************************************************************/
 #include <ShapeMatchingPlugin/config.h>
 
-namespace sofa::component
+namespace shapematchingplugin
 {
 
 void SOFA_SHAPEMATCHINGPLUGIN_API initShapeMatchingPlugin();
 
-} // namespace sofa::component
+} // namespace shapematchingplugin

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`#include <assert.h>`
`29`	`29`	`#include <iostream>`
`30`	`30`
`31`		`-namespace sofa::component::forcefield`
	`31`	`+namespace shapematchingplugin`
`32`	`32`	`{`
`33`	`33`
`34`	`34`	`template<class DataTypes>`
`@@ -47,7 +47,7 @@ void ShapeMatchingForceField<DataTypes>::init()`
`47`	`47`
`48`	`48`	`if (!l_rotationFinder.get())`
`49`	`49`	`{`
`50`		`- sofa::core::sptr< container::ShapeMatchingRotationFinder<DataTypes>> rotationFinder;`
	`50`	`+ sofa::core::sptr< ShapeMatchingRotationFinder<DataTypes>> rotationFinder;`
`51`	`51`	`this->getContext()->get(rotationFinder);`
`52`	`52`	`if (!rotationFinder)`
`53`	`53`	`{`
`@@ -148,4 +148,4 @@ void ShapeMatchingForceField<DataTypes>::draw(const core::visual::VisualParams*`
`148`	`148`	`}`
`149`	`149`
`150`	`150`
`151`		`-} // namespace sofa::component::forcefield`
	`151`	`+} // namespace shapematchingplugin`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`* "Meshless Deformations Based on Shape Matching" (Muller, Heidelberger, Teschner and Gross)`
`37`	`37`	`*`
`38`	`38`	`*/`
`39`		`-namespace sofa::component::container`
	`39`	`+namespace shapematchingplugin`
`40`	`40`	`{`
`41`	`41`
`42`	`42`	`template <class DataTypes>`
`@@ -120,4 +120,4 @@ class ShapeMatchingRotationFinder : public sofa::core::behavior::RotationFinder<`
`120`	`120`	`extern template class SOFA_SHAPEMATCHINGPLUGIN_API ShapeMatchingRotationFinder< defaulttype::Vec3Types >;`
`121`	`121`	`#endif`
`122`	`122`
`123`		`-} // namespace sofa::component::container`
	`123`	`+} // namespace shapematchingplugin`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`#include <ShapeMatchingPlugin/polar_decomposition_3x3.h>`
`32`	`32`
`33`	`33`
`34`		`-namespace sofa::component::container`
	`34`	`+namespace shapematchingplugin`
`35`	`35`	`{`
`36`	`36`
`37`	`37`	`using namespace sofa::core::topology;`
`@@ -619,4 +619,4 @@ void ShapeMatchingRotationFinder<DataTypes>::draw(const core::visual::VisualPara`
`619`	`619`	`vparams->drawTool()->restoreLastState();`
`620`	`620`	`}`
`621`	`621`
`622`		`-} // namespace sofa::component::container`
	`622`	`+} // namespace shapematchingplugin`
Original file line number	Diff line number	Diff line change
`@@ -24,17 +24,21 @@`
`24`	`24`	`******************************************************************************/`
`25`	`25`	`#include <ShapeMatchingPlugin/initShapeMatchingPlugin.h>`
`26`	`26`	`#include <sofa/core/ObjectFactory.h>`
	`27`	`+#include <sofa/helper/system/PluginManager.h>`
`27`	`28`
`28`		`-namespace sofa::component`
	`29`	`+namespace shapematchingplugin`
`29`	`30`	`{`
`30`	`31`
	`32`	`+ extern void registerShapeMatchingForceField(sofa::core::ObjectFactory* factory);`
	`33`	`+ extern void registerShapeMatchingRotationFinder(sofa::core::ObjectFactory* factory);`
	`34`	`+`
`31`	`35`	`extern "C" {`
`32`	`36`	`SOFA_SHAPEMATCHINGPLUGIN_API void initExternalModule();`
`33`	`37`	`SOFA_SHAPEMATCHINGPLUGIN_API const char* getModuleName();`
`34`	`38`	`SOFA_SHAPEMATCHINGPLUGIN_API const char* getModuleVersion();`
`35`	`39`	`SOFA_SHAPEMATCHINGPLUGIN_API const char* getModuleLicense();`
`36`	`40`	`SOFA_SHAPEMATCHINGPLUGIN_API const char* getModuleDescription();`
`37`		`- SOFA_SHAPEMATCHINGPLUGIN_API const char* getModuleComponentList();`
	`41`	`+ SOFA_SHAPEMATCHINGPLUGIN_API void registerObjects(sofa::core::ObjectFactory* factory);`
`38`	`42`	`}`
`39`	`43`
`40`	`44`	`void initShapeMatchingPlugin()`
`@@ -44,6 +48,9 @@ namespace sofa::component`
`44`	`48`
`45`	`49`	`void initExternalModule()`
`46`	`50`	`{`
	`51`	`+ // make sure that this plugin is registered into the PluginManager`
	`52`	`+ sofa::helper::system::PluginManager::getInstance().registerPlugin(MODULE_NAME);`
	`53`	`+`
`47`	`54`	`static bool first = true;`
`48`	`55`	`if (first)`
`49`	`56`	`{`
`@@ -53,12 +60,12 @@ namespace sofa::component`
`53`	`60`
`54`	`61`	`const char* getModuleName()`
`55`	`62`	`{`
`56`		`- return shapematching::MODULE_NAME;`
	`63`	`+ return MODULE_NAME;`
`57`	`64`	`}`
`58`	`65`
`59`	`66`	`const char* getModuleVersion()`
`60`	`67`	`{`
`61`		`- return shapematching::MODULE_VERSION;`
	`68`	`+ return MODULE_VERSION;`
`62`	`69`	`}`
`63`	`70`
`64`	`71`	`const char* getModuleLicense()`
`@@ -71,11 +78,10 @@ namespace sofa::component`
`71`	`78`	`return "Plugin with ShapeMatchingPlugin";`
`72`	`79`	`}`
`73`	`80`
`74`		`- const char* getModuleComponentList()`
	`81`	`+ void registerObjects(sofa::core::ObjectFactory* factory)`
`75`	`82`	`{`
`76`		`- /// string containing the names of the classes provided by the plugin`
`77`		`- static std::string classes = sofa::core::ObjectFactory::getInstance()->listClassesFromTarget(sofa_tostring(SOFA_TARGET));`
`78`		`- return classes.c_str();`
	`83`	`+ registerShapeMatchingForceField(factory);`
	`84`	`+ registerShapeMatchingRotationFinder(factory);`
`79`	`85`	`}`
`80`	`86`
`81`		`-} // namespace sofa::component`
	`87`	`+} // namespace shapematchingplugin`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@`
`24`	`24`	`******************************************************************************/`
`25`	`25`	`#include <ShapeMatchingPlugin/config.h>`
`26`	`26`
`27`		`-namespace sofa::component`
	`27`	`+namespace shapematchingplugin`
`28`	`28`	`{`
`29`	`29`
`30`	`30`	`void SOFA_SHAPEMATCHINGPLUGIN_API initShapeMatchingPlugin();`
`31`	`31`
`32`		`-} // namespace sofa::component`
	`32`	`+} // namespace shapematchingplugin`