[Mapping.Linear] Use links instead of raw pointers (#4996)

* [Mapping.Linear] Use links instead of raw pointers * fix non-Windows compilation
sofa-framework · Sep 23, 2024 · 6b3f7e2 · 6b3f7e2
1 parent b5f6420
commit 6b3f7e2
Show file tree

Hide file tree

Showing 3 changed files with 153 additions and 126 deletions.
diff --git a/...omponent/Mapping/Linear/src/sofa/component/mapping/linear/Mesh2PointMechanicalMapping.cpp b/...omponent/Mapping/Linear/src/sofa/component/mapping/linear/Mesh2PointMechanicalMapping.cpp
@@ -33,10 +33,6 @@ using namespace sofa::defaulttype;
 
 int Mesh2PointMechanicalMappingClass = core::RegisterObject("Mechanical mapping between a set of mesh primitives (point, edge, triangle...) and a set of points generated by Mesh2PointTopologicalMapping")
         .add< Mesh2PointMechanicalMapping< Vec3Types, Vec3Types > >()
-
-
-
-//.addAlias("SimpleTesselatedTetraMechanicalMapping")
         ;
 
 

diff --git a/.../Component/Mapping/Linear/src/sofa/component/mapping/linear/Mesh2PointMechanicalMapping.h b/.../Component/Mapping/Linear/src/sofa/component/mapping/linear/Mesh2PointMechanicalMapping.h
@@ -76,10 +76,9 @@ class Mesh2PointMechanicalMapping : public LinearMapping<TIn, TOut>
 
     void applyJT(const core::ConstraintParams *cparams, Data<InMatrixDeriv>& out, const Data<OutMatrixDeriv>& in) override;
 
-protected:
-    Mesh2PointTopologicalMapping* topoMap;
-    core::topology::BaseMeshTopology* inputTopo;
-    core::topology::BaseMeshTopology* outputTopo;
+    SingleLink<Mesh2PointMechanicalMapping, Mesh2PointTopologicalMapping, BaseLink::FLAG_STOREPATH|BaseLink::FLAG_STRONGLINK> l_topologicalMapping;
+    SingleLink<Mesh2PointMechanicalMapping, core::topology::BaseMeshTopology, BaseLink::FLAG_STOREPATH|BaseLink::FLAG_STRONGLINK> l_inputTopology;
+    SingleLink<Mesh2PointMechanicalMapping, core::topology::BaseMeshTopology, BaseLink::FLAG_STOREPATH|BaseLink::FLAG_STRONGLINK> l_outputTopology;
 };