Clean data fields in DifferenceMultiMapping & RigidDistanceMapping

SofaDefrost · Jul 22, 2024 · 4e7713d · 4e7713d
1 parent 2816a42
commit 4e7713d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/src/Cosserat/mapping/DifferenceMultiMapping.h b/src/Cosserat/mapping/DifferenceMultiMapping.h
@@ -89,11 +89,12 @@ class DifferenceMultiMapping : public sofa::core::Multi2Mapping<TIn1, TIn2, TOut
     //Input data
     sofa::Data<vector<Rigid>>                 d_direction;
     sofa::Data<vector<unsigned int>>          d_indices;
-    sofa::Data<double>                        d_radius;
-    sofa::Data<sofa::type::Vec4f>             d_color;
-    sofa::Data<bool>                          d_drawArrows;
+    sofa::Data<SReal>                         d_radius;
+    sofa::Data<sofa::type::RGBAColor>         d_color;
     sofa::Data<bool>                          d_lastPointIsFixed;
 
+    sofa::Data<bool>                          d_drawArrows;
+
 protected:   
     sofa::core::State<In1>* m_fromModel1;
     sofa::core::State<In2>* m_fromModel2;

diff --git a/src/Cosserat/mapping/DifferenceMultiMapping.inl b/src/Cosserat/mapping/DifferenceMultiMapping.inl
@@ -33,8 +33,8 @@ template <class TIn1, class TIn2, class TOut>
 DifferenceMultiMapping<TIn1, TIn2, TOut>::DifferenceMultiMapping()
     : d_direction(initData(&d_direction, "direction", "The list of directions of fix points .\n")),
     d_indices(initData(&d_indices, "indices", "Indices of fixe points of the cable")),
-    d_radius(initData(&d_radius, 2.0, "radius", "The size of the cable")),
-    d_color(initData(&d_color, sofa::type::Vec4f(1, 0, 0, 1), "color", "The color of the cable")),
+    d_radius(initData(&d_radius, (SReal)2.0, "radius", "The size of the cable")),
+    d_color(initData(&d_color, sofa::type::RGBAColor::red(), "color", "The color of the cable")),
     d_drawArrows(initData(&d_drawArrows, false, "drawArrows", "The color of the cable")),
     d_lastPointIsFixed(initData(&d_lastPointIsFixed, true, "lastPointIsFixed", "This select the last point as fixed of not,"
                                                                                "one.")),

diff --git a/src/Cosserat/mapping/RigidDistanceMapping.h b/src/Cosserat/mapping/RigidDistanceMapping.h
@@ -101,7 +101,6 @@ class RigidDistanceMapping : public sofa::core::Multi2Mapping<TIn1, TIn2, TOut>
     Data<SReal>                          d_min ;
     Data<SReal>                          d_radius ;
     Data<sofa::type::RGBAColor>          d_color;
-    Data<vector<unsigned int> >   d_index;
     Data<bool>                          d_debug ;
 
     sofa::core::State<Out>* m_toModel;

diff --git a/src/Cosserat/mapping/RigidDistanceMapping.inl b/src/Cosserat/mapping/RigidDistanceMapping.inl
@@ -40,8 +40,6 @@ RigidDistanceMapping<TIn1, TIn2, TOut>::RigidDistanceMapping()
     , d_min(initData(&d_min, (SReal)0.0, "min", "the minimum of the deformation"))
     , d_radius(initData(&d_radius, (SReal)3.0, "radius", "the axis in which we want to show the deformation"))
     , d_color(initData(&d_color, RGBAColor{1, 0., 1., 0.8} ,"color", "The default beam color"))
-    , d_index(initData(&d_index, "index", "if this parameter is false, you draw the beam with color "
-                                          "according to the force apply to each beam"))    
     , d_debug(initData(&d_debug, false, "debug", "show debug output."))
     , m_toModel(NULL)
 {