Merge branch 'master' into rework-proxAlgo from *_API macro mechanism application

th-skam · th-skam · commit 0cadd27de62e · 2025-09-24T14:16:03.000+02:00
diff --git a/src/CollisionAlgorithm/BaseAABBBroadPhase.h b/src/CollisionAlgorithm/BaseAABBBroadPhase.h
@@ -9,7 +9,7 @@
 
 namespace sofa::collisionalgorithm {
 
-class BaseAABBBroadPhase : public BaseGeometry::BroadPhase {
+class SOFA_COLLISIONALGORITHM_API BaseAABBBroadPhase : public BaseGeometry::BroadPhase {
 public:
 
     SOFA_ABSTRACT_CLASS(BaseAABBBroadPhase,BaseGeometry::BroadPhase);
diff --git a/src/CollisionAlgorithm/BaseAlgorithm.h b/src/CollisionAlgorithm/BaseAlgorithm.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/BaseGeometry.h>
 #include <sofa/core/collision/Pipeline.h>
 #include <CollisionAlgorithm/DataDetectionOutput.h>
@@ -12,7 +13,7 @@ namespace sofa::collisionalgorithm {
  * \brief The BaseAlgorithm abstract class defines an interface of
  * algorithms to be wrapped in sofa components
  */
-class BaseAlgorithm : public CollisionAlgorithm
+class SOFA_COLLISIONALGORITHM_API BaseAlgorithm : public CollisionAlgorithm
 {
 public :
 
@@ -23,7 +24,7 @@ public :
     /*!
      * \brief The BaseFilter class provides an interface to create proximity filter components
      */
-    class BaseFilter : public sofa::core::objectmodel::BaseObject {
+    class SOFA_COLLISIONALGORITHM_API BaseFilter : public sofa::core::objectmodel::BaseObject {
     public:
         SOFA_ABSTRACT_CLASS(BaseFilter, sofa::core::objectmodel::BaseObject);
 
diff --git a/src/CollisionAlgorithm/BaseElement.h b/src/CollisionAlgorithm/BaseElement.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/BaseProximity.h>
 #include <sofa/core/visual/VisualParams.h>
 
@@ -45,7 +46,7 @@ class ElementContainer {
     std::vector<SPtr> m_data;
 };
 
-class BaseElement {
+class SOFA_COLLISIONALGORITHM_API BaseElement {
 public:
 
     typedef std::shared_ptr<BaseElement> SPtr;
diff --git a/src/CollisionAlgorithm/BaseGeometry.h b/src/CollisionAlgorithm/BaseGeometry.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/CollisionPipeline.h>
 #include <CollisionAlgorithm/BaseElement.h>
 #include <CollisionAlgorithm/BaseProximity.h>
@@ -20,7 +21,7 @@ namespace sofa ::collisionalgorithm {
  * \brief The BaseGeometry class is an abstract class defining a basic geometry
  * iterates through Proximity elements and draws them
  */
-class BaseGeometry : public CollisionComponent {
+class SOFA_COLLISIONALGORITHM_API BaseGeometry : public CollisionComponent {
 public:
 
     class BroadPhase : public sofa::core::objectmodel::BaseObject {
diff --git a/src/CollisionAlgorithm/BaseProximity.h b/src/CollisionAlgorithm/BaseProximity.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <CollisionAlgorithm/config.h>
 #include <sofa/core/VecId.h>
 #include <sofa/core/MultiVecId.h>
 #include <sofa/linearalgebra/BaseVector.h>
@@ -31,7 +32,7 @@ class BaseBaseProximity  {
     const std::type_info & getTypeInfo() { return typeid(*this); }
 };
 
-class BaseProximity : public virtual BaseBaseProximity {
+class SOFA_COLLISIONALGORITHM_API BaseProximity : public virtual BaseBaseProximity {
 public:
     typedef std::shared_ptr<BaseProximity> SPtr;
 
diff --git a/src/CollisionAlgorithm/CollisionPipeline.h b/src/CollisionAlgorithm/CollisionPipeline.h
@@ -17,21 +17,21 @@
 
 namespace sofa ::collisionalgorithm {
 
-class CollisionComponent : public core::objectmodel::BaseObject {
+class SOFA_COLLISIONALGORITHM_API CollisionComponent : public core::objectmodel::BaseObject {
 public:
 
     virtual void prepareDetection() = 0;
 
 };
 
-class CollisionAlgorithm : public core::objectmodel::BaseObject {
+class SOFA_COLLISIONALGORITHM_API CollisionAlgorithm : public core::objectmodel::BaseObject {
 public:
 
     virtual void doDetection() = 0;
 
 };
 
-class CollisionLoop : public core::objectmodel::BaseObject {
+class SOFA_COLLISIONALGORITHM_API CollisionLoop : public core::objectmodel::BaseObject {
 public:
 
     SOFA_ABSTRACT_CLASS(CollisionLoop,core::objectmodel::BaseObject);
diff --git a/src/CollisionAlgorithm/ElementIterator.h b/src/CollisionAlgorithm/ElementIterator.h
@@ -1,13 +1,14 @@
 #pragma once
 
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/BaseProximity.h>
 #include <CollisionAlgorithm/BaseElement.h>
 
 namespace sofa::collisionalgorithm {
 
 class BaseGeometry;
 
-class ElementIterator {
+class SOFA_COLLISIONALGORITHM_API ElementIterator {
 public:
 
     typedef std::shared_ptr<ElementIterator> SPtr;
@@ -43,7 +44,7 @@ static inline void operator ++ (ElementIterator::SPtr & it, int /*NB*/) {
         it->next();
 }
 
-class EmptyIterator : public ElementIterator {
+class SOFA_COLLISIONALGORITHM_API EmptyIterator : public ElementIterator {
 public:
     friend class ElementIterator;
 
diff --git a/src/CollisionAlgorithm/InternalData.h b/src/CollisionAlgorithm/InternalData.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/CollisionPipeline.h>
 #include <CollisionAlgorithm/BaseElement.h>
 #include <CollisionAlgorithm/BaseProximity.h>
@@ -14,7 +15,7 @@
 namespace sofa ::collisionalgorithm {
 
 
-class InternalDataContainer {
+class SOFA_COLLISIONALGORITHM_API InternalDataContainer {
 public:
 
 
diff --git a/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.h b/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.h
@@ -9,7 +9,7 @@
 
 namespace sofa::collisionalgorithm {
 
-class Find2DClosestProximityAlgorithm : public BaseAlgorithm {
+class SOFA_COLLISIONALGORITHM_API Find2DClosestProximityAlgorithm : public BaseAlgorithm {
 public:
     SOFA_CLASS(Find2DClosestProximityAlgorithm, BaseAlgorithm);
 
diff --git a/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.h b/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.h
@@ -15,7 +15,7 @@
 namespace sofa::collisionalgorithm
 {
 
-class InsertionAlgorithm : public BaseAlgorithm
+class SOFA_COLLISIONALGORITHM_API InsertionAlgorithm : public BaseAlgorithm
 {
    public:
     SOFA_CLASS(InsertionAlgorithm, BaseAlgorithm);
diff --git a/src/CollisionAlgorithm/broadphase/AABBBroadPhase.h b/src/CollisionAlgorithm/broadphase/AABBBroadPhase.h
@@ -16,7 +16,7 @@ namespace sofa::collisionalgorithm {
  * The class is part of the broader collision detection system and is used to quickly narrow down
  * potential collisions before more detailed, computationally expensive checks are performed.
  */
-class AABBBroadPhase : public BaseAABBBroadPhase {
+class SOFA_COLLISIONALGORITHM_API AABBBroadPhase : public BaseAABBBroadPhase {
 public:
 
     /**
diff --git a/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.h b/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.h
@@ -7,7 +7,7 @@
 
 namespace sofa::collisionalgorithm {
 
-class FullAABBBroadPhase : public BaseAABBBroadPhase {
+class SOFA_COLLISIONALGORITHM_API FullAABBBroadPhase : public BaseAABBBroadPhase {
 public:
 
     SOFA_CLASS(FullAABBBroadPhase,BaseAABBBroadPhase);
diff --git a/src/CollisionAlgorithm/elements/EdgeElement.cpp b/src/CollisionAlgorithm/elements/EdgeElement.cpp
@@ -6,6 +6,8 @@
 
 namespace sofa::collisionalgorithm {
 
+template class SOFA_COLLISIONALGORITHM_API ElementContainer<EdgeElement>;
+
 EdgeElement::SPtr EdgeElement::create(const PointElement::SPtr & p0, const PointElement::SPtr & p1) {
     EdgeElement::SPtr res = EdgeElement::SPtr(new EdgeElement());
 
diff --git a/src/CollisionAlgorithm/elements/EdgeElement.h b/src/CollisionAlgorithm/elements/EdgeElement.h
@@ -5,7 +5,7 @@
 
 namespace sofa::collisionalgorithm {
 
-class EdgeElement : public BaseElement {
+class SOFA_COLLISIONALGORITHM_API EdgeElement : public BaseElement {
 public:
     typedef std::shared_ptr<EdgeElement> SPtr;
 
diff --git a/src/CollisionAlgorithm/elements/PointElement.cpp b/src/CollisionAlgorithm/elements/PointElement.cpp
@@ -6,6 +6,8 @@
 
 namespace sofa::collisionalgorithm {
 
+template class SOFA_COLLISIONALGORITHM_API ElementContainer<PointElement>;
+
 PointElement::SPtr PointElement::create(const BaseProximity::SPtr &prox) {
     return PointElement::SPtr(new PointElement(prox));
 }
diff --git a/src/CollisionAlgorithm/elements/PointElement.h b/src/CollisionAlgorithm/elements/PointElement.h
@@ -5,7 +5,7 @@
 
 namespace sofa::collisionalgorithm {
 
-class PointElement : public BaseElement {
+class SOFA_COLLISIONALGORITHM_API PointElement : public BaseElement {
 public:
 
     typedef std::shared_ptr<PointElement> SPtr;
diff --git a/src/CollisionAlgorithm/elements/TetrahedronElement.cpp b/src/CollisionAlgorithm/elements/TetrahedronElement.cpp
@@ -6,6 +6,8 @@
 
 namespace sofa::collisionalgorithm {
 
+template class SOFA_COLLISIONALGORITHM_API ElementContainer<TetrahedronElement>;
+
 TetrahedronElement::SPtr TetrahedronElement::create(PointElement::SPtr p0,PointElement::SPtr p1,PointElement::SPtr p2,PointElement::SPtr p3,
                                                     EdgeElement::SPtr e0, EdgeElement::SPtr e1, EdgeElement::SPtr e2, EdgeElement::SPtr e3,EdgeElement::SPtr e4,EdgeElement::SPtr e5,
                                                     TriangleElement::SPtr tri0, TriangleElement::SPtr tri1, TriangleElement::SPtr tri2, TriangleElement::SPtr tri3) {
diff --git a/src/CollisionAlgorithm/elements/TetrahedronElement.h b/src/CollisionAlgorithm/elements/TetrahedronElement.h
@@ -5,7 +5,7 @@
 
 namespace sofa::collisionalgorithm {
 
-class TetrahedronElement : public BaseElement {
+class SOFA_COLLISIONALGORITHM_API TetrahedronElement : public BaseElement {
 public:
     typedef std::shared_ptr<TetrahedronElement> SPtr;
 
diff --git a/src/CollisionAlgorithm/elements/TriangleElement.cpp b/src/CollisionAlgorithm/elements/TriangleElement.cpp
@@ -6,6 +6,8 @@
 
 namespace sofa::collisionalgorithm {
 
+template class SOFA_COLLISIONALGORITHM_API ElementContainer<TriangleElement>;
+
 TriangleElement::SPtr TriangleElement::create(BaseProximity::SPtr prox0, BaseProximity::SPtr prox1,BaseProximity::SPtr prox2) {
     PointElement::SPtr p0 = PointElement::create(prox0);
     PointElement::SPtr p1 = PointElement::create(prox1);
diff --git a/src/CollisionAlgorithm/elements/TriangleElement.h b/src/CollisionAlgorithm/elements/TriangleElement.h
@@ -5,7 +5,7 @@
 
 namespace sofa::collisionalgorithm {
 
-class TriangleElement : public BaseElement {
+class SOFA_COLLISIONALGORITHM_API TriangleElement : public BaseElement {
 public:
     typedef std::shared_ptr<TriangleElement> SPtr;
 
diff --git a/src/CollisionAlgorithm/filters/DistanceFilter.h b/src/CollisionAlgorithm/filters/DistanceFilter.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/BaseAlgorithm.h>
 
 namespace sofa::collisionalgorithm {
@@ -8,7 +9,7 @@ namespace sofa::collisionalgorithm {
  * \brief The DistanceFilter class
  * accepts proximities which positions are within a limited distance from each other
  */
-class DistanceFilter : public BaseAlgorithm::BaseFilter {
+class SOFA_COLLISIONALGORITHM_API DistanceFilter : public BaseAlgorithm::BaseFilter {
 public:
     SOFA_CLASS(DistanceFilter, BaseFilter);
 
diff --git a/src/CollisionAlgorithm/geometry/EdgeGeometry.cpp b/src/CollisionAlgorithm/geometry/EdgeGeometry.cpp
@@ -1,8 +1,12 @@
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/geometry/EdgeGeometry.h>
 #include <sofa/core/ObjectFactory.h>
 
 namespace sofa::collisionalgorithm
 {
+
+template class SOFA_COLLISIONALGORITHM_API EdgeGeometry<sofa::defaulttype::Vec3dTypes>;
+
 void registerEdgeGeometry(sofa::core::ObjectFactory* factory)
 {
     factory->registerObjects(
diff --git a/src/CollisionAlgorithm/geometry/PointGeometry.cpp b/src/CollisionAlgorithm/geometry/PointGeometry.cpp
@@ -1,8 +1,12 @@
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/geometry/PointGeometry.h>
 #include <sofa/core/ObjectFactory.h>
 
 namespace sofa::collisionalgorithm
 {
+
+template class SOFA_COLLISIONALGORITHM_API PointGeometry<sofa::defaulttype::Vec3dTypes>;
+
 void registerPointGeometry(sofa::core::ObjectFactory* factory)
 {
     factory->registerObjects(
diff --git a/src/CollisionAlgorithm/geometry/SubsetGeometry.cpp b/src/CollisionAlgorithm/geometry/SubsetGeometry.cpp
@@ -1,8 +1,12 @@
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/geometry/SubsetGeometry.h>
 #include <sofa/core/ObjectFactory.h>
 
 namespace sofa::collisionalgorithm
 {
+
+template class SOFA_COLLISIONALGORITHM_API SubsetGeometry<sofa::defaulttype::Vec3dTypes>;
+
 void registerSubsetGeometry(sofa::core::ObjectFactory* factory)
 {
     factory->registerObjects(
diff --git a/src/CollisionAlgorithm/geometry/TetrahedronGeometry.cpp b/src/CollisionAlgorithm/geometry/TetrahedronGeometry.cpp
@@ -1,8 +1,12 @@
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/geometry/TetrahedronGeometry.h>
 #include <sofa/core/ObjectFactory.h>
 
 namespace sofa::collisionalgorithm
 {
+
+template class SOFA_COLLISIONALGORITHM_API TetrahedronGeometry<sofa::defaulttype::Vec3dTypes>;
+
 void registerTetrahedronGeometry(sofa::core::ObjectFactory* factory)
 {
     factory->registerObjects(sofa::core::ObjectRegistrationData(
diff --git a/src/CollisionAlgorithm/geometry/TriangleGeometry.cpp b/src/CollisionAlgorithm/geometry/TriangleGeometry.cpp
@@ -1,8 +1,12 @@
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/geometry/TriangleGeometry.h>
 #include <sofa/core/ObjectFactory.h>
 
 namespace sofa::collisionalgorithm
 {
+
+template class SOFA_COLLISIONALGORITHM_API TriangleGeometry<sofa::defaulttype::Vec3dTypes>;
+
 void registerTriangleGeometry(sofa::core::ObjectFactory* factory)
 {
     factory->registerObjects(
diff --git a/src/CollisionAlgorithm/operations/ContainsPoint.h b/src/CollisionAlgorithm/operations/ContainsPoint.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/BaseElement.h>
 #include <CollisionAlgorithm/BaseOperation.h>
 
@@ -8,7 +9,7 @@ namespace sofa::collisionalgorithm::Operations::ContainsPointInElement
 
 typedef bool Result;
 
-class Operation : public GenericOperation<Operation,  // Type of the operation
+class SOFA_COLLISIONALGORITHM_API Operation : public GenericOperation<Operation,  // Type of the operation
                                           Result,     // Default return type
                                           const type::Vec3&, const BaseElement::SPtr&  // Parameters
                                           >
@@ -33,7 +34,7 @@ namespace sofa::collisionalgorithm::Operations::ContainsPointInProximity
 
 typedef bool Result;
 
-class Operation
+class SOFA_COLLISIONALGORITHM_API Operation
     : public GenericOperation<Operation,  // Type of the operation
                               Result,     // Default return type
                               const type::Vec3&, const BaseProximity::SPtr&  // Parameters
diff --git a/src/CollisionAlgorithm/operations/CreateCenterProximity.h b/src/CollisionAlgorithm/operations/CreateCenterProximity.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/BaseProximity.h>
 #include <CollisionAlgorithm/BaseOperation.h>
 #include <CollisionAlgorithm/elements/EdgeElement.h>
@@ -9,7 +10,7 @@ namespace sofa::collisionalgorithm::Operations::CreateCenterProximity {
 
 typedef BaseProximity::SPtr Result;
 
-class Operation : public GenericOperation<Operation, //type of operation
+class SOFA_COLLISIONALGORITHM_API Operation : public GenericOperation<Operation, //type of operation
                                           Result, //Default return type
                                           const BaseElement::SPtr &//Parameters
                                           > {
diff --git a/src/CollisionAlgorithm/operations/FindClosestProximity.h b/src/CollisionAlgorithm/operations/FindClosestProximity.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <CollisionAlgorithm/config.h>
 #include <CollisionAlgorithm/BaseProximity.h>
 #include <CollisionAlgorithm/BaseOperation.h>
 #include <limits.h>
@@ -11,7 +12,7 @@ typedef BaseProximity::SPtr Result;
 typedef std::function<bool(const BaseProximity::SPtr&,const BaseProximity::SPtr&)> FilterFUNC;
 
 //Specific operation to find the closest point on a geometry (the code is in the c++ class)
-class Operation : public Operations::GenericOperation<Operation,//operation type
+class SOFA_COLLISIONALGORITHM_API Operation : public Operations::GenericOperation<Operation,//operation type
                                                       Result, // default return
                                                       const BaseProximity::SPtr &,BaseGeometry *, Operations::Project::FUNC, FilterFUNC // parameters
                                                       > {
diff --git a/src/CollisionAlgorithm/operations/NeedleOperations.h b/src/CollisionAlgorithm/operations/NeedleOperations.h
diff --git a/src/CollisionAlgorithm/operations/Project.h b/src/CollisionAlgorithm/operations/Project.h
diff --git a/src/CollisionAlgorithm/proximity/EdgeProximity.h b/src/CollisionAlgorithm/proximity/EdgeProximity.h
diff --git a/src/CollisionAlgorithm/proximity/FixedProximity.h b/src/CollisionAlgorithm/proximity/FixedProximity.h
diff --git a/src/CollisionAlgorithm/proximity/MechanicalProximity.h b/src/CollisionAlgorithm/proximity/MechanicalProximity.h
diff --git a/src/CollisionAlgorithm/proximity/MultiProximity.h b/src/CollisionAlgorithm/proximity/MultiProximity.h
diff --git a/src/CollisionAlgorithm/proximity/PointProximity.h b/src/CollisionAlgorithm/proximity/PointProximity.h
diff --git a/src/CollisionAlgorithm/proximity/TetrahedronProximity.h b/src/CollisionAlgorithm/proximity/TetrahedronProximity.h
diff --git a/src/CollisionAlgorithm/proximity/TriangleProximity.h b/src/CollisionAlgorithm/proximity/TriangleProximity.h
diff --git a/src/CollisionAlgorithm/toolbox/EdgeToolBox.h b/src/CollisionAlgorithm/toolbox/EdgeToolBox.h
diff --git a/src/CollisionAlgorithm/toolbox/PointToolBox.h b/src/CollisionAlgorithm/toolbox/PointToolBox.h
diff --git a/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.h b/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.h
diff --git a/src/CollisionAlgorithm/toolbox/TriangleToolBox.h b/src/CollisionAlgorithm/toolbox/TriangleToolBox.h

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`namespace sofa::collisionalgorithm`
`16`	`16`	`{`
`17`	`17`
`18`		`-class InsertionAlgorithm : public BaseAlgorithm`
	`18`	`+class SOFA_COLLISIONALGORITHM_API InsertionAlgorithm : public BaseAlgorithm`
`19`	`19`	`{`
`20`	`20`	`public:`
`21`	`21`	`SOFA_CLASS(InsertionAlgorithm, BaseAlgorithm);`