From b3c87034bc7303b49a2c80859707325c6e9e8571 Mon Sep 17 00:00:00 2001 From: epernod Date: Fri, 10 May 2024 16:55:46 +0200 Subject: [PATCH] [src] Fix compilation --- src/BeamAdapter/component/BeamInterpolation.h | 13 +++++++------ src/BeamAdapter/component/BeamInterpolation.inl | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/BeamAdapter/component/BeamInterpolation.h b/src/BeamAdapter/component/BeamInterpolation.h index 97ae8c71..1b64ec99 100644 --- a/src/BeamAdapter/component/BeamInterpolation.h +++ b/src/BeamAdapter/component/BeamInterpolation.h @@ -95,6 +95,7 @@ class BeamInterpolation : public virtual BaseBeamInterpolation using VecElementID = type::vector; using VecEdges = type::vector; + using BaseBeamInterpolation::d_componentState; public: BeamInterpolation() ; virtual ~BeamInterpolation() override = default; @@ -183,12 +184,12 @@ class BeamInterpolation : public virtual BaseBeamInterpolation virtual void addBeam(const BaseMeshTopology::EdgeID &eID , const Real &length, const Real &x0, const Real &x1, const Real &angle); virtual void getSamplingParameters(type::vector& xP_noticeable, type::vector& nbP_density) ; - virtual Real getRestTotalLength() ; - virtual void getCollisionSampling(Real &dx, const Real& x_localcurv_abs) ; - virtual void getNumberOfCollisionSegment(Real &dx, unsigned int &numLines) ; - virtual void getYoungModulusAtX(int beamId,Real& x_curv, Real& youngModulus, Real& cPoisson) ; - void setTransformBetweenDofAndNode(int beam, const Transform &DOF_H_Node, unsigned int zeroORone ) ; - virtual void getSplineRestTransform(unsigned int edgeInList, Transform &local_H_local0_rest, Transform &local_H_local1_rest); + Real getRestTotalLength() override; + void getCollisionSampling(Real &dx, const Real& x_localcurv_abs) override; + void getNumberOfCollisionSegment(Real &dx, unsigned int &numLines) override; + void getYoungModulusAtX(int beamId,Real& x_curv, Real& youngModulus, Real& cPoisson) override; + void setTransformBetweenDofAndNode(int beam, const Transform &DOF_H_Node, unsigned int zeroORone ); + void getSplineRestTransform(unsigned int edgeInList, Transform &local_H_local0_rest, Transform &local_H_local1_rest) override; /////////////////////////// Deprecated Methods ////////////////////////////////////////// [[deprecated("Releasing catheter or brokenIn2 mode is not anymore supported. Feature has been removed after release v23.06")]] diff --git a/src/BeamAdapter/component/BeamInterpolation.inl b/src/BeamAdapter/component/BeamInterpolation.inl index f46504a9..fc2ef364 100644 --- a/src/BeamAdapter/component/BeamInterpolation.inl +++ b/src/BeamAdapter/component/BeamInterpolation.inl @@ -184,9 +184,9 @@ void BeamInterpolation::bwdInit() DOF1TransformNode1.resize(edgeList.size()); } - ReadAccessor > statePos = m_mstate->read(ConstVecCoordId::position()) ; + ReadAccessor > statePos = this->m_mstate->read(ConstVecCoordId::position()) ; - auto lengthList = sofa::helper::getWriteOnlyAccessor(d_lengthList); + auto lengthList = sofa::helper::getWriteOnlyAccessor(this->d_lengthList); lengthList.clear(); const unsigned int edgeListSize = d_edgeList.getValue().size();