[Contact] Clean FrictionContact (sofa-framework#5261)

* [Contact] Replace double by SReal * add override keyword on destructor
bakpaul · Feb 12, 2025 · d2f194d · d2f194d
1 parent 62264fb
commit d2f194d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ollision/Response/Contact/src/sofa/component/collision/response/contact/FrictionContact.h b/...ollision/Response/Contact/src/sofa/component/collision/response/contact/FrictionContact.h
@@ -49,12 +49,12 @@ class FrictionContact : public BaseUnilateralContactResponse<TCollisionModel1,
     typedef core::behavior::MechanicalState<DataTypes1> MechanicalState1;
     typedef core::behavior::MechanicalState<DataTypes2> MechanicalState2;
 
-    Data<double> d_mu; ///< friction parameter
+    Data<SReal> d_mu; ///< friction parameter
 
     FrictionContact();
     FrictionContact(CollisionModel1* model1, CollisionModel2* model2, Intersection* intersectionMethod);
 
-    virtual ~FrictionContact() = default;
+    ~FrictionContact() override = default;
 
     virtual constraint::lagrangian::model::UnilateralLagrangianContactParameters getParameterFromDatas() const override;
     virtual void setupConstraint(MechanicalState1 *,MechanicalState2 *) override;

diff --git a/...lision/Response/Contact/src/sofa/component/collision/response/contact/FrictionContact.inl b/...lision/Response/Contact/src/sofa/component/collision/response/contact/FrictionContact.inl
@@ -42,7 +42,7 @@ FrictionContact<TCollisionModel1,TCollisionModel2,ResponseDataTypes>::FrictionCo
 template < class TCollisionModel1, class TCollisionModel2, class ResponseDataTypes  >
 FrictionContact<TCollisionModel1,TCollisionModel2,ResponseDataTypes>::FrictionContact(CollisionModel1* model1, CollisionModel2* model2, Intersection* intersectionMethod)
     : BaseUnilateralContactResponse<TCollisionModel1, TCollisionModel2, constraint::lagrangian::model::UnilateralLagrangianContactParameters, ResponseDataTypes>(model1,model2,intersectionMethod)
-      , d_mu (initData(&d_mu, 0.8, "mu", "Friction coefficient (0 for frictionless contacts)"))
+      , d_mu (initData(&d_mu, 0.8_sreal, "mu", "Friction coefficient (0 for frictionless contacts)"))
 {
 
 }