[SofaBaseTopology] Change callback names in TopologyData

sofa-framework · Jun 11, 2021 · 61f07e6 · 61f07e6
1 parent 78cee81
commit 61f07e6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/SofaKernel/modules/SofaBaseTopology/src/SofaBaseTopology/TopologyData.h b/SofaKernel/modules/SofaBaseTopology/src/SofaBaseTopology/TopologyData.h
@@ -114,7 +114,7 @@ class TopologyData : public sofa::core::topology::BaseTopologyData<VecT>
     * This is only to specify a specific behevior/computation when removing an element from this container. Otherwise normal deletion is applyed.
     * Parameters are @param Index of the element which is detroyed and @value_type value hold by this container.
     */
-    void applyDestroyFunction(std::function<void(Index, value_type&)> func) { m_DestroyFunction = func; }
+    void setDestructionCallback(std::function<void(Index, value_type&)> func) { p_onDestructionCallback = func; }
 
     /** Method to add a callback when a element is created in this container. It will be called by @sa add method for example.
     * This is only to specify a specific behevior/computation when adding an element in this container. Otherwise default constructor of the element is used.
@@ -124,10 +124,10 @@ class TopologyData : public sofa::core::topology::BaseTopologyData<VecT>
     * @param List of ancestor indices.
     * @param List of coefficient respect to the ancestor indices.
     */
-    void applyCreateFunction(std::function<void(Index, value_type&, const TopologyElementType&, const sofa::helper::vector< Index >&, const sofa::helper::vector< double >&)> func) { m_CreateFunction = func; }
+    void setCreationCallback(std::function<void(Index, value_type&, const TopologyElementType&, const sofa::helper::vector< Index >&, const sofa::helper::vector< double >&)> func) { p_onCreationCallback = func; }
 
-    std::function<void(Index, value_type&)> m_DestroyFunction;
-    std::function<void(Index, value_type&, const TopologyElementType&, const sofa::helper::vector< Index >&, const sofa::helper::vector< double >&)> m_CreateFunction;
+    std::function<void(Index, value_type&)> p_onDestructionCallback;
+    std::function<void(Index, value_type&, const TopologyElementType&, const sofa::helper::vector< Index >&, const sofa::helper::vector< double >&)> p_onCreationCallback;
 
     ////////////////////////////////////// DEPRECATED ///////////////////////////////////////////
     SOFA_ATTRIBUTE_DISABLED("v21.06 (PR#2082)", "v21.06 (PR#2082)", "This method has been removed as it is not part of the new topology change design.")

diff --git a/SofaKernel/modules/SofaBaseTopology/src/SofaBaseTopology/TopologyData.inl b/SofaKernel/modules/SofaBaseTopology/src/SofaBaseTopology/TopologyData.inl
@@ -206,9 +206,9 @@ void TopologyData <TopologyElementType, VecT>::remove(const sofa::helper::vector
                 this->m_topologyHandler->applyDestroyFunction(index[i], data[index[i]]);
             }
 
-            if (m_DestroyFunction)
+            if (p_onDestructionCallback)
             {
-                m_DestroyFunction(index[i], data[index[i]]);
+                p_onDestructionCallback(index[i], data[index[i]]);
             }
 
             this->swap(index[i], last);
@@ -258,9 +258,9 @@ void TopologyData <TopologyElementType, VecT>::add(const sofa::helper::vector<In
                     (ancestors.empty() || coefs.empty()) ? empty_vecdouble : coefs[i],
                     (ancestorElems.empty()) ? nullptr : &ancestorElems[i]);
 
-            if (m_CreateFunction)
+            if (p_onCreationCallback)
             {
-                m_CreateFunction(Index(i0 + i), t, elems[i],
+                p_onCreationCallback(Index(i0 + i), t, elems[i],
                     (ancestors.empty() || coefs.empty()) ? empty_vecint : ancestors[i],
                     (ancestors.empty() || coefs.empty()) ? empty_vecdouble : coefs[i]);
             }

diff --git a/modules/SofaGeneralDeformable/src/SofaGeneralDeformable/TriangularBendingSprings.inl b/modules/SofaGeneralDeformable/src/SofaGeneralDeformable/TriangularBendingSprings.inl
@@ -434,7 +434,7 @@ void TriangularBendingSprings<DataTypes>::init()
     edgeInfo.linkToPointDataArray();
     edgeInfo.linkToTriangleDataArray();
 
-    edgeInfo.applyCreateFunction([this](Index edgeIndex, EdgeInformation& ei,
+    edgeInfo.setCreationCallback([this](Index edgeIndex, EdgeInformation& ei,
         const core::topology::BaseMeshTopology::Edge& edge,
         const sofa::helper::vector< Index >& ancestors,
         const sofa::helper::vector< double >& coefs)

diff --git a/modules/SofaMiscFem/src/SofaMiscFem/TriangularFEMForceField.inl b/modules/SofaMiscFem/src/SofaMiscFem/TriangularFEMForceField.inl
@@ -144,7 +144,7 @@ void TriangularFEMForceField<DataTypes>::init()
     edgeInfo.createTopologyHandler(m_topology);
     vertexInfo.createTopologyHandler(m_topology);
 
-    triangleInfo.applyCreateFunction([this](Index triangleIndex, TriangleInformation& triInfo,
+    triangleInfo.setCreationCallback([this](Index triangleIndex, TriangleInformation& triInfo,
         const core::topology::BaseMeshTopology::Triangle& triangle,
         const sofa::helper::vector< Index >& ancestors,
         const sofa::helper::vector< double >& coefs)