diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.h b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.h index c0198536671..f6136578c85 100644 --- a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.h +++ b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.h @@ -52,18 +52,6 @@ namespace sofa::component::constraint::lagrangian::solver namespace sofa::component::animationloop { -using MechanicalGetConstraintResolutionVisitor -SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR("Use sofa::component::constraint::lagrangian::solver::MechanicalGetConstraintResolutionVisitor instead.") -= sofa::component::constraint::lagrangian::solver::MechanicalGetConstraintResolutionVisitor; - -using MechanicalSetConstraint -SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR("Use sofa::simulation::mechanicalvisitor::MechanicalBuildConstraintMatrix instead.") -= sofa::simulation::mechanicalvisitor::MechanicalBuildConstraintMatrix; - -using MechanicalAccumulateConstraint2 -SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR("Use sofa::simulation::mechanicalvisitor::MechanicalAccumulateMatrixDeriv instead.") -= sofa::simulation::mechanicalvisitor::MechanicalAccumulateMatrixDeriv; - class SOFA_COMPONENT_ANIMATIONLOOP_API ConstraintProblem { protected: diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.cpp b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.cpp index 4c4d97b1edb..d1571e8182c 100644 --- a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.cpp +++ b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.cpp @@ -78,8 +78,6 @@ FreeMotionAnimationLoop::FreeMotionAnimationLoop() : { d_parallelCollisionDetectionAndFreeMotion.setGroup("Multithreading"); d_parallelODESolving.setGroup("Multithreading"); - - m_solveVelocityConstraintFirst.setOriginalData(&d_solveVelocityConstraintFirst); } FreeMotionAnimationLoop::~FreeMotionAnimationLoop() @@ -173,7 +171,7 @@ void FreeMotionAnimationLoop::step(const sofa::core::ExecParams* params, SReal d cparams.setV(freeVel); cparams.setDx(l_constraintSolver->getDx()); cparams.setLambda(l_constraintSolver->getLambda()); - cparams.setOrder(m_solveVelocityConstraintFirst.getValue() ? core::ConstraintOrder::VEL : core::ConstraintOrder::POS_AND_VEL); + cparams.setOrder(d_solveVelocityConstraintFirst.getValue() ? core::ConstraintOrder::VEL : core::ConstraintOrder::POS_AND_VEL); MultiVecDeriv dx(&vop, core::vec_id::write_access::dx); dx.realloc(&vop, !d_threadSafeVisitor.getValue(), true); diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.h b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.h index 10347815e02..d5300de6b2c 100644 --- a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.h +++ b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.h @@ -24,7 +24,6 @@ #include #include -#include namespace sofa::core::behavior { @@ -43,10 +42,6 @@ class SOFA_COMPONENT_ANIMATIONLOOP_API FreeMotionAnimationLoop : public sofa::si void step (const sofa::core::ExecParams* params, SReal dt) override; void init() override; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP() - sofa::core::objectmodel::lifecycle::RenamedData m_solveVelocityConstraintFirst; - Data d_solveVelocityConstraintFirst; ///< solve separately velocity constraint violations before position constraint violations Data d_threadSafeVisitor; ///< If true, do not use realloc and free visitors in fwdInteractionForceField. Data d_parallelCollisionDetectionAndFreeMotion; ///< If true, executes free motion step and collision detection step in parallel. diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.cpp b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.cpp index e821df4eb90..fbb409c4dd5 100644 --- a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.cpp +++ b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.cpp @@ -53,8 +53,6 @@ MultiStepAnimationLoop::MultiStepAnimationLoop() : d_collisionSteps( initData(&d_collisionSteps,1,"collisionSteps", "number of collision steps between each frame rendering") ) , d_integrationSteps( initData(&d_integrationSteps,1,"integrationSteps", "number of integration steps between each collision detection") ) { - collisionSteps.setOriginalData(&d_collisionSteps); - integrationSteps.setOriginalData(&d_integrationSteps); } MultiStepAnimationLoop::~MultiStepAnimationLoop() diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.h b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.h index 62c2a5e6ad8..1a71de83df1 100644 --- a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.h +++ b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.h @@ -25,7 +25,6 @@ #include #include -#include namespace sofa::component::animationloop { @@ -42,12 +41,6 @@ class SOFA_COMPONENT_ANIMATIONLOOP_API MultiStepAnimationLoop : public sofa::sim public: void step (const sofa::core::ExecParams* params, SReal dt) override; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP() - sofa::core::objectmodel::lifecycle::RenamedData collisionSteps; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP() - sofa::core::objectmodel::lifecycle::RenamedData integrationSteps; - Data d_collisionSteps; ///< number of collision steps between each frame rendering Data d_integrationSteps; ///< number of integration steps between each collision detection }; diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/config.h.in b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/config.h.in index 1398890e58d..ca68b9ec351 100644 --- a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/config.h.in +++ b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/config.h.in @@ -31,24 +31,6 @@ # define SOFA_COMPONENT_ANIMATIONLOOP_API SOFA_IMPORT_DYNAMIC_LIBRARY #endif -#ifdef SOFA_BUILD_SOFA_COMPONENT_ANIMATIONLOOP -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif - -#ifdef SOFA_BUILD_SOFA_COMPONENT_ANIMATIONLOOP -#define SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR(msg) -#else -#define SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR(msg) \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.06", "v24.12", \ - msg) -#endif - namespace sofa::component::animationloop { constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.cpp b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.cpp index 56d134f35f0..ee2ce51a2a2 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.cpp +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.cpp @@ -37,9 +37,6 @@ void registerBruteForceBroadPhase(sofa::core::ObjectFactory* factory) BruteForceBroadPhase::BruteForceBroadPhase() : d_box(initData(&d_box, "box", "if not empty, objects that do not intersect this bounding-box will be ignored")) { - - box.setOriginalData (&d_box); - } void BruteForceBroadPhase::init() diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.h b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.h index ba8fe667fed..84380c1b89c 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.h +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.h @@ -24,7 +24,6 @@ #include #include #include -#include namespace sofa::component::collision::detection::algorithm { @@ -49,10 +48,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API BruteForceBroadPhase : pu ~BruteForceBroadPhase() override = default; private: - ///< if not empty, objects that do not intersect this bounding-box will be ignored - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM() - sofa::core::objectmodel::lifecycle::RenamedData > box; - Data > d_box; ///< if not empty, objects that do not intersect this bounding-box will be ignored diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.cpp b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.cpp index faba87de96e..e8e991d9a37 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.cpp +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.cpp @@ -132,7 +132,6 @@ IncrSAP::IncrSAP() :d_box(initData(&d_box, "box", "if not empty, objects that do not intersect this bounding-box will be ignored")), _nothing_added(true) { - box.setOriginalData ( &d_box); } diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.h b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.h index aff6b8b8b6d..e883d3542db 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.h +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.h @@ -42,9 +42,6 @@ #include #include -#include - - namespace sofa::component::collision::detection::algorithm { @@ -211,12 +208,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API IncrSAP : */ void purge(); - SOFA_ATTRIBUTE_DEPRECATED__REMOVE_BDRAW_DATA() - core::objectmodel::lifecycle::DeprecatedData bDraw {this, "v24.06", "v24.12", "draw", "This Data was not used"}; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM() - sofa::core::objectmodel::lifecycle::RenamedData< type::fixed_array > box; ///< if not empty, objects that do not intersect this bounding-box will be ignored - Data< type::fixed_array > d_box; ///< if not empty, objects that do not intersect this bounding-box will be ignored collision::geometry::CubeCollisionModel::SPtr boxModel; @@ -254,10 +245,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API IncrSAP : ~IncrSAP() override; public: - - SOFA_ATTRIBUTE_DEPRECATED__REMOVE_BDRAW_DATA() - void setDraw(bool) {} - void init() override; void reinit() override; diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/config.h.in b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/config.h.in index e2d916b8e87..4fff7a8b8fc 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/config.h.in +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/config.h.in @@ -31,24 +31,6 @@ # define SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API SOFA_IMPORT_DYNAMIC_LIBRARY #endif -#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM() \ - SOFA_ATTRIBUTE_DEPRECATED(\ - "v24.06", "v24.12",\ - "data renamed according to the guidelines") -#endif - -#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM -#define SOFA_ATTRIBUTE_DEPRECATED__REMOVE_BDRAW_DATA() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__REMOVE_BDRAW_DATA() \ - SOFA_ATTRIBUTE_DEPRECATED(\ - "v24.06", "v24.12",\ - "This Data was not used") -#endif - namespace sofa::component::collision::detection::algorithm { constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.cpp b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.cpp index 12c7e592cd8..55c955f3e94 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.cpp +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.cpp @@ -32,9 +32,6 @@ BaseProximityIntersection::BaseProximityIntersection() { d_alarmDistance.setRequired(true); d_contactDistance.setRequired(true); - - alarmDistance.setOriginalData(&d_alarmDistance); - contactDistance.setOriginalData(&d_contactDistance); } diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.h b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.h index c7a336c1499..b34c9751e42 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.h +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.h @@ -25,9 +25,6 @@ #include #include -#include - - namespace sofa::component::collision::detection::intersection { @@ -40,12 +37,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API BaseProximityIntersect { public: SOFA_ABSTRACT_CLASS(BaseProximityIntersection,DiscreteIntersection); - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::lifecycle::RenamedData alarmDistance; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::lifecycle::RenamedData contactDistance; - Data d_alarmDistance; ///< Distance above which the intersection computations ignores the proximity pair. This distance can also be used in some broad phase algorithms to reduce the search area Data d_contactDistance; ///< Distance below which a contact is created diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.cpp b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.cpp index 99a020d46d6..5b1693a0316 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.cpp +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.cpp @@ -58,10 +58,6 @@ LocalMinDistance::LocalMinDistance() , d_coneFactor(initData(&d_coneFactor, 0.5, "coneFactor", "Factor for filtering cone angle computation")) , d_useLMDFilters(initData(&d_useLMDFilters, false, "useLMDFilters", "Use external cone computation")) { - filterIntersection.setOriginalData(&d_filterIntersection); - angleCone.setOriginalData(&d_angleCone); - coneFactor.setOriginalData(&d_coneFactor); - useLMDFilters.setOriginalData(&d_useLMDFilters); } void LocalMinDistance::init() diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.h b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.h index 38f5709cbac..8c6591f95df 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.h +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.h @@ -31,8 +31,6 @@ #include #include -#include - namespace sofa::component::collision::detection::intersection { @@ -63,19 +61,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API LocalMinDistance : pub typedef core::collision::IntersectorFactory IntersectorFactory; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::lifecycle::RenamedData filterIntersection; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::lifecycle::RenamedData angleCone; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::lifecycle::RenamedData coneFactor; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::lifecycle::RenamedData useLMDFilters; - - Data d_filterIntersection; ///< Activate LMD filter Data d_angleCone; ///< Filtering cone extension angle Data d_coneFactor; ///< Factor for filtering cone angle computation diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MinProximityIntersection.cpp b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MinProximityIntersection.cpp index 3c44a14833c..00cb5dc97bb 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MinProximityIntersection.cpp +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MinProximityIntersection.cpp @@ -53,11 +53,6 @@ MinProximityIntersection::MinProximityIntersection() , d_useLinePoint(initData(&d_useLinePoint, true, "useLinePoint", "activate Line-Point intersection tests")) , d_useLineLine(initData(&d_useLineLine, true, "useLineLine", "activate Line-Line intersection tests")) { - useSphereTriangle.setOriginalData(&d_useSphereTriangle); - usePointPoint.setOriginalData(&d_usePointPoint); - useLinePoint.setOriginalData(&d_useLinePoint); - useLineLine.setOriginalData(&d_useLineLine); - useSurfaceNormals.setOriginalData(&d_useSurfaceNormals); } void MinProximityIntersection::init() diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MinProximityIntersection.h b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MinProximityIntersection.h index 144587cde24..b496be7302c 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MinProximityIntersection.h +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MinProximityIntersection.h @@ -24,8 +24,6 @@ #include -#include - namespace sofa::component::collision::detection::intersection { @@ -56,22 +54,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API MinProximityIntersecti { public: SOFA_CLASS(MinProximityIntersection,BaseProximityIntersection); - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::lifecycle::RenamedData useSphereTriangle; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::lifecycle::RenamedData usePointPoint; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::lifecycle::RenamedData useSurfaceNormals; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::lifecycle::RenamedData useLinePoint; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::lifecycle::RenamedData useLineLine; - - Data d_useSphereTriangle; ///< activate Sphere-Triangle intersection tests Data d_usePointPoint; ///< activate Point-Point intersection tests diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.cpp b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.cpp index b03e5b25c8e..0cfc03d0ec1 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.cpp +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.cpp @@ -48,7 +48,6 @@ NewProximityIntersection::NewProximityIntersection() : BaseProximityIntersection() , d_useLineLine(initData(&d_useLineLine, false, "useLineLine", "Line-line collision detection enabled")) { - useLineLine.setOriginalData(&d_useLineLine); } void NewProximityIntersection::init() diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.h b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.h index 3464e87c33b..67afc7d562c 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.h +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.h @@ -26,8 +26,6 @@ #include -#include - namespace sofa::component::collision::detection::intersection { @@ -57,8 +55,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API NewProximityIntersecti { public: SOFA_CLASS(NewProximityIntersection,BaseProximityIntersection); - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::lifecycle::RenamedData useLineLine; Data d_useLineLine; ///< Line-line collision detection enabled diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/config.h.in b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/config.h.in index 53b9ff3b8d3..3aab1e2cecb 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/config.h.in +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/config.h.in @@ -43,11 +43,3 @@ namespace sofa::component::collision::detection::intersection #define SOFA_ATTRIBUTE_DISABLED__COLLISION_DETECTION_INTERSECTION_AS_PARAMETER() \ SOFA_ATTRIBUTE_DISABLED("v24.06", "v24.12", "Intersection detection methods now needs the Intersection method as a parameter (see PR4916).") #endif - -#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() \ - SOFA_ATTRIBUTE_DEPRECATED("v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineModel.h b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineModel.h index 8b40670354a..cf4c7876a20 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineModel.h +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineModel.h @@ -27,9 +27,6 @@ #include #include -#include - - namespace sofa::component::collision::geometry { @@ -144,10 +141,6 @@ public : int getLineFlags(sofa::Index i); - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::lifecycle::RenamedData bothSide; - - Data d_bothSide; ///< activate collision on both side of the line model (when surface normals are defined on these lines) /// Pre-construction check method called by ObjectFactory. @@ -171,10 +164,6 @@ public : void computeBBox(const core::ExecParams* params, bool onlyVisible) override; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::lifecycle::RenamedData m_displayFreePosition; - - Data d_displayFreePosition; ///< Display Collision Model Points free position(in green) /// Link to be set to the topology container in the component graph. diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineModel.inl b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineModel.inl index 203537248e6..6afd879c636 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineModel.inl +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineModel.inl @@ -43,9 +43,6 @@ LineCollisionModel::LineCollisionModel() , mstate(nullptr), topology(nullptr), meshRevision(-1) { enum_type = LINE_TYPE; - - bothSide.setOriginalData(&d_bothSide); - m_displayFreePosition.setOriginalData(&d_displayFreePosition); } diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointModel.h b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointModel.h index bd22bf85fb4..65a5e5bcb9a 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointModel.h +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointModel.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::collision::geometry { @@ -103,10 +101,6 @@ class PointCollisionModel : public core::CollisionModel const Deriv& velocity(sofa::Index index) const; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::lifecycle::RenamedData bothSide; - - Data d_bothSide; ///< activate collision on both side of the point model (when surface normals are defined on these points) /// Pre-construction check method called by ObjectFactory. @@ -135,18 +129,11 @@ class PointCollisionModel : public core::CollisionModel core::behavior::MechanicalState* mstate; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::lifecycle::RenamedData computeNormals; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::lifecycle::RenamedData m_displayFreePosition; - Data d_computeNormals; ///< activate computation of normal vectors (required for some collision detection algorithms) + Data d_displayFreePosition; ///< Display Collision Model Points free position(in green) VecDeriv normals; - Data d_displayFreePosition; ///< Display Collision Model Points free position(in green) - /// Link to be set to the topology container in the component graph. SingleLink, sofa::core::topology::BaseMeshTopology, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_topology; diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointModel.inl b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointModel.inl index 45de29c5fc9..39ad779b32f 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointModel.inl +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointModel.inl @@ -41,10 +41,6 @@ PointCollisionModel::PointCollisionModel() , l_topology(initLink("topology", "link to the topology container")) { enum_type = POINT_TYPE; - - bothSide.setOriginalData(&d_bothSide); - computeNormals.setOriginalData(&d_computeNormals); - m_displayFreePosition.setOriginalData(&d_displayFreePosition); } template diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/RayModel.cpp b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/RayModel.cpp index 11ae9d32c43..502a3cac3f7 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/RayModel.cpp +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/RayModel.cpp @@ -42,7 +42,6 @@ RayCollisionModel::RayCollisionModel(SReal length) : d_defaultLength(initData(&d_defaultLength, length, "defaultLength", "The default length for all rays in this collision model")) { this->contactResponse.setValue("RayContact"); // use RayContact response class - defaultLength.setOriginalData(&d_defaultLength); } void RayCollisionModel::resize(sofa::Size size) diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/RayModel.h b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/RayModel.h index 75387b7df3c..e56dd5a6c59 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/RayModel.h +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/RayModel.h @@ -26,8 +26,6 @@ #include #include -#include - namespace sofa::component::collision::response::contact { class BaseRayContact; @@ -95,12 +93,6 @@ class SOFA_COMPONENT_COLLISION_GEOMETRY_API RayCollisionModel : public core::Col sofa::type::vector length; sofa::type::vector direction; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::lifecycle::RenamedData defaultLength; - - - - Data d_defaultLength; ///< The default length for all rays in this collision model std::set contacts; diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereModel.h b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereModel.h index a5f54206f4b..24f876caa67 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereModel.h +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereModel.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::collision::geometry { @@ -164,12 +162,6 @@ class SphereCollisionModel : public core::CollisionModel return obj; } - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::lifecycle::RenamedData< VecReal > radius; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::lifecycle::RenamedData defaultRadius; - Data< VecReal > d_radius; ///< Radius of each sphere Data< SReal > d_defaultRadius; ///< Default radius Data< bool > d_showImpostors; ///< Draw spheres as impostors instead of "real" spheres diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereModel.inl b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereModel.inl index 8ac59e58257..e36d3bfa6ae 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereModel.inl +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereModel.inl @@ -39,9 +39,6 @@ SphereCollisionModel::SphereCollisionModel() , mstate(nullptr) { enum_type = SPHERE_TYPE; - - radius.setOriginalData(&d_radius); - defaultRadius.setOriginalData(&d_defaultRadius); } template diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/config.h.in b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/config.h.in index 683a5a74ae2..5168625a495 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/config.h.in +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/config.h.in @@ -36,11 +36,3 @@ namespace sofa::component::collision::geometry constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::collision::geometry - -#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_GEOMETRY -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() \ - SOFA_ATTRIBUTE_DEPRECATED("v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BarycentricStickContact.h b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BarycentricStickContact.h index cb1347fc327..07da452b284 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BarycentricStickContact.h +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BarycentricStickContact.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::collision::response::contact { @@ -72,10 +70,6 @@ class BarycentricStickContact : public core::collision::Contact void setInteractionTags(MechanicalState1* mstate1, MechanicalState2* mstate2); public: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::lifecycle::RenamedData f_keepAlive; - Data d_keepAlive; ///< set to true to keep this contact alive even after collisions are no longer detected void cleanup() override; diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BarycentricStickContact.inl b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BarycentricStickContact.inl index 586754c7244..5a7aa8f3aec 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BarycentricStickContact.inl +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BarycentricStickContact.inl @@ -34,8 +34,6 @@ BarycentricStickContact::Ba { mapper1.setCollisionModel(model1); mapper2.setCollisionModel(model2); - - f_keepAlive.setOriginalData(&d_keepAlive); } template < class TCollisionModel1, class TCollisionModel2, class ResponseDataTypes > diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BaseUnilateralContactResponse.h b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BaseUnilateralContactResponse.h index cc1fcefa01f..514add26c00 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BaseUnilateralContactResponse.h +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BaseUnilateralContactResponse.h @@ -30,8 +30,6 @@ #include #include -#include - namespace sofa::component::collision::response::contact { template @@ -65,12 +63,6 @@ class BaseUnilateralContactResponse : public core::collision::Contact, public Co typename constraint::lagrangian::model::BaseContactLagrangianConstraint::SPtr m_constraint; core::objectmodel::BaseContext* parent; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::lifecycle::RenamedData mu; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::lifecycle::RenamedData tol; - Data d_tol; ///< tolerance for the constraints resolution (0 for default tolerance) std::vector< sofa::core::collision::DetectionOutput* > contacts; std::vector< std::pair< std::pair, double > > mappedContacts; diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BaseUnilateralContactResponse.inl b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BaseUnilateralContactResponse.inl index 31b2199f8c0..a1944236266 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BaseUnilateralContactResponse.inl +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/BaseUnilateralContactResponse.inl @@ -53,9 +53,6 @@ BaseUnilateralContactResponse diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.cpp b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.cpp index 05b8b827cae..c225ffa731c 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.cpp +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.cpp @@ -40,8 +40,6 @@ CollisionResponse::CollisionResponse() : d_response(initData(&d_response, "response", "contact response class")) , d_responseParams(initData(&d_responseParams, "responseParams", "contact response parameters (syntax: name1=value1&name2=value2&...)")) { - response.setOriginalData(&d_response); - responseParams.setOriginalData(&d_responseParams); } sofa::helper::OptionsGroup CollisionResponse::initializeResponseOptions(sofa::core::objectmodel::BaseContext *context) diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.h b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.h index 9e211e90ebd..9a6ee36d869 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.h +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::collision::response::contact { @@ -37,13 +35,6 @@ class SOFA_COMPONENT_COLLISION_RESPONSE_CONTACT_API CollisionResponse : public c public : SOFA_CLASS(CollisionResponse,sofa::core::collision::ContactManager); - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::lifecycle::RenamedData response; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::lifecycle::RenamedData responseParams; - - Data d_response; ///< contact response class Data d_responseParams; ///< contact response parameters (syntax: name1=value1&name2=value2&...) diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/RuleBasedContactManager.cpp b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/RuleBasedContactManager.cpp index 444c275cee4..dd16881ae9d 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/RuleBasedContactManager.cpp +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/RuleBasedContactManager.cpp @@ -40,7 +40,6 @@ RuleBasedContactManager::RuleBasedContactManager() "The last string define the response algorithm to use for contacts matched by this rule.\n" "Rules are applied in the order they are specified. If none match a given contact, the default response is used.\n")) { - rules.setOriginalData(&d_rules); } RuleBasedContactManager::~RuleBasedContactManager() diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/RuleBasedContactManager.h b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/RuleBasedContactManager.h index 920b5fe547b..8ad91b30cad 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/RuleBasedContactManager.h +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/RuleBasedContactManager.h @@ -23,7 +23,6 @@ #include #include -#include namespace sofa::component::collision::response::contact { @@ -103,13 +102,6 @@ class SOFA_COMPONENT_COLLISION_RESPONSE_CONTACT_API RuleBasedContactManager : pu } }; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::lifecycle::RenamedData< type::vector > rules; - - - - - Data< std::string > d_variables; ///< Define a list of variables to be used inside the rules Data< type::vector > d_rules; diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/StickContactConstraint.h b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/StickContactConstraint.h index cea3442ec71..c61561238a0 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/StickContactConstraint.h +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/StickContactConstraint.h @@ -31,8 +31,6 @@ #include #include -#include - namespace sofa::component::collision::response::contact { @@ -71,11 +69,8 @@ class StickContactConstraint : public core::collision::Contact, public ContactId StickContactConstraint(CollisionModel1* model1, CollisionModel2* model2, Intersection* intersectionMethod); ~StickContactConstraint() override; -public: - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::lifecycle::RenamedData f_keepAlive; - +public: Data d_keepAlive; ///< set to true to keep this contact alive even after collisions are no longer detected /// Return true if this contact should be kept alive, even if objects are no longer in collision @@ -84,7 +79,6 @@ class StickContactConstraint : public core::collision::Contact, public ContactId /// Control the keepAlive flag of the contact. void setKeepAlive(bool val) override { d_keepAlive.setValue(val); } - void cleanup() override; std::pair getCollisionModels() override { return std::make_pair(model1,model2); } diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/StickContactConstraint.inl b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/StickContactConstraint.inl index 1238b8d87ba..4bae2c031a5 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/StickContactConstraint.inl +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/StickContactConstraint.inl @@ -49,7 +49,6 @@ StickContactConstraint::StickContactConstrain mapper1.setCollisionModel(model1); mapper2.setCollisionModel(model2); this->f_printLog.setValue(true); - f_keepAlive.setOriginalData(&d_keepAlive); } template < class TCollisionModel1, class TCollisionModel2 > diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/config.h.in b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/config.h.in index bed4c4ef40a..8452734db98 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/config.h.in +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/config.h.in @@ -36,11 +36,3 @@ namespace sofa::component::collision::response::contact constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::collision::response::contact - -#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_RESPONSE_CONTACT -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() \ - SOFA_ATTRIBUTE_DEPRECATED("v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.h b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.h index b11b806ecc8..018dd80649b 100644 --- a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.h +++ b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.h @@ -113,13 +113,11 @@ class LinearSolverConstraintCorrection : public sofa::core::behavior::Constraint void getBlockDiagonalCompliance(linearalgebra::BaseMatrix* W, int begin, int end) override; protected: + //SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v25.12", "Further to #5017 use m_constraintMatrix instead") DeprecatedAndRemoved J; ///< use m_constraintMatrix instead linearalgebra::SparseMatrix m_constraintJacobian; - SOFA_ATTRIBUTE_DEPRECATED__FORCES_IN_LINEARSOLVERCONSTRAINTCORRECTION() - linearalgebra::FullVector F; ///< forces computed from the constraints - /** * @brief Convert the constraint matrix */ diff --git a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/PrecomputedConstraintCorrection.h b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/PrecomputedConstraintCorrection.h index 57c40841dbb..e602da86d46 100644 --- a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/PrecomputedConstraintCorrection.h +++ b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/PrecomputedConstraintCorrection.h @@ -30,8 +30,6 @@ #include #include -#include - namespace sofa::component::constraint::lagrangian::correction { @@ -60,24 +58,6 @@ class PrecomputedConstraintCorrection : public sofa::core::behavior::ConstraintC typedef typename Coord::value_type Real; typedef sofa::type::MatNoInit<3, 3, Real> Transformation; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::lifecycle::RenamedData m_rotations; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::lifecycle::RenamedData m_restRotations; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::lifecycle::RenamedData recompute; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::lifecycle::RenamedData debugViewFrameScale; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::lifecycle::RenamedData f_fileCompliance; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::lifecycle::RenamedData fileDir; - Data d_rotations; Data d_restRotations; diff --git a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/PrecomputedConstraintCorrection.inl b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/PrecomputedConstraintCorrection.inl index 70c9f637fb6..6479d64a016 100644 --- a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/PrecomputedConstraintCorrection.inl +++ b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/PrecomputedConstraintCorrection.inl @@ -65,13 +65,6 @@ PrecomputedConstraintCorrection::PrecomputedConstraintCorrection(sofa , nbRows(0), nbCols(0), dof_on_node(0), nbNodes(0) { this->addAlias(&d_fileCompliance, "filePrefix"); - - m_rotations.setOriginalData(&d_rotations); - m_restRotations.setOriginalData(&d_restRotations); - recompute.setOriginalData(&d_recompute); - debugViewFrameScale.setOriginalData(&d_debugViewFrameScale); - f_fileCompliance.setOriginalData(&d_fileCompliance); - fileDir.setOriginalData(&d_fileDir); } template diff --git a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/UncoupledConstraintCorrection.h b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/UncoupledConstraintCorrection.h index 4ee8641eb7d..f155af1da97 100644 --- a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/UncoupledConstraintCorrection.h +++ b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/UncoupledConstraintCorrection.h @@ -26,8 +26,6 @@ #include #include -#include - namespace sofa::component::constraint::lagrangian::correction { @@ -112,24 +110,12 @@ class UncoupledConstraintCorrection : public sofa::core::behavior::ConstraintCor /// @} - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::lifecycle::RenamedData< VecReal > compliance; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::lifecycle::RenamedData defaultCompliance; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::lifecycle::RenamedData f_verbose; - core::topology::PointData< VecReal > d_compliance; ///< Compliance value on each dof. If Rigid compliance (7 values): 1st value for translations, 6 others for upper-triangular part of symmetric 3x3 rotation compliance matrix Data< Real > d_defaultCompliance; ///< Default compliance value for new dof or if all should have the same (in which case compliance vector should be empty) - Data d_verbose; ///< Dump the constraint matrix at each iteration - Data< Real > d_correctionVelocityFactor; ///< Factor applied to the constraint forces when correcting the velocities Data< Real > d_correctionPositionFactor; ///< Factor applied to the constraint forces when correcting the positions - Data < bool > d_useOdeSolverIntegrationFactors; ///< Use odeSolver integration factors instead of correctionVelocityFactor and correctionPositionFactor /// Link to be set to the topology container in the component graph. diff --git a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/UncoupledConstraintCorrection.inl b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/UncoupledConstraintCorrection.inl index ebe49bd83c2..8df87408d89 100644 --- a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/UncoupledConstraintCorrection.inl +++ b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/UncoupledConstraintCorrection.inl @@ -173,11 +173,6 @@ UncoupledConstraintCorrection::UncoupledConstraintCorrection(sofa::co }, {} ); - - compliance.setOriginalData(&d_compliance); - defaultCompliance.setOriginalData(&d_defaultCompliance); - f_verbose.setOriginalData(&d_verbose); - } template diff --git a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/config.h.in b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/config.h.in index de54500fa95..37d1046afc0 100644 --- a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/config.h.in +++ b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/config.h.in @@ -36,21 +36,3 @@ namespace sofa::component::constraint::lagrangian::correction constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::constraint::lagrangian::correction - -#ifdef SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_CORRECTION -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif - -#ifdef SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_CORRECTION -#define SOFA_ATTRIBUTE_DEPRECATED__FORCES_IN_LINEARSOLVERCONSTRAINTCORRECTION() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__FORCES_IN_LINEARSOLVERCONSTRAINTCORRECTION() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Class member 'LinearSolverConstraintCorrection::F' is not used.") -#endif diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/AugmentedLagrangianResolution.h b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/AugmentedLagrangianResolution.h index 78ff8d7bb73..aef7bc197a4 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/AugmentedLagrangianResolution.h +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/AugmentedLagrangianResolution.h @@ -36,7 +36,10 @@ namespace sofa::component::constraint::lagrangian::model class AugmentedLagrangianResolution : public core::behavior::ConstraintResolution { public: - AugmentedLagrangianResolution(SReal epsilon) : core::behavior::ConstraintResolution(1), m_epsilon(epsilon) {} + AugmentedLagrangianResolution(SReal epsilon) : core::behavior::ConstraintResolution(1), m_epsilon(epsilon) + { + SOFA_UNUSED(m_epsilon); + } void resolution(int line, SReal** w, SReal* d, SReal* force, SReal* dfree) override { diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralInteractionConstraint.inl b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralInteractionConstraint.inl index 0d904f303e7..ad26424323a 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralInteractionConstraint.inl +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralInteractionConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.inl") diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.h b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.h index 5ea74b2fefa..4d7da7fdd4a 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.h +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.h @@ -34,8 +34,6 @@ #include #include - -#include #include namespace sofa::component::constraint::lagrangian::model @@ -98,18 +96,6 @@ class BilateralLagrangianConstraint : public PairInteractionConstraint cid; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::lifecycle::RenamedData > m1; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::lifecycle::RenamedData > m2; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::lifecycle::RenamedData restVector; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::lifecycle::RenamedData keepOrientDiff; - DataSubsetIndices d_m1; ///< index of the constraint on the first model DataSubsetIndices d_m2; ///< index of the constraint on the second model Data d_restVector; ///< Relative position to maintain between attached points (optional) diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.inl b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.inl index 25f677dc199..d8a9c374bee 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.inl +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.inl @@ -68,11 +68,6 @@ BilateralLagrangianConstraint::BilateralLagrangianConstraint(Mechanic }); this->f_listening.setValue(true); - - m1.setOriginalData(&d_m1); - m2.setOriginalData(&d_m2); - restVector.setOriginalData(&d_restVector); - keepOrientDiff.setOriginalData(&d_keepOrientDiff); } template diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/SlidingConstraint.inl b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/SlidingConstraint.inl index 6f6f92caa34..3d8d98dfe7e 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/SlidingConstraint.inl +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/SlidingConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/lagrangian/model/SlidingLagrangianConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/lagrangian/model/SlidingLagrangianConstraint.inl") diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperConstraint.inl b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperConstraint.inl index 4fee95d53af..1feed754ea7 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperConstraint.inl +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/lagrangian/model/StopperLagrangianConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/lagrangian/model/StopperLagrangianConstraint.inl") diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperLagrangianConstraint.h b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperLagrangianConstraint.h index 2b7b3413745..4d04c866b9c 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperLagrangianConstraint.h +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperLagrangianConstraint.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::constraint::lagrangian::model { @@ -87,17 +85,6 @@ class StopperLagrangianConstraint : public core::behavior::Constraint typedef core::objectmodel::Data DataMatrixDeriv; protected: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::lifecycle::RenamedData index; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::lifecycle::RenamedData min; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::lifecycle::RenamedData max; - - Data d_index; ///< index of the stop constraint Data d_min; ///< minimum value accepted Data d_max; ///< maximum value accepted diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperLagrangianConstraint.inl b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperLagrangianConstraint.inl index 2b67230da86..ec48235ed5e 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperLagrangianConstraint.inl +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperLagrangianConstraint.inl @@ -35,9 +35,6 @@ StopperLagrangianConstraint::StopperLagrangianConstraint(MechanicalSt , d_min(initData(&d_min, -100.0_sreal, "min", "minimum value accepted")) , d_max(initData(&d_max, 100.0_sreal, "max", "maximum value accepted")) { - index.setOriginalData(&d_index); - min.setOriginalData(&d_min); - max.setOriginalData(&d_max); } template diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/UniformConstraint.inl b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/UniformConstraint.inl index 73d1d67df04..a81314b636a 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/UniformConstraint.inl +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/UniformConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/lagrangian/model/UniformLagrangianConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/lagrangian/model/UniformLagrangianConstraint.inl") diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/UnilateralInteractionConstraint.inl b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/UnilateralInteractionConstraint.inl index 459646b7d63..04059d3d917 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/UnilateralInteractionConstraint.inl +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/UnilateralInteractionConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/lagrangian/model/UnilateralLagrangianConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/lagrangian/model/UnilateralLagrangianConstraint.inl") diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/config.h.in b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/config.h.in index 8d0b5acc531..0285000ee9a 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/config.h.in +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/config.h.in @@ -37,15 +37,6 @@ namespace sofa::component::constraint::lagrangian::model constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::constraint::lagrangian::model -#ifdef SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_MODEL -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif - #ifdef SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_MODEL #define SOFA_ATTRIBUTE_DEPRECATED__BILATERALREMOVEUNUSEDTOLERANCE() diff --git a/Sofa/Component/Constraint/Lagrangian/Model/tests/BilateralInteractionLagrangianConstraint_test.cpp b/Sofa/Component/Constraint/Lagrangian/Model/tests/BilateralInteractionLagrangianConstraint_test.cpp index 7b89636d391..e1f40f538e2 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/tests/BilateralInteractionLagrangianConstraint_test.cpp +++ b/Sofa/Component/Constraint/Lagrangian/Model/tests/BilateralInteractionLagrangianConstraint_test.cpp @@ -219,7 +219,7 @@ bool BilateralInteractionLangrangianConstraint_test::test_Vec3Constra if(meca.size()==2) { for(unsigned int i=0; iread(core::ConstVecCoordId::position())->getValue()[0]; + points[i] = meca[i]->read(core::vec_id::read_access::position)->getValue()[0]; } component::constraintset::GenericConstraintSolver *test; diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.cpp b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.cpp index 76ca66947d2..b90c05c6c71 100644 --- a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.cpp +++ b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.cpp @@ -114,22 +114,6 @@ GenericConstraintSolver::GenericConstraintSolver() d_maxIt.setRequired(true); d_tolerance.setRequired(true); - - maxIt.setOriginalData(&d_maxIt); - tolerance.setOriginalData(&d_tolerance); - sor.setOriginalData(&d_sor); - scaleTolerance.setOriginalData(&d_scaleTolerance); - allVerified.setOriginalData(&d_allVerified); - computeGraphs.setOriginalData(&d_computeGraphs); - graphErrors.setOriginalData(&d_graphErrors); - graphConstraints.setOriginalData(&d_graphConstraints); - graphForces.setOriginalData(&d_graphForces); - graphViolations.setOriginalData(&d_graphViolations); - currentNumConstraints.setOriginalData(&d_currentNumConstraints); - currentNumConstraintGroups.setOriginalData(&d_currentNumConstraintGroups); - currentIterations.setOriginalData(&d_currentIterations); - currentError.setOriginalData(&d_currentError); - reverseAccumulateOrder.setOriginalData(&d_reverseAccumulateOrder); } GenericConstraintSolver::~GenericConstraintSolver() diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.h b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.h index 55243ae5c5f..761ec076298 100644 --- a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.h +++ b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.h @@ -31,8 +31,6 @@ #include #include #include - -#include #include @@ -71,51 +69,6 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER_API GenericConstraintSolver : Data< ResolutionMethod > d_resolutionMethod; ///< Method used to solve the constraint problem, among: "ProjectedGaussSeidel", "UnbuiltGaussSeidel" or "for NonsmoothNonlinearConjugateGradient" - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData maxIt; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData tolerance; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData sor; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData scaleTolerance; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData allVerified; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData computeGraphs; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData > > graphErrors; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData > > graphConstraints; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData > > graphForces; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData > > graphViolations; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData currentNumConstraints; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData currentNumConstraintGroups; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData currentIterations; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData currentError; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData reverseAccumulateOrder; - Data d_maxIt; ///< maximal number of iterations of the Gauss-Seidel algorithm Data d_tolerance; ///< residual error threshold for termination of the Gauss-Seidel algorithm Data d_sor; ///< Successive Over Relaxation parameter (0-2) diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.cpp b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.cpp index 70f39227edc..541091eb613 100644 --- a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.cpp +++ b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.cpp @@ -81,26 +81,6 @@ LCPConstraintSolver::LCPConstraintSolver() d_tol.setRequired(true); d_maxIt.setRequired(true); - - displayDebug.setOriginalData(&d_displayDebug); - initial_guess.setOriginalData(&d_initial_guess); - build_lcp.setOriginalData(&d_build_lcp); - tol.setOriginalData(&d_tol); - maxIt.setOriginalData(&d_maxIt); - mu.setOriginalData(&d_mu); - minW.setOriginalData(&d_minW); - maxF.setOriginalData(&d_maxF); - multi_grid.setOriginalData(&d_multi_grid); - multi_grid_levels.setOriginalData(&d_multi_grid_levels); - merge_method.setOriginalData(&d_merge_method); - merge_spatial_step.setOriginalData(&d_merge_spatial_step); - merge_local_levels.setOriginalData(&d_merge_local_levels); - constraintGroups.setOriginalData(&d_constraintGroups); - f_graph.setOriginalData(&d_graph); - showLevels.setOriginalData(&d_showLevels); - showCellWidth.setOriginalData(&d_showCellWidth); - showTranslation.setOriginalData(&d_showTranslation); - showLevelTranslation.setOriginalData(&d_showLevelTranslation); } LCPConstraintSolver::~LCPConstraintSolver() diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.h b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.h index 82d342c245b..cacdb319c29 100644 --- a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.h +++ b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.h @@ -35,8 +35,6 @@ #include #include -#include - namespace sofa::component::constraint::lagrangian::solver { @@ -74,64 +72,6 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER_API LCPConstraintSolver : publ void draw(const core::visual::VisualParams* vparams) override; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData displayDebug; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData initial_guess; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData build_lcp; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData tol; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData< int> maxIt; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData mu; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData minW; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData maxF; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData multi_grid; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData< int> multi_grid_levels; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData< int> merge_method; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData< int> merge_spatial_step; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData< int> merge_local_levels; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData < std::set > constraintGroups; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData > > f_graph; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData< int> showLevels; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData showCellWidth; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData showTranslation; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::lifecycle::RenamedData showLevelTranslation; - - Data d_displayDebug; ///< Display debug information. Data d_initial_guess; ///< activate LCP results history to improve its resolution performances. Data d_build_lcp; ///< LCP is not fully built to increase performance in some case. diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/config.h.in b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/config.h.in index 8751f520312..38f5c33c274 100644 --- a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/config.h.in +++ b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/config.h.in @@ -37,12 +37,3 @@ namespace sofa::component::constraint::lagrangian::solver constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::constraint::lagrangian::solver - -#ifdef SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif \ No newline at end of file diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AffineMovementConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AffineMovementConstraint.inl index da71717c88e..4eec339be99 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AffineMovementConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AffineMovementConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/AffineMovementConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/AffineMovementConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AffineMovementProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AffineMovementProjectiveConstraint.h index 6b8ee71a66e..be1b273b7ea 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AffineMovementProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AffineMovementProjectiveConstraint.h @@ -34,8 +34,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -80,32 +78,6 @@ class AffineMovementProjectiveConstraint : public core::behavior::ProjectiveCons friend class AffineMovementProjectiveConstraintInternalData; public : - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData > m_meshIndices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData > m_indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_beginConstraintTime; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_endConstraintTime; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_rotation; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_quaternion; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_translation; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_drawConstrainedPoints; - - /// indices of the DOFs of the mesh SetIndex d_meshIndices; /// indices of the DOFs the constraint is applied to diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AffineMovementProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AffineMovementProjectiveConstraint.inl index 329c7cd70e9..e72a9e1f38d 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AffineMovementProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AffineMovementProjectiveConstraint.inl @@ -51,15 +51,6 @@ AffineMovementProjectiveConstraint::AffineMovementProjectiveConstrain d_beginConstraintTime = 0; if(!d_endConstraintTime.isSet()) d_endConstraintTime = 20; - - m_meshIndices.setOriginalData(&d_meshIndices); - m_indices.setOriginalData(&d_indices); - m_beginConstraintTime.setOriginalData(&d_beginConstraintTime); - m_endConstraintTime.setOriginalData(&d_endConstraintTime); - m_rotation.setOriginalData(&d_rotation); - m_quaternion.setOriginalData(&d_quaternion); - m_translation.setOriginalData(&d_translation); - m_drawConstrainedPoints.setOriginalData(&d_drawConstrainedPoints); } diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AttachConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AttachConstraint.inl index cc9cc2f1503..7e18c49188d 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AttachConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/AttachConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/AttachProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/AttachProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/DirectionProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/DirectionProjectiveConstraint.h index c23903fe532..32fa61b897e 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/DirectionProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/DirectionProjectiveConstraint.h @@ -36,8 +36,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -82,16 +80,6 @@ class DirectionProjectiveConstraint : public core::behavior::ProjectiveConstrain virtual ~DirectionProjectiveConstraint(); public: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData > f_indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_drawSize; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedDataf_direction; - IndexSubsetData d_indices; ///< Indices the particles to project Data d_drawSize; ///< Size of the rendered particles (0 -> point based rendering, >0 -> radius of spheres) Data d_direction; ///< Direction of the line diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/DirectionProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/DirectionProjectiveConstraint.inl index 465fca4cf08..50e7881feaf 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/DirectionProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/DirectionProjectiveConstraint.inl @@ -44,10 +44,6 @@ DirectionProjectiveConstraint::DirectionProjectiveConstraint() { d_indices.beginEdit()->push_back(0); d_indices.endEdit(); - - f_indices.setOriginalData(&d_indices); - f_drawSize.setOriginalData(&d_drawSize); - f_direction.setOriginalData(&d_direction); } diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedConstraint.inl index d55b89cce4e..503bed29443 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/FixedProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/FixedProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedPlaneConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedPlaneConstraint.inl index 2aed69f9c63..e90334a9d67 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedPlaneConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedPlaneConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/FixedPlaneProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/FixedPlaneProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedRotationConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedRotationConstraint.inl index 2775a0a210e..8fbee6de3c2 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedRotationConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedRotationConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/FixedRotationProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/FixedRotationProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedRotationProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedRotationProjectiveConstraint.h index 16f09ef7e35..36a1ac4bd55 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedRotationProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedRotationProjectiveConstraint.h @@ -25,8 +25,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -67,15 +65,6 @@ class FixedRotationProjectiveConstraint : public core::behavior::ProjectiveConst protected : - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< bool > FixedXRotation; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< bool > FixedYRotation; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< bool > FixedZRotation; - Data< bool > d_fixedXRotation; ///< Prevent Rotation around X axis Data< bool > d_fixedYRotation; ///< Prevent Rotation around Y axis Data< bool > d_fixedZRotation; ///< Prevent Rotation around Z axis diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedRotationProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedRotationProjectiveConstraint.inl index 426c6af5030..9e907bceca5 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedRotationProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedRotationProjectiveConstraint.inl @@ -37,10 +37,6 @@ FixedRotationProjectiveConstraint::FixedRotationProjectiveConstraint( d_fixedYRotation(initData(&d_fixedYRotation, false, "FixedYRotation", "Prevent Rotation around Y axis")), d_fixedZRotation(initData(&d_fixedZRotation, false, "FixedZRotation", "Prevent Rotation around Z axis")) { - FixedXRotation.setOriginalData(&d_fixedXRotation); - FixedYRotation.setOriginalData(&d_fixedYRotation); - FixedZRotation.setOriginalData(&d_fixedZRotation); - } diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedTranslationConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedTranslationConstraint.inl index a94b61b3812..0c6d56804f6 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedTranslationConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedTranslationConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/FixedTranslationProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/FixedTranslationProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedTranslationProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedTranslationProjectiveConstraint.h index ff9eae16e54..214b71b4d7d 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedTranslationProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedTranslationProjectiveConstraint.h @@ -26,8 +26,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -63,19 +61,6 @@ class FixedTranslationProjectiveConstraint : public core::behavior::ProjectiveCo friend class FixedTranslationProjectiveConstraintInternalData; public: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector > f_indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_fixAll; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData _drawSize; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector > f_coordinates; - SetIndex d_indices; ///< Indices of the fixed points Data d_fixAll; ///< filter all the DOF to implement a fixed object Data d_drawSize; ///< Size of the rendered particles (0 -> point based rendering, >0 -> radius of spheres) diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedTranslationProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedTranslationProjectiveConstraint.inl index aa3de24dc6b..f329f67052e 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedTranslationProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedTranslationProjectiveConstraint.inl @@ -42,11 +42,6 @@ FixedTranslationProjectiveConstraint::FixedTranslationProjectiveConst // default to indice 0 d_indices.beginEdit()->push_back(0); d_indices.endEdit(); - - f_indices.setOriginalData(&d_indices); - f_fixAll.setOriginalData(&d_fixAll); - _drawSize.setOriginalData(&d_drawSize); - f_coordinates.setOriginalData(&d_coordinates); } diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineConstraint.inl index c4a54d0778a..e80c8605c80 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.h index 3e5e08fcefd..430f2cc085c 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -63,34 +61,6 @@ class HermiteSplineProjectiveConstraint : public core::behavior::ProjectiveConst typedef typename type::Quat QuatR; public: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector > m_indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_tBegin; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_tEnd; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_x0; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_dx0; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_x1; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_dx1; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_sx0; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_sx1; - ///indices of the DOFs constraints SetIndex d_indices; diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.inl index 6a844cd338b..a149779c3bc 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.inl @@ -42,15 +42,6 @@ HermiteSplineProjectiveConstraint::HermiteSplineProjectiveConstraint( , d_sx1(initData(&d_sx1, "SX1", "second interpolation vector") ) , l_topology(initLink("topology", "link to the topology container")) { - m_indices.setOriginalData(&d_indices); - m_tBegin.setOriginalData(&d_tBegin); - m_tEnd.setOriginalData(&d_tEnd); - m_x0.setOriginalData(&d_x0); - m_dx0.setOriginalData(&d_dx0); - m_x1.setOriginalData(&d_x1); - m_dx1.setOriginalData(&d_dx1); - m_sx0.setOriginalData(&d_sx0); - m_sx1.setOriginalData(&d_sx1); } template diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LineProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LineProjectiveConstraint.h index 2d16f87673e..61363e5aa80 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LineProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LineProjectiveConstraint.h @@ -35,8 +35,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -83,19 +81,6 @@ class LineProjectiveConstraint : public core::behavior::ProjectiveConstraintSet< virtual ~LineProjectiveConstraint(); public: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector< sofa::Index > > f_indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_drawSize; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_origin; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_direction; - IndexSubsetData d_indices; ///< the particles to project Data d_drawSize; ///< Size of the rendered particles (0 -> point based rendering, >0 -> radius of spheres) Data d_origin; ///< A point in the line @@ -108,7 +93,6 @@ class LineProjectiveConstraint : public core::behavior::ProjectiveConstraintSet< std::unique_ptr> data { nullptr }; friend class LineProjectiveConstraintInternalData; - public: void clearConstraints(); void addConstraint(Index index); diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LineProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LineProjectiveConstraint.inl index 41f82958062..09076319a8d 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LineProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LineProjectiveConstraint.inl @@ -44,11 +44,6 @@ LineProjectiveConstraint::LineProjectiveConstraint() { d_indices.beginEdit()->push_back(0); d_indices.endEdit(); - - f_indices.setOriginalData(&d_indices); - f_drawSize.setOriginalData(&d_drawSize); - f_origin.setOriginalData(&d_origin); - f_direction.setOriginalData(&d_direction); } diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementConstraint.inl index c57b058851a..8120c3b4a61 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/LinearMovementProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/LinearMovementProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementProjectiveConstraint.h index 7a86baae012..6c61748846c 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementProjectiveConstraint.h @@ -35,8 +35,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -76,19 +74,6 @@ class LinearMovementProjectiveConstraint : public core::behavior::ProjectiveCons friend class LinearMovementProjectiveConstraintInternalData; public : - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector< sofa::Index> > m_indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData > m_keyTimes; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_keyMovements; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData showMovement; - /// indices of the DOFs the constraint is applied to SetIndex d_indices; /// the key frames when the motion is defined by the user diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementProjectiveConstraint.inl index 022150d3546..d54c360d89f 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementProjectiveConstraint.inl @@ -54,11 +54,6 @@ LinearMovementProjectiveConstraint::LinearMovementProjectiveConstrain d_keyTimes.endEdit(); d_keyMovements.beginEdit()->push_back(Deriv() ); d_keyMovements.endEdit(); - - m_indices.setOriginalData(&d_indices); - m_keyTimes.setOriginalData(&d_keyTimes); - m_keyMovements.setOriginalData(&d_keyMovements); - showMovement.setOriginalData(&d_showMovement); } diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearVelocityConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearVelocityConstraint.inl index 58ab1c26288..108e21db95f 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearVelocityConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearVelocityConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/LinearVelocityProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/LinearVelocityProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/OscillatorConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/OscillatorConstraint.inl index 18abb7b08d7..66236892f1a 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/OscillatorConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/OscillatorConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/OscillatorProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/OscillatorProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/OscillatorProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/OscillatorProjectiveConstraint.h index 124e97dbcec..be6a55c45a4 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/OscillatorProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/OscillatorProjectiveConstraint.h @@ -26,8 +26,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -82,12 +80,8 @@ class OscillatorProjectiveConstraint : public core::behavior::ProjectiveConstrai } }; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< type::vector< Oscillator > > constraints; - Data< type::vector< Oscillator > > d_constraints; ///< Define a sequence of oscillating particules: [index, Mean(x,y,z), amplitude(x,y,z), pulsation, phase] - public: explicit OscillatorProjectiveConstraint(core::behavior::MechanicalState* mstate=nullptr); ~OscillatorProjectiveConstraint() override ; diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/OscillatorProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/OscillatorProjectiveConstraint.inl index 17fd0a3447e..9c25ed7a61a 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/OscillatorProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/OscillatorProjectiveConstraint.inl @@ -33,7 +33,6 @@ OscillatorProjectiveConstraint::OscillatorProjectiveConstraint(core: : core::behavior::ProjectiveConstraintSet(mstate) , d_constraints(initData(&d_constraints, "oscillators", "Define a sequence of oscillating particules: \n[index, Mean(x,y,z), amplitude(x,y,z), pulsation, phase]")) { - constraints.setOriginalData(&d_constraints); } template diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ParabolicConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ParabolicConstraint.inl index ec2e5037869..c9067fda5ca 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ParabolicConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ParabolicConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/ParabolicProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/ParabolicProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ParabolicProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ParabolicProjectiveConstraint.h index 6ed3727da2e..84664c108d2 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ParabolicProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ParabolicProjectiveConstraint.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -58,25 +56,6 @@ class ParabolicProjectiveConstraint : public core::behavior::ProjectiveConstrain typedef type::Quat QuatR; protected: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector > m_indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_P1; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_P2; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_P3; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_tBegin; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_tEnd; - ///indices of the DOFs constraints SetIndex d_indices; diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ParabolicProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ParabolicProjectiveConstraint.inl index 97ee17fda2e..d1133653b08 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ParabolicProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ParabolicProjectiveConstraint.inl @@ -39,12 +39,6 @@ ParabolicProjectiveConstraint::ParabolicProjectiveConstraint(core::be , d_tEnd(initData(&d_tEnd, "EndTime", "End Time of the motion") ) , l_topology(initLink("topology", "link to the topology container")) { - m_indices.setOriginalData(&d_indices); - m_P1.setOriginalData(&d_P1); - m_P2.setOriginalData(&d_P2); - m_P3.setOriginalData(&d_P3); - m_tBegin.setOriginalData(&d_tBegin); - m_tEnd.setOriginalData(&d_tEnd); } template diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialFixedConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialFixedConstraint.inl index ea77407af15..6cd36a23a36 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialFixedConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialFixedConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/PartialFixedProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/PartialFixedProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementConstraint.inl index 592d9066181..7f1fa4a6c50 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.h index cb765b14317..19a1bf4b172 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.h @@ -35,8 +35,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -76,43 +74,6 @@ class PartialLinearMovementProjectiveConstraint : public core::behavior::Project friend class PartialLinearMovementProjectiveConstraintInternalData; public : - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData > m_indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData >m_keyTimes; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData m_keyMovements; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< bool > showMovement; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData linearMovementBetweenNodesInIndices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData mainIndice; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData minDepIndice; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData maxDepIndice; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData > m_imposedDisplacmentOnMacroNodes; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData X0; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData Y0; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData Z0; - - /// indices of the DOFs the constraint is applied to SetIndex d_indices; /// the key frames when the motion is defined by the user @@ -145,9 +106,6 @@ public : enum { NumDimensions = Deriv::total_size }; typedef sofa::type::fixed_array VecBool; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData movedDirections; - core::objectmodel::Data d_movedDirections; ///< Defines the directions in which the particles are moved: true (or 1) for fixed, false (or 0) for free /// Link to be set to the topology container in the component graph. diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.inl index 45bbfd8d12b..1fed276f534 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.inl @@ -68,21 +68,6 @@ PartialLinearMovementProjectiveConstraint::PartialLinearMovementProje for( unsigned i=0; i -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/PatchTestMovementProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/PatchTestMovementProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PlaneProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PlaneProjectiveConstraint.h index fa5b4824ca5..e997808db20 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PlaneProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PlaneProjectiveConstraint.h @@ -35,8 +35,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -82,18 +80,6 @@ class PlaneProjectiveConstraint : public core::behavior::ProjectiveConstraintSet virtual ~PlaneProjectiveConstraint(); public: - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector< sofa::Index > > f_indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_origin; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_normal; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_drawSize; - IndexSubsetData d_indices; ///< the particles to project Data d_origin; ///< A point in the plane Data d_normal; ///< Normal vector to the plane diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PlaneProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PlaneProjectiveConstraint.inl index 2f769c53f58..85570f79062 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PlaneProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PlaneProjectiveConstraint.inl @@ -44,11 +44,6 @@ PlaneProjectiveConstraint::PlaneProjectiveConstraint() { d_indices.beginEdit()->push_back(0); d_indices.endEdit(); - - f_indices.setOriginalData(&d_indices); - f_origin.setOriginalData(&d_origin); - f_normal.setOriginalData(&d_normal); - f_drawSize.setOriginalData(&d_drawSize); } diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PointProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PointProjectiveConstraint.h index 66f4620fc8a..458d0ac9391 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PointProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PointProjectiveConstraint.h @@ -33,8 +33,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -75,20 +73,6 @@ class PointProjectiveConstraint : public core::behavior::ProjectiveConstraintSet virtual ~PointProjectiveConstraint(); public: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData> f_indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_point; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_fixAll; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_drawSize; - - SetIndex d_indices; ///< the indices of the points to project to the target Data d_point; ///< Target of the projection Data d_fixAll; ///< filter all the DOF to implement a fixed object diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PointProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PointProjectiveConstraint.inl index b10638a7e99..082278731e8 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PointProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PointProjectiveConstraint.inl @@ -46,11 +46,6 @@ PointProjectiveConstraint::PointProjectiveConstraint() { d_indices.beginEdit()->push_back(0); d_indices.endEdit(); - - f_indices.setOriginalData(&d_indices); - f_point.setOriginalData(&d_point); - f_fixAll.setOriginalData(&d_fixAll); - f_drawSize.setOriginalData(&d_drawSize); } diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsConstraint.inl index bc47ba5c394..08e0b162523 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.h index 302f762a888..e44f27a8b15 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.h @@ -33,8 +33,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -74,21 +72,8 @@ class PositionBasedDynamicsProjectiveConstraint : public core::behavior::Project friend class PositionBasedDynamicsProjectiveConstraintInternalData; public: - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData stiffness; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< VecCoord > position; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< VecDeriv > velocity; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData< VecCoord > old_position; - Data< Real > d_stiffness; ///< Blending between current pos and target pos. Data< VecCoord > d_position; ///< Target positions. - Data < VecDeriv > d_velocity; ///< Velocities. Data < VecCoord > d_old_position; ///< Old positions. diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.inl index 68166e5c2b0..788c59514d4 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.inl @@ -38,10 +38,6 @@ PositionBasedDynamicsProjectiveConstraint::PositionBasedDynamicsProje , d_velocity(initData(&d_velocity, "velocity", "Velocities.")) , d_old_position(initData(&d_old_position, "old_position", "Old positions.")) { - stiffness.setOriginalData(&d_stiffness); - position.setOriginalData(&d_position); - velocity.setOriginalData(&d_velocity); - old_position.setOriginalData(&d_old_position); } diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectDirectionConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectDirectionConstraint.inl index 613df795bb7..53fed825528 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectDirectionConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectDirectionConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/DirectionProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/DirectionProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectToLineConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectToLineConstraint.inl index 92043fc1ad5..aef0295a40d 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectToLineConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectToLineConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/LineProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/LineProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectToPlaneConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectToPlaneConstraint.inl index c550127f608..af45a82967d 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectToPlaneConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectToPlaneConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/PlaneProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/PlaneProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectToPointConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectToPointConstraint.inl index 8cafba03ecd..b31ef6ad2fc 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectToPointConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/ProjectToPointConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/PointProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/PointProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/SkeletalMotionConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/SkeletalMotionConstraint.inl index b44c12de383..f3b0fe0d19c 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/SkeletalMotionConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/SkeletalMotionConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v24.06", "v25.06", "sofa/component/constraint/projective/SkeletalMotionProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/constraint/projective/SkeletalMotionProjectiveConstraint.inl") diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/SkeletalMotionProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/SkeletalMotionProjectiveConstraint.h index f214bcbf850..96785a2b76f 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/SkeletalMotionProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/SkeletalMotionProjectiveConstraint.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::constraint::projective { @@ -104,38 +102,20 @@ class SkeletalMotionProjectiveConstraint : public core::behavior::ProjectiveCons void interpolatePosition(Real cT, typename std::enable_if >::value, VecCoord>::type& x); protected: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData > > skeletonJoints; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData > skeletonBones; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData animationSpeed; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::lifecycle::RenamedData active; - - // every nodes needed in the animation chain Data > > d_skeletonJoints; ///< skeleton joints // mesh skeleton bones which need to be updated according to the animated nodes, we use them to fill the mechanical object Data > d_skeletonBones; ///< skeleton bones - // control how fast the animation is played since animation time is not simulation time Data d_animationSpeed; ///< animation speed - /// is the projective constraint activated? Data d_active; private: /// the key times surrounding the current simulation time (for interpolation) Real prevT, nextT; - /// the global position of the bones at time t+dt used for the velocities computation VecCoord nextPositions; - /// to know if we found the key times bool finished; diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/SkeletalMotionProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/SkeletalMotionProjectiveConstraint.inl index 0df5b1afe53..b4ce4ede053 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/SkeletalMotionProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/SkeletalMotionProjectiveConstraint.inl @@ -42,10 +42,6 @@ SkeletalMotionProjectiveConstraint::SkeletalMotionProjectiveConstrain , d_active(initData(&d_active, true, "active", "is the constraint active?")) , finished(false) { - skeletonJoints.setOriginalData(&d_skeletonJoints); - skeletonBones.setOriginalData(&d_skeletonBones); - animationSpeed.setOriginalData(&d_animationSpeed); - active.setOriginalData(&d_active); } template diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/config.h.in b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/config.h.in index f1d08e21eec..50f589bb112 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/config.h.in +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/config.h.in @@ -36,12 +36,3 @@ namespace sofa::component::constraint::projective constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::constraint::projective - -#ifdef SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_PROJECTIVE -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif \ No newline at end of file diff --git a/Sofa/Component/Controller/src/sofa/component/controller/Controller.cpp b/Sofa/Component/Controller/src/sofa/component/controller/Controller.cpp index 3dae0e42102..c46432cb276 100644 --- a/Sofa/Component/Controller/src/sofa/component/controller/Controller.cpp +++ b/Sofa/Component/Controller/src/sofa/component/controller/Controller.cpp @@ -40,7 +40,6 @@ namespace sofa::component::controller Controller::Controller() : d_handleEventTriggersUpdate(initData(&d_handleEventTriggersUpdate, false, "handleEventTriggersUpdate", "Event handling frequency controls the controller update frequency" ) ) { - handleEventTriggersUpdate.setOriginalData(&d_handleEventTriggersUpdate); } Controller::~Controller() diff --git a/Sofa/Component/Controller/src/sofa/component/controller/Controller.h b/Sofa/Component/Controller/src/sofa/component/controller/Controller.h index 65e42a030e6..0e803e7b49a 100644 --- a/Sofa/Component/Controller/src/sofa/component/controller/Controller.h +++ b/Sofa/Component/Controller/src/sofa/component/controller/Controller.h @@ -24,8 +24,6 @@ #include -#include - namespace sofa::core::objectmodel { class Event; @@ -110,14 +108,9 @@ class SOFA_COMPONENT_CONTROLLER_API Controller : public core::behavior::BaseCont virtual void onGUIEvent(core::objectmodel::GUIEvent *) {} protected: - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONTROLLER() - sofa::core::objectmodel::lifecycle::RenamedData < bool > handleEventTriggersUpdate; - - Data< bool > d_handleEventTriggersUpdate; ///< Event handling frequency controls the controller update frequency public: - void handleEvent(core::objectmodel::Event *) override; }; diff --git a/Sofa/Component/Controller/src/sofa/component/controller/MechanicalStateController.h b/Sofa/Component/Controller/src/sofa/component/controller/MechanicalStateController.h index aae4eff9d21..7240ea2b159 100644 --- a/Sofa/Component/Controller/src/sofa/component/controller/MechanicalStateController.h +++ b/Sofa/Component/Controller/src/sofa/component/controller/MechanicalStateController.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::controller { @@ -130,18 +128,6 @@ class MechanicalStateController : public Controller */ void applyController(void); protected: - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONTROLLER() - sofa::core::objectmodel::lifecycle::RenamedData< unsigned int > index; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONTROLLER() - sofa::core::objectmodel::lifecycle::RenamedData< bool > onlyTranslation; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONTROLLER() - sofa::core::objectmodel::lifecycle::RenamedData< bool > buttonDeviceState; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONTROLLER() - sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::Vec<3,Real> > mainDirection; - Data< unsigned int > d_index; ///< Index of the controlled DOF Data< bool > d_onlyTranslation; ///< Controlling the DOF only in translation Data< bool > d_buttonDeviceState; ///< state of ths device button diff --git a/Sofa/Component/Controller/src/sofa/component/controller/MechanicalStateController.inl b/Sofa/Component/Controller/src/sofa/component/controller/MechanicalStateController.inl index ebfea8ee9b9..676d7fac68c 100644 --- a/Sofa/Component/Controller/src/sofa/component/controller/MechanicalStateController.inl +++ b/Sofa/Component/Controller/src/sofa/component/controller/MechanicalStateController.inl @@ -51,11 +51,6 @@ MechanicalStateController::MechanicalStateController() { d_mainDirection.beginEdit()->normalize(); d_mainDirection.endEdit(); - - index.setOriginalData(&d_index); - onlyTranslation.setOriginalData(&d_onlyTranslation); - buttonDeviceState.setOriginalData(&d_buttonDeviceState); - mainDirection.setOriginalData(&d_mainDirection); } template diff --git a/Sofa/Component/Controller/src/sofa/component/controller/config.h.in b/Sofa/Component/Controller/src/sofa/component/controller/config.h.in index 2af29466ee5..d53b66aa0a6 100644 --- a/Sofa/Component/Controller/src/sofa/component/controller/config.h.in +++ b/Sofa/Component/Controller/src/sofa/component/controller/config.h.in @@ -36,12 +36,3 @@ namespace sofa::component::controller constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::controller - -#ifdef SOFA_BUILD_SOFA_COMPONENT_CONTROLLER -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONTROLLER() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONTROLLER() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif \ No newline at end of file diff --git a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/Distances.h b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/Distances.h index 2b542f34e16..ea9007d13f0 100644 --- a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/Distances.h +++ b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/Distances.h @@ -40,8 +40,6 @@ #define TYPE_VORONOI 3 #define TYPE_HARMONIC_STIFFNESS 4 -#include - namespace sofa::component::engine::analyze { @@ -77,44 +75,6 @@ class Distances : public core::DataEngine ~Distances() override {} public: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData showMapIndex; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData showDistanceMap; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData showGoalDistanceMap; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData showTextScaleFactor; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData showGradientMap; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData showGradientsScaleFactor; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData offset; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData distanceType; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData initTarget; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData initTargetStep; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData > zonesFramePair; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData harmonicMaxValue; - - Data d_showMapIndex; ///< Frame DOF index on which display values. Data d_showDistanceMap; ///< show the distance for each point of the target point set. Data d_showGoalDistanceMap; ///< show the distance for each point of the target point set. @@ -225,17 +185,6 @@ class Distances : public core::DataEngine } private: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData fileDistance; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData targetPath; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData hexaContainerPath; - - Data d_fileDistance; ///< file containing the result of the computation of the distances Data d_targetPath; ///< path to the goal point set topology core::behavior::MechanicalState* target; diff --git a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/Distances.inl b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/Distances.inl index 817bac4cb6a..89e1797ff52 100644 --- a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/Distances.inl +++ b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/Distances.inl @@ -62,23 +62,6 @@ Distances< DataTypes >::Distances ( sofa::component::topology::container::dynami d_zonesFramePair.setDisplayed(false); // GUI can not display map. this->f_printLog.setValue(true); - - showMapIndex.setOriginalData(&d_showMapIndex); - showDistanceMap.setOriginalData(&d_showDistanceMap); - showGoalDistanceMap.setOriginalData(&d_showGoalDistanceMap); - showTextScaleFactor.setOriginalData(&d_showTextScaleFactor); - showGradientMap.setOriginalData(&d_showGradientMap); - showGradientsScaleFactor.setOriginalData(&d_showGradientsScaleFactor); - offset.setOriginalData(&d_offset); - distanceType.setOriginalData(&d_distanceType); - initTarget.setOriginalData(&d_initTarget); - initTargetStep.setOriginalData(&d_initTargetStep); - zonesFramePair.setOriginalData(&d_zonesFramePair); - harmonicMaxValue.setOriginalData(&d_harmonicMaxValue); - fileDistance.setOriginalData(&d_fileDistance); - targetPath.setOriginalData(&d_targetPath); - hexaContainerPath.setOriginalData(&d_hexaContainerPath); - } diff --git a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/HausdorffDistance.h b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/HausdorffDistance.h index 6f7187b4829..7e0217234ae 100644 --- a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/HausdorffDistance.h +++ b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/HausdorffDistance.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::engine::analyze { @@ -61,24 +59,6 @@ class HausdorffDistance : public core::DataEngine void doUpdate() override; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData f_points_1; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData f_points_2; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData d12; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData d21; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData max; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData f_update; - //Input Data d_points_1; ///< Points belonging to the first point cloud Data d_points_2; ///< Points belonging to the second point cloud diff --git a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/HausdorffDistance.inl b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/HausdorffDistance.inl index 759844c32e2..acaac258dd7 100644 --- a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/HausdorffDistance.inl +++ b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/HausdorffDistance.inl @@ -45,15 +45,6 @@ HausdorffDistance::HausdorffDistance() d_max.setGroup("Output"); f_listening.setValue(true); - - f_points_1.setOriginalData(&d_points_1); - f_points_2.setOriginalData(&d_points_2); - d12.setOriginalData(&d_d12); - d21.setOriginalData(&d_d21); - max.setOriginalData(&d_max); - f_update.setOriginalData(&d_update); - - } template diff --git a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ShapeMatching.h b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ShapeMatching.h index f11328a5b4f..38645353cbd 100644 --- a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ShapeMatching.h +++ b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ShapeMatching.h @@ -34,8 +34,6 @@ #include #include -#include - namespace sofa::component::engine::analyze { @@ -71,31 +69,6 @@ class ShapeMatching : public core::DataEngine, public core::behavior::SingleStat void draw(const core::visual::VisualParams* vparams) override; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData iterations; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData affineRatio; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData fixedweight; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData fixedPosition0; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData fixedPosition; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData position; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData< VVI > cluster; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::lifecycle::RenamedData targetPosition; - - Data d_iterations; ///< Number of iterations. Data< Real > d_affineRatio; ///< Blending between affine and rigid. Data< Real > d_fixedweight; ///< weight of fixed particles. diff --git a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ShapeMatching.inl b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ShapeMatching.inl index 19f9aa5685a..6f1a047c52d 100644 --- a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ShapeMatching.inl +++ b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ShapeMatching.inl @@ -77,16 +77,6 @@ ShapeMatching::ShapeMatching() addInput(&d_position); addInput(&d_cluster); addOutput(&d_targetPosition); - - iterations.setOriginalData(&d_iterations); - affineRatio.setOriginalData(&d_affineRatio); - fixedweight.setOriginalData(&d_fixedweight); - fixedPosition0.setOriginalData(&d_fixedPosition0); - fixedPosition.setOriginalData(&d_fixedPosition); - position.setOriginalData(&d_position); - cluster.setOriginalData(&d_cluster); - targetPosition.setOriginalData(&d_targetPosition); - } template diff --git a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/config.h.in b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/config.h.in index aeb4bfc2389..59fc1c0e5bb 100644 --- a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/config.h.in +++ b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/config.h.in @@ -36,12 +36,3 @@ namespace sofa::component::engine::analyze constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::engine::analyze - -#ifdef SOFA_BUILD_SOFA_COMPONENT_ENGINE_ANALYZE -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif \ No newline at end of file diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/BaseROI.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/BaseROI.h index ba9ad625162..70d96c0ba88 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/BaseROI.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/BaseROI.h @@ -29,8 +29,6 @@ #include #include -#include - namespace sofa::component::engine::select { @@ -127,8 +125,6 @@ class BaseROI : public core::DataEngine Data d_drawSize; ///< rendering size for ROI and topological elements Data d_doUpdate; ///< If true, updates the selection at the beginning of simulation steps. (default = true) - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::lifecycle::RenamedData d_X0; protected: BaseROI(); ~BaseROI() override = default; diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/BaseROI.inl b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/BaseROI.inl index ffa61c28545..4c6623cb4b0 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/BaseROI.inl +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/BaseROI.inl @@ -123,8 +123,6 @@ BaseROI::BaseROI() addOutput(&d_edgeOutIndices); addOutput(&d_triangleOutIndices); addOutput(&d_tetrahedronOutIndices); - - d_X0.setOriginalData(&d_positions); } template diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshROI.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshROI.h index 2544903fc1a..a93228360a8 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshROI.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshROI.h @@ -31,11 +31,8 @@ #include #include #include - #include -#include - namespace sofa::component::engine::select { @@ -107,13 +104,6 @@ class MeshROI : public BaseROI Data d_drawBox; ///< Draw the Bounding box around the mesh used for the ROI static bool isPointInIndices(const unsigned int i, const SetIndex& indices); - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::lifecycle::RenamedData d_X0_i; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::lifecycle::RenamedData > d_edges_i;; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::lifecycle::RenamedData > d_triangles_i; }; #if !defined(SOFA_COMPONENT_ENGINE_MESHROI_CPP) diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshROI.inl b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshROI.inl index 679a9259e20..f6be82452bb 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshROI.inl +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshROI.inl @@ -65,11 +65,6 @@ MeshROI::MeshROI() // so this emulates a default value to false. this->d_strict.setValue(false); } - - d_X0_i.setOriginalData(&d_roiPositions); - d_edges_i.setOriginalData(&d_roiEdges); - d_triangles_i.setOriginalData(&d_roiTriangles); - } template diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshSubsetEngine.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshSubsetEngine.h index 94786a04422..ec51cc6c1bf 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshSubsetEngine.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshSubsetEngine.h @@ -24,7 +24,6 @@ #include #include -#include #include #include #include @@ -71,25 +70,6 @@ class MeshSubsetEngine : public core::DataEngine Data< SeqTetrahedra > d_tetrahedra; ///< Tetrahedra of mesh subset Data< SeqHexahedra > d_hexahedra; ///< Hexahedra of mesh subset - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::lifecycle::RenamedData inputPosition; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::lifecycle::RenamedData inputEdges; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::lifecycle::RenamedData inputTriangles; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::lifecycle::RenamedData inputQuads; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::lifecycle::RenamedData indices; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::lifecycle::RenamedData position; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::lifecycle::RenamedData edges; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::lifecycle::RenamedData triangles; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::lifecycle::RenamedData quads; - protected: MeshSubsetEngine(); ~MeshSubsetEngine() override; diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshSubsetEngine.inl b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshSubsetEngine.inl index bed1fa6999b..6c9d5829491 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshSubsetEngine.inl +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshSubsetEngine.inl @@ -55,16 +55,6 @@ MeshSubsetEngine::MeshSubsetEngine() addOutput(&d_quads); addOutput(&d_tetrahedra); addOutput(&d_hexahedra); - - inputPosition.setOriginalData(&d_inputPosition); - inputEdges.setOriginalData(&d_inputEdges); - inputTriangles.setOriginalData(&d_inputTriangles); - inputQuads.setOriginalData(&d_inputQuads); - indices.setOriginalData(&d_indices); - position.setOriginalData(&d_position); - edges.setOriginalData(&d_edges); - triangles.setOriginalData(&d_triangles); - quads.setOriginalData(&d_quads); } template diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SphereROI.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SphereROI.h index 68804f9e49c..e8c88d4afc7 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SphereROI.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SphereROI.h @@ -29,8 +29,6 @@ #include #include -#include - namespace sofa::component::engine::select { @@ -79,19 +77,6 @@ class SphereROI : public BaseROI Data< type::Vec3 > d_normal; ///< Normal direction of the triangles (if triAngle > 0) Data< Real > d_edgeAngle; ///< Max angle between the direction of the selected edges and the specified direction Data< Real > d_triAngle; ///< Max angle between the normal of the selected triangle and the specified normal direction - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::lifecycle::RenamedData< type::vector > centers; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::lifecycle::RenamedData< type::vector > radii; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::lifecycle::RenamedData< type::Vec3 > direction; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::lifecycle::RenamedData< type::Vec3 > normal; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::lifecycle::RenamedData< Real > edgeAngle; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::lifecycle::RenamedData< Real > triAngle; }; #if !defined(SOFA_COMPONENT_ENGINE_SPHEREROI_CPP) diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SphereROI.inl b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SphereROI.inl index feb6c49255d..16784c05d74 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SphereROI.inl +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SphereROI.inl @@ -44,13 +44,6 @@ SphereROI::SphereROI() this->addAlias(&this->d_indices,"pointIndices"); this->addAlias(&this->d_positions,"rest_position"); this->addAlias(&this->d_drawROI, "drawSphere"); - - centers.setOriginalData(&d_centers); - radii.setOriginalData(&d_radii); - direction.setOriginalData(&d_direction); - normal.setOriginalData(&d_normal); - edgeAngle.setOriginalData(&d_edgeAngle); - triAngle.setOriginalData(&d_triAngle); } template @@ -176,7 +169,7 @@ bool SphereROI::roiDoUpdate() if (rad.size() == 1) { Real r = rad[0]; - helper::WriteOnlyAccessor< Data > > radWriter = radii; + helper::WriteOnlyAccessor< Data > > radWriter = d_radii; for (unsigned int i = 0; i < cen.size() - 1; i++) radWriter.push_back(r); } diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/config.h.in b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/config.h.in index 62ed53e746f..69112a55d58 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/config.h.in +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/config.h.in @@ -36,11 +36,3 @@ namespace sofa::component::engine::select constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::engine::select - -#ifdef SOFA_BUILD_SOFA_COMPONENT_ENGINE_SELECT -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() \ - SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h b/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h index f6559fef3f7..739924ee13a 100644 --- a/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h +++ b/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h @@ -29,8 +29,6 @@ #include -#include - namespace sofa::component::haptics { @@ -62,17 +60,8 @@ class LCPForceFeedback : public MechanicalStateForceFeedback dmsg_info() << "haptic_freq = " << std::fixed << haptic_freq << " Hz " << '\xd'; } - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_HAPTICS() - sofa::core::objectmodel::lifecycle::RenamedData forceCoef; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_HAPTICS() - sofa::core::objectmodel::lifecycle::RenamedData solverTimeout; - - Data< double > d_forceCoef; ///< multiply haptic force by this coef. - Data< double > d_solverTimeout; ///< max time to spend solving constraints. - Data< int > d_solverMaxIt; ///< max iteration to spend solving constraints // deriv (or not) the rotations when updating the violations diff --git a/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.inl b/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.inl index 03d2d500373..2cdb847d4bd 100644 --- a/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.inl +++ b/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.inl @@ -144,10 +144,6 @@ LCPForceFeedback::LCPForceFeedback() _timer = new helper::system::thread::CTime(); time_buf = _timer->getTime(); timer_iterations = 0; - - forceCoef.setOriginalData(&d_forceCoef); - solverTimeout.setOriginalData(&d_solverTimeout); - } diff --git a/Sofa/Component/Haptics/src/sofa/component/haptics/config.h.in b/Sofa/Component/Haptics/src/sofa/component/haptics/config.h.in index e4bfcdb30ef..e7c49f63cec 100644 --- a/Sofa/Component/Haptics/src/sofa/component/haptics/config.h.in +++ b/Sofa/Component/Haptics/src/sofa/component/haptics/config.h.in @@ -36,12 +36,3 @@ namespace sofa::component::haptics constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::haptics - -#ifdef SOFA_BUILD_SOFA_COMPONENT_HAPTICS -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_HAPTICS() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_HAPTICS() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif \ No newline at end of file diff --git a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/VTKExporter.h b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/VTKExporter.h index 0708649489e..ac0f57d89d6 100644 --- a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/VTKExporter.h +++ b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/VTKExporter.h @@ -29,9 +29,9 @@ #include - #include + namespace sofa::component::_vtkexporter_ { diff --git a/Sofa/Component/LinearSolver/Direct/CMakeLists.txt b/Sofa/Component/LinearSolver/Direct/CMakeLists.txt index 7b81e2e950d..f462dcac550 100644 --- a/Sofa/Component/LinearSolver/Direct/CMakeLists.txt +++ b/Sofa/Component/LinearSolver/Direct/CMakeLists.txt @@ -52,7 +52,6 @@ set(SOURCE_FILES ${SOFACOMPONENTLINEARSOLVERDIRECT_SOURCE_DIR}/MatrixLinearSystem[BTDMatrix].cpp ${SOFACOMPONENTLINEARSOLVERDIRECT_SOURCE_DIR}/PrecomputedLinearSolver.cpp ${SOFACOMPONENTLINEARSOLVERDIRECT_SOURCE_DIR}/SVDLinearSolver.cpp - ${SOFACOMPONENTLINEARSOLVERDIRECT_SOURCE_DIR}/SparseCommon.cpp ${SOFACOMPONENTLINEARSOLVERDIRECT_SOURCE_DIR}/SparseLDLSolver.cpp ${SOFACOMPONENTLINEARSOLVERDIRECT_SOURCE_DIR}/TypedMatrixLinearSystem[BTDMatrix].cpp ) diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/PrecomputedLinearSolver.h b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/PrecomputedLinearSolver.h index bb5cb55e283..ad0bfbdb5d2 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/PrecomputedLinearSolver.h +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/PrecomputedLinearSolver.h @@ -32,8 +32,6 @@ #include #include -#include - namespace sofa::component::linearsolver::direct { @@ -82,13 +80,6 @@ class PrecomputedLinearSolver : public sofa::component::linearsolver::MatrixLine typedef typename TMatrix::Real Real; typedef typename PrecomputedLinearSolverInternalData::TBaseMatrix TBaseMatrix; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_DIRECT() - sofa::core::objectmodel::lifecycle::RenamedData jmjt_twostep; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_DIRECT() - sofa::core::objectmodel::lifecycle::RenamedData use_file; - - Data d_jmjt_twostep; ///< Use two step algorithm to compute JMinvJt Data d_use_file; ///< Dump system matrix in a file Data init_Tolerance; diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/PrecomputedLinearSolver.inl b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/PrecomputedLinearSolver.inl index edb658c5d5f..149aca006eb 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/PrecomputedLinearSolver.inl +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/PrecomputedLinearSolver.inl @@ -50,10 +50,6 @@ PrecomputedLinearSolver::PrecomputedLinearSolver() , d_use_file(initData(&d_use_file, true, "use_file", "Dump system matrix in a file") ) { first = true; - - jmjt_twostep.setOriginalData(&d_jmjt_twostep); - use_file.setOriginalData(&d_use_file); - } template diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SVDLinearSolver.h b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SVDLinearSolver.h index f0d619e5467..773b304ccda 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SVDLinearSolver.h +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SVDLinearSolver.h @@ -25,8 +25,6 @@ #include #include -#include - namespace sofa::component::linearsolver::direct { @@ -50,16 +48,6 @@ class SVDLinearSolver : public sofa::component::linearsolver::MatrixLinearSolver typedef typename TVector::Real Real; typedef sofa::component::linearsolver::MatrixLinearSolver Inherit; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_DIRECT() - sofa::core::objectmodel::lifecycle::RenamedData f_verbose; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_DIRECT() - sofa::core::objectmodel::lifecycle::RenamedData f_minSingularValue; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_DIRECT() - sofa::core::objectmodel::lifecycle::RenamedData f_conditionNumber; - - Data d_verbose; ///< Dump system state at each iteration Data d_minSingularValue; ///< Thershold under which a singular value is set to 0, for the stabilization of ill-conditioned system. protected: diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SVDLinearSolver.inl b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SVDLinearSolver.inl index c75f48c122a..e2b26c6f6da 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SVDLinearSolver.inl +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SVDLinearSolver.inl @@ -40,10 +40,6 @@ SVDLinearSolver::SVDLinearSolver() , d_minSingularValue(initData(&d_minSingularValue, (Real)1.0e-6, "minSingularValue", "Thershold under which a singular value is set to 0, for the stabilization of ill-conditioned system.") ) , d_conditionNumber(initData(&d_conditionNumber, (Real)0.0, "conditionNumber", "Condition number of the matrix: ratio between the largest and smallest singular values. Computed in method solve.") ) { - f_verbose.setOriginalData(&d_verbose); - f_minSingularValue.setOriginalData(&d_minSingularValue); - f_conditionNumber.setOriginalData(&d_conditionNumber); - } /// Solve Mx=b diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseCommon.cpp b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseCommon.cpp deleted file mode 100644 index 1a6cf31f021..00000000000 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseCommon.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2006 INRIA, USTL, UJF, CNRS, MGH * -* * -* This program is free software; you can redistribute it and/or modify it * -* under the terms of the GNU Lesser General Public License as published by * -* the Free Software Foundation; either version 2.1 of the License, or (at * -* your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, but WITHOUT * -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * -* for more details. * -* * -* You should have received a copy of the GNU Lesser General Public License * -* along with this program. If not, see . * -******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * -* Contact information: contact@sofa-framework.org * -******************************************************************************/ -#include - -namespace sofa::component::linearsolver::direct -{ -void csrToAdj(int n, int * M_colptr, int * M_rowind, type::vector& adj, type::vector& xadj , type::vector& t_adj , type::vector& t_xadj, type::vector& tran_countvec) -{ - //Compute transpose in tran_colptr, tran_rowind, tran_values, tran_D - tran_countvec.clear(); - tran_countvec.resize(n); - - // First we count the number of value on each row. - for (int j=0;jj) tran_countvec[col]++; - } - } - - // Now we make a scan to build tran_colptr - t_xadj.resize(n+1); - t_xadj[0] = 0; - for (int j=0;jj) - { - t_adj[t_xadj[line] + tran_countvec[line]] = j; - tran_countvec[line]++; - } - } - } - - adj.clear(); - xadj.resize(n+1); - xadj[0] = 0; - for (int j=0; j j) adj.push_back(col); - } - - xadj[j+1] = adj.size(); - } -} - -} diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseCommon.h b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseCommon.h index 8c8f8914fe9..9eebe8a49f3 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseCommon.h +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseCommon.h @@ -37,9 +37,8 @@ xadj[i+1]-xadj[i] is the number of neighbors of the i-th node adj[xadj[i]] is the first neighbor of the i-th node **/ -SOFA_ATTRIBUTE_DEPRECATED__SPARSECOMMON() -SOFA_COMPONENT_LINEARSOLVER_DIRECT_API -void csrToAdj(int n, int * M_colptr, int * M_rowind, type::vector& adj, type::vector& xadj, type::vector& t_adj, type::vector& t_xadj, type::vector& tran_countvec ); +SOFA_ATTRIBUTE_DISABLED__SPARSECOMMON() +void csrToAdj(int n, int * M_colptr, int * M_rowind, type::vector& adj, type::vector& xadj, type::vector& t_adj, type::vector& t_xadj, type::vector& tran_countvec ) = delete; // compare the shape of two matrix given in CSR format, return false if the matrices have the same shape and return true if their shapes are different inline bool compareMatrixShape(int s_M, int * M_colptr,int * M_rowind, int s_P, int * P_colptr,int * P_rowind) { diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseLDLSolverImpl.h b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseLDLSolverImpl.h index 2332678be23..d3adff7e8da 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseLDLSolverImpl.h +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseLDLSolverImpl.h @@ -166,7 +166,7 @@ public : protected : Data d_precomputeSymbolicDecomposition; ///< If true the solver will reuse the precomputed symbolic decomposition. Otherwise it will recompute it at each step. - core::objectmodel::lifecycle::DeprecatedData d_applyPermutation{this, "v24.06", "v24.12", "applyPermutation", "Ordering method is now defined using ordering components"}; + core::objectmodel::lifecycle::RemovedData d_applyPermutation{this, "v24.06", "v24.12", "applyPermutation", "Ordering method is now defined using ordering components"}; Data d_L_nnz; ///< Number of non-zero values in the lower triangular matrix of the factorization. The lower, the faster the system is solved. diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/config.h.in b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/config.h.in index 7034cc3535c..29d8b86d571 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/config.h.in +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/config.h.in @@ -37,18 +37,10 @@ namespace sofa::component::linearsolver::direct constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::linearsolver::direct + #ifdef SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_DIRECT -#define SOFA_ATTRIBUTE_DEPRECATED__SPARSECOMMON() +#define SOFA_ATTRIBUTE_DISABLED__SPARSECOMMON() #else -#define SOFA_ATTRIBUTE_DEPRECATED__SPARSECOMMON() \ - SOFA_ATTRIBUTE_DEPRECATED("v24.06", "v24.12", "This function is no longer used") +#define SOFA_ATTRIBUTE_DISABLED__SPARSECOMMON() \ + SOFA_ATTRIBUTE_DISABLED("v24.06", "v24.12", "This function is no longer used") #endif // SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_DIRECT - -#ifdef SOFA_BUILD_SOFA_COMPONENT_IO_MESH -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_DIRECT() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_DIRECT() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/PCGLinearSolver.h b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/PCGLinearSolver.h index 50dd8f112fc..f54a08d8c00 100644 --- a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/PCGLinearSolver.h +++ b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/PCGLinearSolver.h @@ -28,8 +28,6 @@ #include -#include - namespace sofa::component::linearsolver::iterative { @@ -44,25 +42,6 @@ class PCGLinearSolver : public sofa::component::linearsolver::MatrixLinearSolver typedef TVector Vector; typedef sofa::component::linearsolver::MatrixLinearSolver Inherit; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_maxIter; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_tolerance; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_use_precond; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_update_step; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() - sofa::core::objectmodel::lifecycle::RenamedData f_build_precond; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() - sofa::core::objectmodel::lifecycle::RenamedData > > f_graph; - - Data d_maxIter; ///< Maximum number of iterations after which the iterative descent of the Conjugate Gradient must stop Data d_tolerance; ///< Desired accuracy of the Conjugate Gradient solution evaluating: |r|²/|b|² (ratio of current residual norm over initial residual norm) Data d_use_precond; ///< Use a preconditioner diff --git a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/PCGLinearSolver.inl b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/PCGLinearSolver.inl index ff9da2bb46e..4335dc9b165 100644 --- a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/PCGLinearSolver.inl +++ b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/PCGLinearSolver.inl @@ -49,14 +49,6 @@ PCGLinearSolver::PCGLinearSolver() d_graph.setWidget("graph"); first = true; this->f_listening.setValue(true); - - f_maxIter.setOriginalData(&d_maxIter); - f_tolerance.setOriginalData(&d_tolerance); - f_use_precond.setOriginalData(&d_use_precond); - f_update_step.setOriginalData(&d_update_step); - f_build_precond.setOriginalData(&d_build_precond); - f_graph.setOriginalData(&d_graph); - } template diff --git a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/config.h.in b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/config.h.in index 21208154d08..13e67323c21 100644 --- a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/config.h.in +++ b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/config.h.in @@ -37,12 +37,3 @@ namespace sofa::component::linearsolver::iterative constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::linearsolver::iterative - -#ifdef SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_ITERATIVE -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.h b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.h index b980993c7fd..81760f03e5b 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.h +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.h @@ -32,8 +32,6 @@ #include #include -#include - namespace sofa::component::linearsolver::preconditioner { @@ -108,23 +106,6 @@ class PrecomputedWarpPreconditioner : public sofa::component::linearsolver::Matr typedef sofa::type::MatNoInit<3, 3, Real> Transformation; Data d_jmjt_twostep; ///< Use two step algorithm to compute JMinvJt - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() - sofa::core::objectmodel::lifecycle::RenamedData jmjt_twostep; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() - sofa::core::objectmodel::lifecycle::RenamedData use_file; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() - sofa::core::objectmodel::lifecycle::RenamedData share_matrix; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() - sofa::core::objectmodel::lifecycle::RenamedData use_rotations; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() - sofa::core::objectmodel::lifecycle::RenamedData draw_rotations_scale; - - Data d_use_file; ///< Dump system matrix in a file Data d_share_matrix; ///< Share the compliance matrix in memory if they are related to the same file (WARNING: might require to reload Sofa when opening a new scene...) SingleLink l_linearSolver; ///< Link towards the linear solver used to precompute the first matrix diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.inl b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.inl index 1f75138d49b..6d74a7c5cdd 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.inl +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/PrecomputedWarpPreconditioner.inl @@ -62,13 +62,6 @@ PrecomputedWarpPreconditioner::PrecomputedWarpPreconditioner() first = true; _rotate = false; usePrecond = true; - - jmjt_twostep.setOriginalData(&d_jmjt_twostep); - use_file.setOriginalData(&d_use_file); - share_matrix.setOriginalData(&d_share_matrix); - use_rotations.setOriginalData(&d_use_rotations); - draw_rotations_scale.setOriginalData(&d_draw_rotations_scale); - } template diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/SSORPreconditioner.h b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/SSORPreconditioner.h index 2dd0e13fef7..9e974178e4f 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/SSORPreconditioner.h +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/SSORPreconditioner.h @@ -30,8 +30,6 @@ #include -#include - namespace sofa::component::linearsolver::preconditioner { @@ -53,9 +51,6 @@ class SSORPreconditioner : public sofa::component::linearsolver::MatrixLinearSol typedef SReal Real; typedef sofa::component::linearsolver::MatrixLinearSolver Inherit; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() - sofa::core::objectmodel::lifecycle::RenamedData f_omega; - Data d_omega; ///< Omega coefficient protected: SSORPreconditioner(); diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/SSORPreconditioner.inl b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/SSORPreconditioner.inl index 9dc55184b98..cb76ecf8af5 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/SSORPreconditioner.inl +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/SSORPreconditioner.inl @@ -37,8 +37,6 @@ template SSORPreconditioner::SSORPreconditioner() : d_omega(initData(&d_omega, 1.0, "omega", "Omega coefficient") ) { - f_omega.setOriginalData(&d_omega); - } // solve (D+U) * D^-1 * ( D + U) diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/WarpPreconditioner.h b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/WarpPreconditioner.h index 8e0b34b3884..d1cacfed720 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/WarpPreconditioner.h +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/WarpPreconditioner.h @@ -54,9 +54,6 @@ class WarpPreconditioner : public sofa::component::linearsolver::MatrixLinearSol SingleLink l_linearSolver; ///< Link towards the linear solver used to build the warp conditioner - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() - Data f_useRotationFinder; - Data d_useRotationFinder; ///< Which rotation Finder to use Data d_updateStep; ///< Number of steps before the next refresh of the system matrix in the main solver @@ -64,7 +61,6 @@ class WarpPreconditioner : public sofa::component::linearsolver::MatrixLinearSol WarpPreconditioner(); public: - ~WarpPreconditioner(); void init() override; diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/WarpPreconditioner.inl b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/WarpPreconditioner.inl index 1485518579a..d4f761f15ef 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/WarpPreconditioner.inl +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/WarpPreconditioner.inl @@ -52,8 +52,6 @@ WarpPreconditioner::WarpPreconditioner() first = true; indexwork = 0; - - f_useRotationFinder.setParent(&d_useRotationFinder); } template diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/config.h.in b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/config.h.in index 7af4fca384b..4f8696a9c14 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/config.h.in +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/config.h.in @@ -38,11 +38,3 @@ namespace sofa::component::linearsolver::preconditioner } // namespace sofa::component::linearsolver::preconditioner -#ifdef SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_PRECONDITIONER -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMappingRigid.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMappingRigid.h index 3db305f50d9..0f78b1bb31e 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMappingRigid.h +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMappingRigid.h @@ -37,8 +37,6 @@ #include #include -#include - namespace sofa::component::mapping::linear { @@ -69,12 +67,6 @@ class BarycentricMapperTetrahedronSetTopologyRigid : public TopologyBarycentricM using Index = sofa::Index; protected: - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData> map; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData> mapOrient; - core::topology::PointData< sofa::type::vector > d_map; ///< mapper data core::topology::PointData< sofa::type::vector > d_mapOrient; ///< mapper data for mapped frames diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMappingRigid.inl b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMappingRigid.inl index 293cc847f61..50da54cb8a2 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMappingRigid.inl +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMappingRigid.inl @@ -37,8 +37,6 @@ BarycentricMapperTetrahedronSetTopologyRigid::BarycentricMapperTetrahedr matrixJ(nullptr), updateJ(true) { - mapOrient.setOriginalData(&d_mapOrient); - map.setOriginalData(&d_map); } template diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/DeformableOnRigidFrameMapping.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/DeformableOnRigidFrameMapping.h index ba1b963ae58..2daa51fb3ea 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/DeformableOnRigidFrameMapping.h +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/DeformableOnRigidFrameMapping.h @@ -26,8 +26,6 @@ #include -#include - namespace sofa::component::mapping::linear { @@ -95,25 +93,6 @@ class DeformableOnRigidFrameMapping : public LinearMulti2Mapping data; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData index; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData indexFromEnd; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData > repartition; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData globalToLocalCoords; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData m_rootAngularForceScaleFactor; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData m_rootLinearForceScaleFactor; - - Data d_index; ///< input DOF index Data< bool > d_indexFromEnd; ///< input DOF index starts from the end of input DOFs vector Data > d_repartition; ///< number of dest dofs per entry dof diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/DeformableOnRigidFrameMapping.inl b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/DeformableOnRigidFrameMapping.inl index dd14a870950..195104551be 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/DeformableOnRigidFrameMapping.inl +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/DeformableOnRigidFrameMapping.inl @@ -41,13 +41,6 @@ DeformableOnRigidFrameMapping::DeformableOnRigidFrameMapping , m_toModel(nullptr) , m_fromRootModel(nullptr) { - index.setOriginalData(&d_index); - indexFromEnd.setOriginalData(&d_indexFromEnd); - repartition.setOriginalData(&d_repartition); - globalToLocalCoords.setOriginalData(&d_globalToLocalCoords); - m_rootAngularForceScaleFactor.setOriginalData(&d_rootAngularForceScaleFactor); - m_rootLinearForceScaleFactor.setOriginalData(&d_rootLinearForceScaleFactor); - } template diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SkinningMapping.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SkinningMapping.h index 156ffe4f6b3..9316c0eca42 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SkinningMapping.h +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SkinningMapping.h @@ -32,8 +32,6 @@ #include #include -#include - namespace sofa::component::mapping::linear { @@ -77,25 +75,6 @@ class SkinningMapping : public LinearMapping typedef linearalgebra::EigenSparseMatrix SparseJMatrixEigen; protected: - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData f_initPos; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData< type::vector > nbRef; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData > > f_index; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData > > weight; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData showFromIndex; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData showWeights; - - Data d_initPos; ///< initial child coordinates in the world reference frame. // data for linear blending diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SkinningMapping.inl b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SkinningMapping.inl index c230af9a38b..ce8e70f3b6b 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SkinningMapping.inl +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SkinningMapping.inl @@ -48,14 +48,6 @@ SkinningMapping::SkinningMapping () defaultNbRef.push_back((unsigned ) 4); d_nbRef.setValue(defaultNbRef); - - f_initPos.setOriginalData(&d_initPos); - nbRef.setOriginalData(&d_nbRef); - f_index.setOriginalData(&d_index); - weight.setOriginalData(&d_weight); - showFromIndex.setOriginalData(&d_showFromIndex); - showWeights.setOriginalData(&d_showWeights); - } diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.h index 3a7d32b9a8e..21858156950 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.h +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.h @@ -32,8 +32,6 @@ #include #include -#include - namespace sofa::component::mapping::linear { @@ -86,28 +84,6 @@ class SubsetMapping : public LinearMapping using IndexArray = sofa::type::rebind_to; typedef sofa::core::topology::PointSubsetData< IndexArray > SetIndex; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData f_indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData f_first; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData f_last; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData f_radius; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData f_handleTopologyChange; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData f_ignoreNotFound; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData f_resizeToModel; - - SetIndex d_indices; Data < Index > d_first; ///< first index (use if indices are sequential) diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.inl b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.inl index 238bdffeb77..3560a4cbe35 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.inl +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.inl @@ -40,14 +40,6 @@ SubsetMapping::SubsetMapping() , matrixJ() , updateJ(false) { - f_indices.setOriginalData(&d_indices); - f_first.setOriginalData(&d_first); - f_last.setOriginalData(&d_last); - f_radius.setOriginalData(&d_radius); - f_handleTopologyChange.setOriginalData(&d_handleTopologyChange); - f_ignoreNotFound.setOriginalData(&d_ignoreNotFound); - f_resizeToModel.setOriginalData(&d_resizeToModel); - } template diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMultiMapping.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMultiMapping.h index d80e95eb0ab..8fc5781b9a3 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMultiMapping.h +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMultiMapping.h @@ -29,8 +29,6 @@ #include #include -#include - namespace sofa::component::mapping::linear { @@ -65,9 +63,6 @@ class SubsetMultiMapping : public LinearMultiMapping /// Experimental API used to handle multimappings in matrix assembly. Returns pointers to matrices associated with parent states, consistently with getFrom(). virtual const type::vector* getJs() override; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData< type::vector > indexPairs; - Data< type::vector > d_indexPairs; ///< list of couples (parent index + index in the parent) protected : diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMultiMapping.inl b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMultiMapping.inl index 62e1d9dd422..b788abdd744 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMultiMapping.inl +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMultiMapping.inl @@ -85,7 +85,6 @@ SubsetMultiMapping::SubsetMultiMapping() : d_indexPairs(initData(&d_indexPairs, type::vector(), "indexPairs", "list of couples (parent index + index in the parent)")) { - indexPairs.setOriginalData(&d_indexPairs); } template diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/TubularMapping.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/TubularMapping.h index a834febedfc..4677d59287a 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/TubularMapping.h +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/TubularMapping.h @@ -29,8 +29,6 @@ #include #include -#include - namespace sofa::component::mapping::linear { @@ -88,15 +86,6 @@ class TubularMapping : public LinearMapping void applyJT ( const core::ConstraintParams* /*cparams*/, InDataMatrixDeriv& dOut, const OutDataMatrixDeriv& dIn ) override; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData m_nbPointsOnEachCircle; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData m_radius; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::lifecycle::RenamedData m_peak; - Data d_nbPointsOnEachCircle; ///< Discretization of created circles Data d_radius; ///< Radius of created circles Data d_peak; ///< =0 no peak, =1 peak on the first segment =2 peak on the two first segment, =-1 peak on the last segment diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/TubularMapping.inl b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/TubularMapping.inl index 990a4b342c3..cf8dd51108a 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/TubularMapping.inl +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/TubularMapping.inl @@ -34,11 +34,8 @@ TubularMapping::TubularMapping ( ) , d_radius(initData(&d_radius, "radius", "Radius of created circles")) , d_peak (initData(&d_peak, 0, "peak", "=0 no peak, =1 peak on the first segment =2 peak on the two first segment, =-1 peak on the last segment")) { - m_nbPointsOnEachCircle.setOriginalData(&d_nbPointsOnEachCircle); - m_radius.setOriginalData(&d_radius); - m_peak.setOriginalData(&d_peak); - } + template void TubularMapping::init() { diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/config.h.in b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/config.h.in index 16e26293c95..220c1689e06 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/config.h.in +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/config.h.in @@ -36,12 +36,3 @@ namespace sofa::component::mapping::linear constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::mapping::linear - -#ifdef SOFA_BUILD_SOFA_COMPONENT_MAPPING_LINEAR -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceFromTargetMapping.h b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceFromTargetMapping.h index 615537ab7c4..b6a83b8d346 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceFromTargetMapping.h +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceFromTargetMapping.h @@ -30,8 +30,6 @@ #include #include -#include - namespace sofa::component::mapping::nonlinear { @@ -76,17 +74,6 @@ class DistanceFromTargetMapping : public BaseNonLinearMapping, typedef type::Vec Direction; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::lifecycle::RenamedData> f_indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::lifecycle::RenamedData f_targetPositions; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::lifecycle::RenamedData> f_restDistances; - -// d_showObjectScale and d_color are already up-to-date with the new naming convention, so they do not require deprecation notices. - Data> d_indices; ///< Indices of the parent points Data d_targetPositions; ///< Positions to compute the distances from Data> d_restDistances; ///< Rest lengths of the connections diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceFromTargetMapping.inl b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceFromTargetMapping.inl index c350fdf6a0d..579ab1468f1 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceFromTargetMapping.inl +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceFromTargetMapping.inl @@ -42,10 +42,6 @@ DistanceFromTargetMapping::DistanceFromTargetMapping() , d_showObjectScale(initData(&d_showObjectScale, 0.f, "showObjectScale", "Scale for object display")) , d_color(initData(&d_color, sofa::type::RGBAColor::yellow(), "showColor", "Color for object display.")) { - f_indices.setOriginalData(&d_indices); - f_targetPositions.setOriginalData(&d_targetPositions); - f_restDistances.setOriginalData(&d_restDistances); - } template diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.h b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.h index 7f2296efb23..2eaa44eb362 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.h +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.h @@ -29,8 +29,6 @@ #include #include -#include - namespace sofa::component::mapping::nonlinear { @@ -61,13 +59,6 @@ class DistanceMapping : public BaseNonLinearMapping typedef sofa::core::topology::BaseMeshTopology::SeqEdges SeqEdges; typedef type::Vec Direction; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::lifecycle::RenamedData f_computeDistance; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::lifecycle::RenamedData> f_restLengths; - - Data d_computeDistance; ///< if 'computeDistance = true', then rest length of each element equal 0, otherwise rest length is the initial length of each of them Data> d_restLengths; ///< Rest lengths of the connections Data d_showObjectScale; ///< Scale for object display diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.inl b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.inl index 981c0e22a39..8e68c7fc82d 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.inl +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.inl @@ -44,8 +44,6 @@ DistanceMapping::DistanceMapping() , d_color(initData(&d_color, sofa::type::RGBAColor::yellow(), "showColor", "Color for object display. (default=[1.0,1.0,0.0,1.0])")) , l_topology(initLink("topology", "link to the topology container")) { - f_computeDistance.setOriginalData(&d_computeDistance); - f_restLengths.setOriginalData(&d_restLengths); } template diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.h b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.h index 1f78b1868e2..763b6a752b7 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.h +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::mapping::nonlinear { @@ -76,12 +74,6 @@ class DistanceMultiMapping : public core::MultiMapping, public Stabil typedef sofa::core::topology::BaseMeshTopology::SeqEdges SeqEdges; typedef type::Vec Direction; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::lifecycle::RenamedData f_computeDistance; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::lifecycle::RenamedData> f_restLengths; - Data d_computeDistance; ///< if 'computeDistance = true', then rest length of each element equal 0, otherwise rest length is the initial length of each of them Data> d_restLengths; ///< Rest lengths of the connections Data d_showObjectScale; ///< Scale for object display diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.inl b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.inl index 5986765486f..e4731c8229a 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.inl +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.inl @@ -41,9 +41,6 @@ DistanceMultiMapping::DistanceMultiMapping() , d_indexPairs(initData(&d_indexPairs, "indexPairs", "list of couples (parent index + index in the parent)")) , l_topology(initLink("topology", "link to the topology container")) { - f_computeDistance.setOriginalData(&d_computeDistance); - f_restLengths.setOriginalData(&d_restLengths); - } template diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/config.h.in b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/config.h.in index 9d7c8995d87..24bdf7f4d0d 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/config.h.in +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/config.h.in @@ -36,12 +36,3 @@ namespace sofa::component::mapping::nonlinear constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::mapping::nonlinear - -#ifdef SOFA_BUILD_SOFA_COMPONENT_MAPPING_NONLINEAR -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EdgePressureForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EdgePressureForceField.h index e6243016b1e..c7710f0f137 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EdgePressureForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EdgePressureForceField.h @@ -25,8 +25,6 @@ #include #include -#include - namespace sofa::component::mechanicalload { @@ -82,39 +80,6 @@ class EdgePressureForceField : public core::behavior::ForceField sofa::core::topology::BaseMeshTopology* _completeTopology{nullptr}; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData > edgePressureMap; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData pressure; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData >edgeIndices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData > edges; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData normal; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData dmin; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData dmax; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData arrowSizeCoef; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData< type::vector > p_intensity; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData p_binormal; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData p_showForces; - Data d_pressure; ///< Pressure force per unit area Data > d_edgeIndices; ///< Indices of edges separated with commas where a pressure is applied Data > d_edges; ///< List of edges where a pressure is applied diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EdgePressureForceField.inl b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EdgePressureForceField.inl index de5021f6a85..8bb637ecb6b 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EdgePressureForceField.inl +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EdgePressureForceField.inl @@ -47,18 +47,6 @@ EdgePressureForceField::EdgePressureForceField() , l_topology(initLink("topology", "link to the topology container")) , m_topology(nullptr) { - edgePressureMap.setOriginalData(&d_edgePressureMap); - pressure.setOriginalData(&d_pressure); - edgeIndices.setOriginalData(&d_edgeIndices); - edges.setOriginalData(&d_edges); - normal.setOriginalData(&d_normal); - dmin.setOriginalData(&d_dmin); - dmax.setOriginalData(&d_dmax); - arrowSizeCoef.setOriginalData(&d_arrowSizeCoef); - p_intensity.setOriginalData(&d_intensity); - p_binormal.setOriginalData(&d_binormal); - p_showForces.setOriginalData(&d_showForces); - } template EdgePressureForceField::~EdgePressureForceField() diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/OscillatingTorsionPressureForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/OscillatingTorsionPressureForceField.h index 6328bec72d1..5524e63b383 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/OscillatingTorsionPressureForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/OscillatingTorsionPressureForceField.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::mechanicalload { @@ -83,36 +81,6 @@ class OscillatingTorsionPressureForceField : public core::behavior::ForceField > trianglePressureMap; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData moment; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData > triangleList; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData axis; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData center; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData penalty; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData frequency; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData dmin; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData dmax; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData p_showForces; - sofa::core::topology::TriangleSubsetData > d_trianglePressureMap; ///< Map between triangle indices and their pressure Data d_moment; ///< Moment force applied on the entire surface diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/OscillatingTorsionPressureForceField.inl b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/OscillatingTorsionPressureForceField.inl index 7b8432d94e2..f9a67c320dc 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/OscillatingTorsionPressureForceField.inl +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/OscillatingTorsionPressureForceField.inl @@ -46,17 +46,6 @@ OscillatingTorsionPressureForceField::OscillatingTorsionPressureForce , d_showForces(initData(&d_showForces, (bool)false, "showForces", "draw triangles which have a given pressure")) , rotationAngle(0) { - trianglePressureMap.setOriginalData(&d_trianglePressureMap); - moment.setOriginalData(&d_moment); - triangleList.setOriginalData(&d_triangleList); - axis.setOriginalData(&d_axis); - center.setOriginalData(&d_center); - penalty.setOriginalData(&d_penalty); - frequency.setOriginalData(&d_frequency); - dmin.setOriginalData(&d_dmin); - dmax.setOriginalData(&d_dmax); - p_showForces.setOriginalData(&d_showForces); - } template diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/QuadPressureForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/QuadPressureForceField.h index 39e42d3c37b..5880a219c41 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/QuadPressureForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/QuadPressureForceField.h @@ -25,8 +25,6 @@ #include #include -#include - namespace sofa::component::mechanicalload { @@ -54,31 +52,9 @@ class QuadPressureForceField : public core::behavior::ForceField using Index = sofa::Index; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData pressure; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData> quadList; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData normal; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData dmin; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData dmax; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData p_showForces; - - Data d_pressure; ///< Pressure force per unit area - Data > d_quadList; ///< Indices of quads separated with commas where a pressure is applied - - /// the normal used to define the edge subjected to the pressure force. - Data d_normal; + Data d_normal; ///< the normal used to define the edge subjected to the pressure force. Data d_dmin; ///< Minimum distance from the origin along the normal direction Data d_dmax; ///< Maximum distance from the origin along the normal direction @@ -118,12 +94,10 @@ class QuadPressureForceField : public core::behavior::ForceField return in; } }; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData > quadPressureMap; sofa::core::topology::QuadSubsetData > d_quadPressureMap; ///< Map between quad indices and their pressure - /// Pointer to the current topology /// Pointer to the current topology + /// Pointer to the current topology sofa::core::topology::BaseMeshTopology* m_topology; QuadPressureForceField(); diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/QuadPressureForceField.inl b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/QuadPressureForceField.inl index 9b6901a4524..0b869038c8c 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/QuadPressureForceField.inl +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/QuadPressureForceField.inl @@ -47,14 +47,6 @@ QuadPressureForceField::QuadPressureForceField() , d_quadPressureMap(initData(&d_quadPressureMap, "quadPressureMap", "Map between quad indices and their pressure")) , m_topology(nullptr) { - pressure.setOriginalData(&d_pressure); - quadList.setOriginalData(&d_quadList); - normal.setOriginalData(&d_normal); - dmin.setOriginalData(&d_dmin); - dmax.setOriginalData(&d_dmax); - p_showForces.setOriginalData(&d_showForces); - quadPressureMap.setOriginalData(&d_quadPressureMap); - } template diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.h index 993afb57855..abe3cff4ec4 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.h @@ -29,8 +29,6 @@ #include -#include - namespace sofa::component::mechanicalload { @@ -83,38 +81,12 @@ class SphereForceField : public core::behavior::ForceField } }; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData > contacts; Data > d_contacts; ///< Contacts SphereForceFieldInternalData data; public: - - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData sphereCenter; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData sphereRadius; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData stiffness; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData damping; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData color; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData> localRange; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData bilateral; - - Data d_sphereCenter; ///< sphere center Data d_sphereRadius; ///< sphere radius Data d_stiffness; ///< force stiffness diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.inl b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.inl index 8b0cd86df35..b9599ff4f5f 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.inl +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.inl @@ -60,15 +60,6 @@ SphereForceField::SphereForceField() , d_localRange(initData(&d_localRange, type::Vec<2,int>(-1, -1), "localRange", "optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitioning)" ) ) , d_bilateral(initData(&d_bilateral, false, "bilateral", "if true the sphere force field is applied on both sides")) { - contacts.setOriginalData(&d_contacts); - sphereCenter.setOriginalData(&d_sphereCenter); - sphereRadius.setOriginalData(&d_sphereRadius); - stiffness.setOriginalData(&d_stiffness); - damping.setOriginalData(&d_damping); - color.setOriginalData(&d_color); - localRange.setOriginalData(&d_localRange); - bilateral.setOriginalData(&d_bilateral); - } template diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SurfacePressureForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SurfacePressureForceField.h index b8a17afd690..e866cd70f32 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SurfacePressureForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SurfacePressureForceField.h @@ -25,8 +25,6 @@ #include #include -#include - namespace sofa::core::topology { class BaseMeshTopology; @@ -70,45 +68,6 @@ class SurfacePressureForceField : public core::behavior::ForceField enum State { INCREASE, DECREASE }; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_pressure; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_min; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_max; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_triangleIndices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_quadIndices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_pulseMode; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_pressureLowerBound; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_pressureSpeed; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_volumeConservationMode; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_useTangentStiffness; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_defaultVolume; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_mainDirection; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_drawForceScale; - Data d_pressure; ///< Pressure force per unit area Data d_min; ///< Lower bound of the selection box Data d_max; ///< Upper bound of the selection box diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SurfacePressureForceField.inl b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SurfacePressureForceField.inl index 226f5cb3ca1..95a4026e256 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SurfacePressureForceField.inl +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SurfacePressureForceField.inl @@ -56,20 +56,6 @@ SurfacePressureForceField::SurfacePressureForceField() , state(INCREASE) , m_topology(nullptr) { - m_pressure.setOriginalData(&d_pressure); - m_min.setOriginalData(&d_min); - m_max.setOriginalData(&d_max); - m_triangleIndices.setOriginalData(&d_triangleIndices); - m_quadIndices.setOriginalData(&d_quadIndices); - m_pulseMode.setOriginalData(&d_pulseMode); - m_pressureLowerBound.setOriginalData(&d_pressureLowerBound); - m_pressureSpeed.setOriginalData(&d_pressureSpeed); - m_volumeConservationMode.setOriginalData(&d_volumeConservationMode); - m_useTangentStiffness.setOriginalData(&d_useTangentStiffness); - m_defaultVolume.setOriginalData(&d_defaultVolume); - m_mainDirection.setOriginalData(&d_mainDirection); - m_drawForceScale.setOriginalData(&d_drawForceScale); - } diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.h index 98b4cb8ed60..9620bb0272d 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.h @@ -25,8 +25,6 @@ #include #include -#include - namespace sofa::component::mechanicalload { @@ -72,62 +70,6 @@ class TaitSurfacePressureForceField : public core::behavior::ForceField m_p0; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_B; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_gamma; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_injectedVolume; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_maxInjectionRate; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_initialVolume; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_currentInjectedVolume; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_v0; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_currentVolume; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_currentPressure; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_currentStiffness; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_pressureTriangles; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_initialSurfaceArea; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_currentSurfaceArea; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_drawForceScale; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_drawForceColor; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_volumeAfterTC; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_surfaceAreaAfterTC; - - Data< Real > d_p0; ///< IN: Rest pressure when V = V0 Data< Real > d_B; ///< IN: Bulk modulus (resistance to uniform compression) Data< Real > d_gamma; ///< IN: Bulk modulus (resistance to uniform compression) diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.inl b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.inl index 7bf9e3acd95..e2fd21f2716 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.inl +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.inl @@ -89,27 +89,6 @@ TaitSurfacePressureForceField::TaitSurfacePressureForceField(): d_surfaceAreaAfterTC.setGroup("Results"); d_surfaceAreaAfterTC.setReadOnly(true); this->f_listening.setValue(true); - - m_p0.setOriginalData(&d_p0); - m_B.setOriginalData(&d_B); - m_gamma.setOriginalData(&d_gamma); - m_injectedVolume.setOriginalData(&d_injectedVolume); - m_maxInjectionRate.setOriginalData(&d_maxInjectionRate); - m_initialVolume.setOriginalData(&d_initialVolume); - m_currentInjectedVolume.setOriginalData(&d_currentInjectedVolume); - m_v0.setOriginalData(&d_v0); - m_currentVolume.setOriginalData(&d_currentVolume); - m_currentPressure.setOriginalData(&d_currentPressure); - m_currentStiffness.setOriginalData(&d_currentStiffness); - m_pressureTriangles.setOriginalData(&d_pressureTriangles); - m_initialSurfaceArea.setOriginalData(&d_initialSurfaceArea); - m_currentSurfaceArea.setOriginalData(&d_currentSurfaceArea); - m_drawForceScale.setOriginalData(&d_drawForceScale); - m_drawForceColor.setOriginalData(&d_drawForceColor); - m_volumeAfterTC.setOriginalData(&d_volumeAfterTC); - m_surfaceAreaAfterTC.setOriginalData(&d_surfaceAreaAfterTC); - - } template diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TorsionForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TorsionForceField.h index d727c51636d..f1ac77d5e8b 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TorsionForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TorsionForceField.h @@ -30,8 +30,6 @@ #include #include -#include - namespace sofa::component::mechanicalload { @@ -84,19 +82,6 @@ class TorsionForceField : public ForceField SReal getPotentialEnergy(const core::MechanicalParams* /*mparams*/, const DataVecCoord& /* x */) const override; public : - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_torque; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_axis; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData m_origin; - Data d_indices; ///< indices of the selected points Data d_torque; ///< torque to apply Data d_axis; ///< direction of the axis (will be normalized) diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TorsionForceField.inl b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TorsionForceField.inl index 4bf9a94f21d..b3e092cf8cb 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TorsionForceField.inl +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TorsionForceField.inl @@ -48,12 +48,6 @@ TorsionForceField::TorsionForceField() : m_u.normalize(); return sofa::core::objectmodel::ComponentState::Valid; }, {&d_indices}); - - m_indices.setOriginalData(&d_indices); - m_torque.setOriginalData(&d_torque); - m_axis.setOriginalData(&d_axis); - m_origin.setOriginalData(&d_origin); - } template diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TrianglePressureForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TrianglePressureForceField.h index 348503e847c..666841cbb07 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TrianglePressureForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TrianglePressureForceField.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::mechanicalload { @@ -51,22 +49,6 @@ class TrianglePressureForceField : public core::behavior::ForceField using Index = sofa::Index; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData pressure; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData cauchyStress; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData > triangleList; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData p_showForces; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData p_useConstantForce; - - Data d_pressure; ///< Pressure force per unit area Data d_cauchyStress; ///< Cauchy Stress applied on the normal of each triangle @@ -78,9 +60,9 @@ class TrianglePressureForceField : public core::behavior::ForceField /// Link to be set to the topology container in the component graph. SingleLink, sofa::core::topology::BaseMeshTopology, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_topology; - core::objectmodel::lifecycle::DeprecatedData normal{ this, "v24.06", "v24.12", "normal", "Plan selection using normal, dmin, dmax has been removed. Triangles should be selected using an Engine.Select and passed using Data triangleList" }; - core::objectmodel::lifecycle::DeprecatedData dmin{ this, "v24.06", "v24.12", "dmin", "Plan selection using normal, dmin, dmax has been removed. Triangles should be selected using an Engine.Select and passed using Data triangleList" }; - core::objectmodel::lifecycle::DeprecatedData dmax{ this, "v24.06", "v24.12", "dmax", "Plan selection using normal, dmin, dmax has been removed. Triangles should be selected using an Engine.Select and passed using Data triangleList" }; + core::objectmodel::lifecycle::RemovedData normal{ this, "v24.06", "v24.12", "normal", "Plan selection using normal, dmin, dmax has been removed. Triangles should be selected using an Engine.Select and passed using Data triangleList" }; + core::objectmodel::lifecycle::RemovedData dmin{ this, "v24.06", "v24.12", "dmin", "Plan selection using normal, dmin, dmax has been removed. Triangles should be selected using an Engine.Select and passed using Data triangleList" }; + core::objectmodel::lifecycle::RemovedData dmax{ this, "v24.06", "v24.12", "dmax", "Plan selection using normal, dmin, dmax has been removed. Triangles should be selected using an Engine.Select and passed using Data triangleList" }; protected: diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TrianglePressureForceField.inl b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TrianglePressureForceField.inl index 95b8c82b742..a21fdac2882 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TrianglePressureForceField.inl +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TrianglePressureForceField.inl @@ -46,14 +46,7 @@ template TrianglePressureForceField::TrianglePress , d_trianglePressureMap(initData(&d_trianglePressureMap, "trianglePressureMap", "Map between triangle indices and their pressure")) , m_topology(nullptr) { - pressure.setOriginalData(&d_pressure); - cauchyStress.setOriginalData(&d_cauchyStress); - triangleList.setOriginalData(&d_triangleList); - p_showForces.setOriginalData(&d_showForces); - p_useConstantForce.setOriginalData(&d_useConstantForce); - - - this->addUpdateCallback("pressure_change", { &pressure }, [this](const core::DataTracker& t) + this->addUpdateCallback("pressure_change", { &d_pressure }, [this](const core::DataTracker& t) { SOFA_UNUSED(t); updateTriangleInformation(); @@ -61,13 +54,12 @@ template TrianglePressureForceField::TrianglePress }, {}); - this->addUpdateCallback("triangles_change", { &triangleList }, [this](const core::DataTracker& t) + this->addUpdateCallback("triangles_change", { &d_triangleList }, [this](const core::DataTracker& t) { SOFA_UNUSED(t); initTriangleInformation(); return sofa::core::objectmodel::ComponentState::Valid; }, {}); - } @@ -151,11 +143,11 @@ void TrianglePressureForceField::addDForce(const core::MechanicalPara template void TrianglePressureForceField::initTriangleInformation() { - if (triangleList.getValue().empty()) + if (d_triangleList.getValue().empty()) return; // Get list of input triangle indices - type::vector _triangleList = triangleList.getValue(); + type::vector _triangleList = d_triangleList.getValue(); // Get write access to TopologySubset Data storing pressure information per triangle auto my_subset = sofa::helper::getWriteOnlyAccessor(d_trianglePressureMap); @@ -165,7 +157,7 @@ void TrianglePressureForceField::initTriangleInformation() // Fill pressure data const VecCoord& x0 = this->mstate->read(core::vec_id::read_access::restPosition)->getValue(); - const Deriv& my_pressure = pressure.getValue(); + const Deriv& my_pressure = d_pressure.getValue(); for (unsigned int i = 0; i < _triangleList.size(); ++i) { @@ -188,7 +180,7 @@ void TrianglePressureForceField::updateTriangleInformation() { sofa::type::vector& my_subset = *(d_trianglePressureMap).beginEdit(); - const Deriv& my_pressure = pressure.getValue(); + const Deriv& my_pressure = d_pressure.getValue(); for (unsigned int i = 0; i < my_subset.size(); ++i) my_subset[i].force = (my_pressure * my_subset[i].area); @@ -198,7 +190,7 @@ void TrianglePressureForceField::updateTriangleInformation() template void TrianglePressureForceField::draw(const core::visual::VisualParams* vparams) { - if (!p_showForces.getValue()) + if (!d_showForces.getValue()) return; const auto stateLifeCycle = vparams->drawTool()->makeStateLifeCycle(); diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/UniformVelocityDampingForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/UniformVelocityDampingForceField.h index f297f3916c7..70ae8848ef6 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/UniformVelocityDampingForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/UniformVelocityDampingForceField.h @@ -24,8 +24,6 @@ #include -#include - namespace sofa::component::mechanicalload { @@ -48,9 +46,6 @@ class UniformVelocityDampingForceField : public core::behavior::ForceField DataVecCoord; typedef core::objectmodel::Data DataVecDeriv; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::lifecycle::RenamedData< Real > dampingCoefficient; - /// air drag coefficient. Data< Real > d_dampingCoefficient; Data d_implicit; ///< should it generate damping matrix df/dv? (explicit otherwise, i.e. only generating a force) diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/UniformVelocityDampingForceField.inl b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/UniformVelocityDampingForceField.inl index 8febc2a64ad..95c75bda0b3 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/UniformVelocityDampingForceField.inl +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/UniformVelocityDampingForceField.inl @@ -36,7 +36,6 @@ UniformVelocityDampingForceField::UniformVelocityDampingForceField() , d_implicit(initData(&d_implicit, false, "implicit", "should it generate damping matrix df/dv? (explicit otherwise, i.e. only generating a force)")) { core::objectmodel::Base::addAlias(&d_dampingCoefficient, "damping" ); - dampingCoefficient.setOriginalData(&d_dampingCoefficient); } template diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/config.h.in b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/config.h.in index d3380925eb4..5287c7f7c1b 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/config.h.in +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/config.h.in @@ -31,18 +31,17 @@ # define SOFA_COMPONENT_MECHANICALLOAD_API SOFA_IMPORT_DYNAMIC_LIBRARY #endif +#ifdef SOFA_BUILD_SOFA_COMPONENT_MECHANICALLOAD +#define SOFA_ELLIPSOIDFORCEFIELD_RENAMEDDATA_DISABLED() +#else +#define SOFA_ELLIPSOIDFORCEFIELD_RENAMEDDATA_DISABLED() \ + SOFA_ATTRIBUTE_DISABLED( \ + "v23.12", "v24.06", "This Data has been renamed to match convention with d_ prefix.") +#endif // SOFA_BUILD_SOFA_COMPONENT_MECHANICALLOAD + namespace sofa::component::mechanicalload { constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::mechanicalload - -#ifdef SOFA_BUILD_SOFA_COMPONENT_MECHANICALLOAD -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/MechanicalLoad/tests/QuadPressureForceField_test.cpp b/Sofa/Component/MechanicalLoad/tests/QuadPressureForceField_test.cpp index c701d775100..bf96d1a7a3b 100644 --- a/Sofa/Component/MechanicalLoad/tests/QuadPressureForceField_test.cpp +++ b/Sofa/Component/MechanicalLoad/tests/QuadPressureForceField_test.cpp @@ -74,7 +74,7 @@ struct QuadPressureForceField_test : public ForceField_test<_QuadPressureForceFi DataTypes::set( f[3], f0[0], f0[1], f0[2]); // Set the properties of the force field - Inherited::force->normal.setValue(Deriv(0,0,1)); + Inherited::force->d_normal.setValue(Deriv(0,0,1)); Inherited::force->d_dmin.setValue(-0.01); Inherited::force->d_dmax.setValue(0.01); Inherited::force->d_pressure=Coord(0, 0, 0.2); diff --git a/Sofa/Component/MechanicalLoad/tests/TrianglePressureForceField_test.cpp b/Sofa/Component/MechanicalLoad/tests/TrianglePressureForceField_test.cpp index 712cc8e8d10..000e249da3e 100644 --- a/Sofa/Component/MechanicalLoad/tests/TrianglePressureForceField_test.cpp +++ b/Sofa/Component/MechanicalLoad/tests/TrianglePressureForceField_test.cpp @@ -73,8 +73,8 @@ struct TrianglePressureForceField_test : public ForceField_test<_TrianglePressur // Set the properties of the force field sofa::type::vector indices = {0}; - Inherited::force->triangleList.setValue(indices); - Inherited::force->pressure=Coord(0,0,0.6); + Inherited::force->d_triangleList.setValue(indices); + Inherited::force->d_pressure=Coord(0,0,0.6); } //Test the value of the force it should be equal for each vertex to Pressure*area/4 diff --git a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/EulerImplicitSolver.cpp b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/EulerImplicitSolver.cpp index 292404278e4..9d829a9020f 100644 --- a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/EulerImplicitSolver.cpp +++ b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/EulerImplicitSolver.cpp @@ -48,11 +48,6 @@ EulerImplicitSolver::EulerImplicitSolver() , d_computeResidual(initData(&d_computeResidual, false, "computeResidual", "If true, the residual is computed at the end of the solving")) , d_residual(initData(&d_residual, std::numeric_limits::max(), "residual", "Residual norm at the end of the free-motion solving")) { - f_rayleighStiffness.setOriginalData(&d_rayleighStiffness); - f_rayleighMass.setOriginalData(&d_rayleighMass); - f_velocityDamping.setOriginalData(&d_velocityDamping); - f_firstOrder.setOriginalData(&d_firstOrder); - f_solveConstraint.setOriginalData(&d_solveConstraint); } void EulerImplicitSolver::init() diff --git a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/EulerImplicitSolver.h b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/EulerImplicitSolver.h index 7a9bd93f4e1..aba8e9fe33d 100644 --- a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/EulerImplicitSolver.h +++ b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/EulerImplicitSolver.h @@ -25,13 +25,10 @@ #include -#include - namespace sofa::simulation::common { class VectorOperations; } - namespace sofa::component::odesolver::backward { @@ -108,24 +105,6 @@ class SOFA_COMPONENT_ODESOLVER_BACKWARD_API EulerImplicitSolver : public: SOFA_CLASS2(EulerImplicitSolver, sofa::core::behavior::OdeSolver, sofa::core::behavior::LinearSolverAccessor); - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_rayleighStiffness; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_rayleighMass; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_velocityDamping; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_firstOrder; - - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_solveConstraint; - - - Data d_rayleighStiffness; ///< Rayleigh damping coefficient related to stiffness, > 0 Data d_rayleighMass; ///< Rayleigh damping coefficient related to mass, > 0 Data d_velocityDamping; ///< Velocity decay coefficient (no decay if null) @@ -136,7 +115,7 @@ class SOFA_COMPONENT_ODESOLVER_BACKWARD_API EulerImplicitSolver : Data d_computeResidual; ///< If true, the residual is computed at the end of the solving Data d_residual; ///< Residual norm at the end of the free-motion solving - + protected: EulerImplicitSolver(); public: diff --git a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/VariationalSymplecticSolver.cpp b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/VariationalSymplecticSolver.cpp index 8dfe7ab91d5..2211fba1849 100644 --- a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/VariationalSymplecticSolver.cpp +++ b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/VariationalSymplecticSolver.cpp @@ -49,16 +49,6 @@ VariationalSymplecticSolver::VariationalSymplecticSolver() , d_threadSafeVisitor(initData(&d_threadSafeVisitor, false, "threadSafeVisitor", "If true, do not use realloc and free visitors in fwdInteractionForceField.")) { cpt=0; - f_newtonError.setOriginalData(&d_newtonError); - f_newtonSteps.setOriginalData(&d_newtonSteps); - f_rayleighStiffness.setOriginalData(&d_rayleighStiffness); - f_rayleighMass.setOriginalData(&d_rayleighMass); - f_saveEnergyInFile.setOriginalData(&d_saveEnergyInFile); - f_explicit.setOriginalData(&d_explicit); - f_fileName.setOriginalData(&d_fileName); - f_computeHamiltonian.setOriginalData(&d_computeHamiltonian); - f_hamiltonianEnergy.setOriginalData(&d_hamiltonianEnergy); - f_useIncrementalPotentialEnergy.setOriginalData(&d_useIncrementalPotentialEnergy); } void VariationalSymplecticSolver::init() diff --git a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/VariationalSymplecticSolver.h b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/VariationalSymplecticSolver.h index 2b6067df466..d4eacb17e9b 100644 --- a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/VariationalSymplecticSolver.h +++ b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/VariationalSymplecticSolver.h @@ -26,8 +26,6 @@ #include #include -#include - namespace sofa::component::odesolver::backward { @@ -45,36 +43,6 @@ class SOFA_COMPONENT_ODESOLVER_BACKWARD_API VariationalSymplecticSolver public: SOFA_CLASS2(VariationalSymplecticSolver, sofa::core::behavior::OdeSolver, sofa::core::behavior::LinearSolverAccessor); - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_newtonError; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_newtonSteps; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_rayleighStiffness; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_rayleighMass; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_saveEnergyInFile; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_explicit; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_fileName; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_computeHamiltonian; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_hamiltonianEnergy; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_useIncrementalPotentialEnergy; - Data d_newtonError; ///< Error tolerance for Newton iterations Data d_newtonSteps; ///< Maximum number of Newton steps Data d_rayleighStiffness; ///< Rayleigh damping coefficient related to stiffness, > 0 diff --git a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/config.h.in b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/config.h.in index e462f9668b7..91214f5f4d7 100644 --- a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/config.h.in +++ b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/config.h.in @@ -37,12 +37,3 @@ namespace sofa::component::odesolver::backward constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::odesolver::backward - -#ifdef SOFA_BUILD_SOFA_COMPONENT_ODESOLVER_BACKWARD -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolverStatic_test.cpp b/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolverStatic_test.cpp index 66d3b6e2801..5097b566ea8 100644 --- a/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolverStatic_test.cpp +++ b/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolverStatic_test.cpp @@ -146,8 +146,8 @@ struct EulerImplicit_test_2_particles_to_equilibrium : public BaseSimulationTest // run simulation Eigen::VectorXd x0, x1, v0, v1; - x0 = component::odesolver::testing::getVector( root, core::VecId::position() ); //cerr<<"EulerImplicit_test, initial positions : " << x0.transpose() << endl; - v0 = component::odesolver::testing::getVector( root, core::VecId::velocity() ); + x0 = component::odesolver::testing::getVector( root, core::vec_id::write_access::position ); //cerr<<"EulerImplicit_test, initial positions : " << x0.transpose() << endl; + v0 = component::odesolver::testing::getVector( root, core::vec_id::write_access::velocity ); Eigen::VectorXd::RealScalar dx, dv; unsigned n=0; @@ -156,8 +156,8 @@ struct EulerImplicit_test_2_particles_to_equilibrium : public BaseSimulationTest do { sofa::simulation::node::animate(root.get(), 1_sreal); - x1 = component::odesolver::testing::getVector( root, core::VecId::position() ); //cerr<<"EulerImplicit_test, new positions : " << x1.transpose() << endl; - v1 = component::odesolver::testing::getVector( root, core::VecId::velocity() ); + x1 = component::odesolver::testing::getVector( root, core::vec_id::read_access::position ); //cerr<<"EulerImplicit_test, new positions : " << x1.transpose() << endl; + v1 = component::odesolver::testing::getVector( root, core::vec_id::read_access::velocity ); dx = (x0-x1).lpNorm(); dv = (v0-v1).lpNorm(); @@ -265,8 +265,8 @@ struct EulerImplicit_test_2_particles_in_different_nodes_to_equilibrium : publi // run simulation Eigen::VectorXd x0, x1, v0, v1; - x0 = component::odesolver::testing::getVector(root, core::VecId::position() ); //cerr<<"EulerImplicit_test, initial positions : " << x0.transpose() << endl; - v0 = component::odesolver::testing::getVector(root, core::VecId::velocity() ); + x0 = component::odesolver::testing::getVector(root, core::vec_id::write_access::position ); //cerr<<"EulerImplicit_test, initial positions : " << x0.transpose() << endl; + v0 = component::odesolver::testing::getVector(root, core::vec_id::write_access::velocity ); SReal dx, dv; unsigned n=0; @@ -275,8 +275,8 @@ struct EulerImplicit_test_2_particles_in_different_nodes_to_equilibrium : publi do { sofa::simulation::node::animate(root.get(), 1_sreal); - x1 = component::odesolver::testing::getVector(root, core::VecId::position() ); //cerr<<"EulerImplicit_test, new positions : " << x1.transpose() << endl; - v1 = component::odesolver::testing::getVector(root, core::VecId::velocity() ); + x1 = component::odesolver::testing::getVector(root, core::vec_id::read_access::position ); //cerr<<"EulerImplicit_test, new positions : " << x1.transpose() << endl; + v1 = component::odesolver::testing::getVector(root, core::vec_id::read_access::velocity ); dx = (x0-x1).lpNorm(); dv = (v0-v1).lpNorm(); diff --git a/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticImplicitSolverNonLinearForceDynamic_test.cpp b/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticImplicitSolverNonLinearForceDynamic_test.cpp index 2c729cc8bb8..aa1234010e5 100644 --- a/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticImplicitSolverNonLinearForceDynamic_test.cpp +++ b/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticImplicitSolverNonLinearForceDynamic_test.cpp @@ -173,7 +173,7 @@ struct VariationalSymplecticImplicitSolverNonLinearForceDynamic_test : public Ba do { // Record the planet position - Coord p0=dofs.get()->read(sofa::core::ConstVecCoordId::position())->getValue()[1]; + Coord p0=dofs.get()->read(sofa::core::vec_id::read_access::position)->getValue()[1]; // Compute angle angle = atan2(p0[1],p0[0]); diff --git a/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/CentralDifferenceSolver.cpp b/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/CentralDifferenceSolver.cpp index 9204dcc8f63..ba0fd8e00af 100644 --- a/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/CentralDifferenceSolver.cpp +++ b/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/CentralDifferenceSolver.cpp @@ -36,7 +36,6 @@ CentralDifferenceSolver::CentralDifferenceSolver() : d_rayleighMass(initData(&d_rayleighMass, (SReal)0.0, "rayleighMass", "Rayleigh damping coefficient related to mass")) , d_threadSafeVisitor(initData(&d_threadSafeVisitor, false, "threadSafeVisitor", "If true, do not use realloc and free visitors in fwdInteractionForceField.")) { - f_rayleighMass.setOriginalData(&d_rayleighMass); } /** diff --git a/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/CentralDifferenceSolver.h b/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/CentralDifferenceSolver.h index 592bbb2c960..2c281c1c6d6 100644 --- a/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/CentralDifferenceSolver.h +++ b/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/CentralDifferenceSolver.h @@ -24,8 +24,6 @@ #include -#include - namespace sofa::component::odesolver::forward { @@ -43,8 +41,6 @@ class SOFA_COMPONENT_ODESOLVER_FORWARD_API CentralDifferenceSolver : public sofa CentralDifferenceSolver(); public: void solve (const core::ExecParams* params, SReal dt, sofa::core::MultiVecCoordId xResult, sofa::core::MultiVecDerivId vResult) override; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_FORWARD() - sofa::core::objectmodel::lifecycle::RenamedData f_rayleighMass; Data d_rayleighMass; ///< Rayleigh damping coefficient related to mass Data d_threadSafeVisitor; ///< If true, do not use realloc and free visitors in fwdInteractionForceField. diff --git a/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/DampVelocitySolver.cpp b/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/DampVelocitySolver.cpp index 1590035c551..c6cfae40acc 100644 --- a/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/DampVelocitySolver.cpp +++ b/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/DampVelocitySolver.cpp @@ -40,8 +40,6 @@ DampVelocitySolver::DampVelocitySolver() : d_rate(initData(&d_rate, 0.99_sreal, "rate", "Factor used to reduce the velocities. Typically between 0 and 1.") ) , d_threshold(initData(&d_threshold, 0.0_sreal, "threshold", "Threshold under which the velocities are canceled.") ) { - rate.setOriginalData(&d_rate); - threshold.setOriginalData(&d_threshold); } void DampVelocitySolver::solve(const core::ExecParams* params, SReal dt, sofa::core::MultiVecCoordId /*xResult*/, sofa::core::MultiVecDerivId vResult) diff --git a/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/DampVelocitySolver.h b/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/DampVelocitySolver.h index ddfe643f313..40d14aab348 100644 --- a/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/DampVelocitySolver.h +++ b/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/DampVelocitySolver.h @@ -25,8 +25,6 @@ #include -#include - namespace sofa::component::odesolver::forward { @@ -36,12 +34,6 @@ This is not an ODE solver, but it can be used as a post-process after a real ODE class SOFA_COMPONENT_ODESOLVER_FORWARD_API DampVelocitySolver : public sofa::core::behavior::OdeSolver { public: - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_FORWARD() - sofa::core::objectmodel::lifecycle::RenamedData rate; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_FORWARD() - sofa::core::objectmodel::lifecycle::RenamedData threshold; - SOFA_CLASS(DampVelocitySolver, sofa::core::behavior::OdeSolver); void solve (const core::ExecParams* params, SReal dt, sofa::core::MultiVecCoordId xResult, sofa::core::MultiVecDerivId vResult) override; diff --git a/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/EulerSolver.h b/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/EulerSolver.h index 2b904f356bb..7e49bf96e99 100644 --- a/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/EulerSolver.h +++ b/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/EulerSolver.h @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v24.12", "v25.06", "sofa/component/odesolver/forward/EulerExplicitSolver.h") +SOFA_HEADER_DISABLED("v24.12", "v25.06", "sofa/component/odesolver/forward/EulerExplicitSolver.h") diff --git a/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/config.h.in b/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/config.h.in index e1b925799d1..dcb8386cf32 100644 --- a/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/config.h.in +++ b/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/config.h.in @@ -37,13 +37,3 @@ namespace sofa::component::odesolver::forward constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::odesolver::forward - -#ifdef SOFA_BUILD_SOFA_COMPONENT_ODESOLVER_FORWARD -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_FORWARD() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_FORWARD() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif - diff --git a/Sofa/Component/Playback/src/sofa/component/playback/config.h.in b/Sofa/Component/Playback/src/sofa/component/playback/config.h.in index 8b161d92c68..60ef0edbde7 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/config.h.in +++ b/Sofa/Component/Playback/src/sofa/component/playback/config.h.in @@ -38,12 +38,3 @@ namespace sofa::component::playback constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::playback - -// Keep the previous macros -// This backward compatibility will be removed at v23.06 -#ifndef SOFAGENERALLOADER_HAVE_ZLIB -#define SOFAGENERALLOADER_HAVE_ZLIB SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB -#endif -#ifndef SOFAEXPORTER_HAVE_ZLIB -#define SOFAEXPORTER_HAVE_ZLIB SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB -#endif diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/BeamFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/BeamFEMForceField.h index 29b3f8144cb..24cd94323d4 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/BeamFEMForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/BeamFEMForceField.h @@ -25,8 +25,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::fem::elastic { @@ -131,10 +129,6 @@ class BeamFEMForceField : public BaseLinearElasticityFEMForceField } }; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData> m_beamsData; - - EdgeData > d_beamsData; ///< Internal element data protected: diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/BeamFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/BeamFEMForceField.inl index 10e7cb5e22e..b9def063f0f 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/BeamFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/BeamFEMForceField.inl @@ -60,7 +60,7 @@ BeamFEMForceField::BeamFEMForceField(Real poissonRatio, Real youngMod , m_updateStiffnessMatrix(true) { d_radius.setRequired(true); - m_beamsData.setOriginalData(&d_beamsData); + this->setPoissonRatio(poissonRatio); this->setYoungModulus(youngModulus); } diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.h index 0f5fb51e58f..770ea885bd2 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.h @@ -31,8 +31,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::fem::elastic { @@ -116,40 +114,6 @@ class FastTetrahedralCorotationalForceField : public BaseLinearElasticityFEMForc using VecTetrahedronRestInformation = type::rebind_to; using VecMat3x3 = type::rebind_to; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData pointInfo; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData edgeInfo; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData tetrahedronInfo; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_method; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_poissonRatio; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - SOFA_ATTRIBUTE_DISABLED("", "v24.12", "Use d_youngModulus instead") DeprecatedAndRemoved f_youngModulus; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_drawing; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData drawColor1; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData drawColor2; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData drawColor3; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData drawColor4; - - core::topology::PointData d_pointInfo; ///< Internal point data core::topology::EdgeData d_edgeInfo; ///< Internal edge data core::topology::TetrahedronData d_tetrahedronInfo; ///< Internal tetrahedron data diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.inl index 8c13c9aae37..1f90de5e5d4 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.inl @@ -152,16 +152,6 @@ FastTetrahedralCorotationalForceField::FastTetrahedralCorotationalFor , d_drawColor4(initData(&d_drawColor4, sofa::type::RGBAColor(0.5f, 1.0f, 1.0f, 1.0f), "drawColor4", " draw color for faces 4")) , updateMatrix(true) { - pointInfo.setOriginalData(&d_pointInfo); - edgeInfo.setOriginalData(&d_edgeInfo); - tetrahedronInfo.setOriginalData(&d_tetrahedronInfo); - f_method.setOriginalData(&d_method); - f_drawing.setOriginalData(&d_drawing); - drawColor1.setOriginalData(&d_drawColor1); - drawColor2.setOriginalData(&d_drawColor2); - drawColor3.setOriginalData(&d_drawColor3); - drawColor4.setOriginalData(&d_drawColor4); - } template diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceField.h index 49ae29b2640..27af165194a 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceField.h @@ -30,8 +30,6 @@ #include -#include - namespace sofa::component::solidmechanics::fem::elastic { @@ -185,16 +183,6 @@ class HexahedralFEMForceField : virtual public BaseLinearElasticityFEMForceField public: int method; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_method; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_poissonRatio; - - SOFA_ATTRIBUTE_DISABLED("", "v24.12", "Use d_youngModulus instead") DeprecatedAndRemoved f_youngModulus; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData > hexahedronInfo; Data d_method; ///< "large" or "polar" displacements diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceField.inl index bd2e5cf3d83..8cc000680a6 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceField.inl @@ -65,16 +65,11 @@ HexahedralFEMForceField::HexahedralFEMForceField() _coef[5][0]= 1; _coef[5][1]= -1; _coef[5][2]= 1; _coef[6][0]= 1; _coef[6][1]= 1; _coef[6][2]= 1; _coef[7][0]= -1; _coef[7][1]= 1; _coef[7][2]= 1; - - f_method.setOriginalData(&d_method); - hexahedronInfo.setOriginalData(&d_hexahedronInfo); - } template HexahedralFEMForceField::~HexahedralFEMForceField() { - } diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceFieldAndMass.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceFieldAndMass.h index f436dfd65c0..e85613ce8d1 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceFieldAndMass.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceFieldAndMass.h @@ -28,8 +28,6 @@ #include -#include - namespace sofa::component::solidmechanics::fem::elastic { @@ -126,25 +124,6 @@ class HexahedralFEMForceFieldAndMass : virtual public sofa::core::behavior::Mass void computeLumpedMasses(); protected: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData _density; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData _useLumpedMass; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData> _elementMasses; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData > _elementTotalMass; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData > _particleMasses; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData > _lumpedMasses; - Data d_density; ///< density == volumetric mass in english (kg.m-3) Data d_useLumpedMass; ///< Does it use lumped masses? diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceFieldAndMass.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceFieldAndMass.inl index a1caaa2e893..968e72cd24e 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceFieldAndMass.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceFieldAndMass.inl @@ -41,13 +41,6 @@ HexahedralFEMForceFieldAndMass::HexahedralFEMForceFieldAndMass() , d_particleMasses(initData(&d_particleMasses, "particleMasses", "Mass per particle", false)) , d_lumpedMasses(initData(&d_lumpedMasses, "lumpedMasses", "Lumped masses", false)) { - _density.setOriginalData(&d_density); - _useLumpedMass.setOriginalData(&d_useLumpedMass); - _elementMasses.setOriginalData(&d_elementMasses); - _elementTotalMass.setOriginalData(&d_elementTotalMass); - _particleMasses.setOriginalData(&d_particleMasses); - _lumpedMasses.setOriginalData(&d_lumpedMasses); - } diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedronFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedronFEMForceField.h index 92b4462cf3c..9bed7b8db99 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedronFEMForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedronFEMForceField.h @@ -32,8 +32,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::fem::elastic { @@ -116,31 +114,6 @@ class HexahedronFEMForceField : virtual public BaseLinearElasticityFEMForceField int method; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_method; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_poissonRatio; - - SOFA_ATTRIBUTE_DISABLED("", "v24.12", "Use d_youngModulus instead") DeprecatedAndRemoved f_youngModulus; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_updateStiffnessMatrix; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData< sofa::helper::OptionsGroup > _gatherPt; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData< sofa::helper::OptionsGroup > _gatherBsize; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_drawing; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_drawPercentageOffset; - - - Data d_method; ///< "large" or "polar" or "small" displacements Data d_updateStiffnessMatrix; Data< sofa::helper::OptionsGroup > d_gatherPt; ///< number of dof accumulated per threads during the gather operation (Only use in GPU version) @@ -193,9 +166,6 @@ class HexahedronFEMForceField : virtual public BaseLinearElasticityFEMForceField typedef type::Mat<24, 24, Real> ElementStiffness; typedef type::vector VecElementStiffness; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData _elementStiffnesses; - Data d_elementStiffnesses; ///< Stiffness matrices per element (K_i) typedef std::pair Col_Value; @@ -206,9 +176,6 @@ class HexahedronFEMForceField : virtual public BaseLinearElasticityFEMForceField topology::container::grid::SparseGridTopology* _sparseGrid; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData _initialPoints; - Data< VecCoord > d_initialPoints; ///< Initial Position type::Mat<8,3,int> _coef; ///< coef of each vertices to compute the strain stress matrix diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedronFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedronFEMForceField.inl index 4fc06689e2c..c19f55ab44a 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedronFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedronFEMForceField.inl @@ -89,16 +89,6 @@ HexahedronFEMForceField::HexahedronFEMForceField() _coef[7][2]=1; _alreadyInit=false; - - f_method.setOriginalData(&d_method); - f_updateStiffnessMatrix.setOriginalData(&d_updateStiffnessMatrix); - _gatherPt.setOriginalData(&d_gatherPt); - _gatherBsize.setOriginalData(&d_gatherBsize); - f_drawing.setOriginalData(&d_drawing); - f_drawPercentageOffset.setOriginalData(&d_drawPercentageOffset); - _elementStiffnesses.setOriginalData(&d_elementStiffnesses); - _initialPoints.setOriginalData(&d_initialPoints); - } diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.h index 2e537911626..088ac6811f5 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.h @@ -36,8 +36,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::fem::elastic { @@ -169,14 +167,6 @@ class QuadBendingFEMForceField : public core::behavior::ForceField } }; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData > quadInfo; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData > vertexInfo; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData > edgeInfo; /// Topology Data core::topology::QuadData > d_quadInfo; core::topology::PointData > d_vertexInfo; ///< Internal point data @@ -232,18 +222,6 @@ protected : /// Forcefield intern parameters int method; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_method; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData> f_poisson; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData> f_young; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_thickness; - Data d_method; ///< large: large displacements, small: small displacements Data > d_poisson; ///< Poisson ratio in Hooke's law (vector) Data > d_young; ///< Young modulus in Hooke's law (vector) diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.inl index 2439b38ea7e..018f6e0805c 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.inl @@ -77,14 +77,6 @@ QuadBendingFEMForceField::QuadBendingFEMForceField() , l_topology(initLink("topology", "link to the topology container")) { - quadInfo.setOriginalData(&d_quadInfo); - vertexInfo.setOriginalData(&d_vertexInfo); - edgeInfo.setOriginalData(&d_edgeInfo); - f_method.setOriginalData(&d_method); - f_poisson.setOriginalData(&d_poisson); - f_young.setOriginalData(&d_young); - f_thickness.setOriginalData(&d_thickness); - } template diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedralCorotationalFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedralCorotationalFEMForceField.h index 3743f9d7c89..bb48014af31 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedralCorotationalFEMForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedralCorotationalFEMForceField.h @@ -31,8 +31,6 @@ #include #include -#include - // corotational tetrahedron from // @InProceedings{NPF05, // author = "Nesme, Matthieu and Payan, Yohan and Faure, Fran\c{c}ois", @@ -127,9 +125,6 @@ class TetrahedralCorotationalFEMForceField : public BaseLinearElasticityFEMForce } }; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData > tetrahedronInfo; - /// container that stotes all requires information for each tetrahedron core::topology::TetrahedronData > d_tetrahedronInfo; @@ -144,45 +139,11 @@ class TetrahedralCorotationalFEMForceField : public BaseLinearElasticityFEMForce /// @} SReal m_potentialEnergy; - sofa::core::topology::BaseMeshTopology* _topology; public: int method; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_method; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData _poissonRatio; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - SOFA_ATTRIBUTE_DISABLED("", "v24.12", "Use d_youngModulus instead") DeprecatedAndRemoved _youngModulus; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData _localStiffnessFactor; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData _updateStiffnessMatrix; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData _assembling; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_drawing; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData drawColor1; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData drawColor2; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData drawColor3; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData drawColor4; - Data d_method; ///< "small", "large" (by QR) or "polar" displacements Data d_localStiffnessFactor; ///< Allow specification of different stiffness per element. If there are N element and M values are specified, the youngModulus factor for element i would be localStiffnessFactor[i*M/N] Data d_updateStiffnessMatrix; diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedralCorotationalFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedralCorotationalFEMForceField.inl index 93d7fa1365f..224fd673b60 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedralCorotationalFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedralCorotationalFEMForceField.inl @@ -84,19 +84,6 @@ TetrahedralCorotationalFEMForceField::TetrahedralCorotationalFEMForce , m_vonMisesColorMap(nullptr) { this->addAlias(&d_assembling, "assembling"); - - tetrahedronInfo.setOriginalData(&d_tetrahedronInfo); - f_method.setOriginalData(&d_method); - _localStiffnessFactor.setOriginalData(&d_localStiffnessFactor); - _updateStiffnessMatrix.setOriginalData(&d_updateStiffnessMatrix); - _assembling.setOriginalData(&d_assembling); - f_drawing.setOriginalData(&d_drawing); - drawColor1.setOriginalData(&d_drawColor1); - drawColor2.setOriginalData(&d_drawColor2); - drawColor3.setOriginalData(&d_drawColor3); - drawColor4.setOriginalData(&d_drawColor4); - - } @@ -900,7 +887,7 @@ void TetrahedralCorotationalFEMForceField::initLarge(int i, Index&a, [[maybe_unused]] const bool canInvert = type::invertMatrix(tetrahedronInf[i].elemShapeFun, matVert); - tetrahedronInfo.endEdit(); + d_tetrahedronInfo.endEdit(); } template @@ -1231,7 +1218,7 @@ void TetrahedralCorotationalFEMForceField::computeVonMisesStress() const VecCoord& X = mechanicalObject->read(core::vec_id::read_access::position)->getValue(); const sofa::core::topology::BaseMeshTopology::SeqTetrahedra& tetras = this->l_topology->getTetrahedra(); - const type::vector::TetrahedronInformation>& tetrahedronInf = tetrahedronInfo.getValue(); + const type::vector::TetrahedronInformation>& tetrahedronInf = d_tetrahedronInfo.getValue(); helper::WriteAccessor > > vME = d_vonMisesPerElement; vME.resize(tetras.size()); diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.h index f5e28dabc83..809e330aaed 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.h @@ -33,7 +33,6 @@ #include #include -#include // corotational tetrahedron from // @InProceedings{NPF05, @@ -188,45 +187,15 @@ class TetrahedronFEMForceField : public BaseLinearElasticityFEMForceField m_rotations; const type::vector& getRotations() override; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _initialPoints; - Data< VecCoord > d_initialPoints; ///< Initial Position int method; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData f_method; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - DeprecatedAndRemoved _poissonRatio; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _youngModulus; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _localStiffnessFactor; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _updateStiffnessMatrix; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _assembling; - Data d_method; ///< "small", "large" (by QR), "polar" or "svd" displacements Data d_localStiffnessFactor; ///< Allow specification of different stiffness per element. If there are N element and M values are specified, the youngModulus factor for element i would be localStiffnessFactor[i*M/N] Data d_updateStiffnessMatrix; Data d_assembling; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _plasticMaxThreshold; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _plasticYieldThreshold; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _plasticCreep; - /// @name Plasticity such as "Interactive Virtual Materials", Muller & Gross, GI 2004 /// @{ Data d_plasticMaxThreshold; @@ -234,15 +203,6 @@ class TetrahedronFEMForceField : public BaseLinearElasticityFEMForceField d_plasticCreep; ///< Plastic Creep Factor * dt [0,1]. Warning this factor depends on dt. /// @} - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _gatherPt; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _gatherBsize; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData drawHeterogeneousTetra; - Data< sofa::helper::OptionsGroup > d_gatherPt; ///< number of dof accumulated per threads during the gather operation (Only use in GPU version) Data< sofa::helper::OptionsGroup > d_gatherBsize; ///< number of dof accumulated per threads during the gather operation (Only use in GPU version) Data< bool > d_drawHeterogeneousTetra; ///< Draw Heterogeneous Tetra in different color @@ -258,18 +218,6 @@ class TetrahedronFEMForceField : public BaseLinearElasticityFEMForceField _computeVonMisesStress; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData > _vonMisesPerElement; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData > _vonMisesPerNode; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData > _vonMisesStressColors; - Data d_computeVonMisesStress; ///< compute and display von Mises stress: 0: no computations, 1: using corotational strain, 2: using full Green strain. Set listening=1 Data > d_vonMisesPerElement; ///< von Mises Stress per element Data > d_vonMisesPerNode; ///< von Mises Stress per node @@ -278,24 +226,6 @@ class TetrahedronFEMForceField : public BaseLinearElasticityFEMForceField _showStressColorMap; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _showStressAlpha; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _showVonMisesStressPerNode; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _showVonMisesStressPerNodeColorMap; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _showVonMisesStressPerElement; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::lifecycle::RenamedData _updateStiffness; - Data d_showStressColorMap; ///< Color map used to show stress values Data d_showStressAlpha; ///< Alpha for vonMises visualisation Data d_showVonMisesStressPerNode; ///< draw points showing vonMises stress interpolated in nodes diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.inl index 9e3543655af..58610469489 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.inl @@ -124,31 +124,6 @@ TetrahedronFEMForceField::TetrahedronFEMForceField() return sofa::core::objectmodel::ComponentState::Valid; }, {}); - - _initialPoints.setOriginalData(&d_initialPoints); - f_method.setOriginalData(&d_method); - _youngModulus.setOriginalData(&this->d_youngModulus); - _localStiffnessFactor.setOriginalData(&d_localStiffnessFactor); - _updateStiffnessMatrix.setOriginalData(&d_updateStiffnessMatrix); - _assembling.setOriginalData(&d_assembling); - _plasticMaxThreshold.setOriginalData(&d_plasticMaxThreshold); - _plasticYieldThreshold.setOriginalData(&d_plasticYieldThreshold); - _plasticCreep.setOriginalData(&d_plasticCreep); - _gatherPt.setOriginalData(&d_gatherPt); - _gatherBsize.setOriginalData(&d_gatherBsize); - drawHeterogeneousTetra.setOriginalData(&d_drawHeterogeneousTetra); - _computeVonMisesStress.setOriginalData(&d_computeVonMisesStress); - _vonMisesPerElement.setOriginalData(&d_vonMisesPerElement); - _vonMisesPerNode.setOriginalData(&d_vonMisesPerNode); - _vonMisesStressColors.setOriginalData(&d_vonMisesStressColors); - _showStressColorMap.setOriginalData(&d_showStressColorMap); - _showStressAlpha.setOriginalData(&d_showStressAlpha); - _showVonMisesStressPerNode.setOriginalData(&d_showVonMisesStressPerNode); - _showVonMisesStressPerNodeColorMap.setOriginalData(&d_showVonMisesStressPerNodeColorMap); - _showVonMisesStressPerElement.setOriginalData(&d_showVonMisesStressPerElement); - _updateStiffness.setOriginalData(&d_updateStiffness); - - } diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangleFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangleFEMForceField.h index 4815eec396f..b17f79a837b 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangleFEMForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangleFEMForceField.h @@ -28,8 +28,6 @@ #include #include -#include - // corotational triangle from // @InProceedings{NPF05, // author = "Nesme, Matthieu and Payan, Yohan and Faure, Fran\c{c}ois", @@ -91,9 +89,6 @@ class TriangleFEMForceField : public BaseLinearElasticityFEMForceField _initialPoints; - Data< VecCoord > d_initialPoints; ///< Initial Position TriangleFEMForceField(); @@ -119,20 +114,6 @@ class TriangleFEMForceField : public BaseLinearElasticityFEMForceField f_method; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_poisson; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_young; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_thickness; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_planeStrain; Data d_method; ///< large: large displacements, small: small displacements Data d_thickness; ///< Thickness of the elements diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangleFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangleFEMForceField.inl index 13ec574a40d..7fa8efb8208 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangleFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangleFEMForceField.inl @@ -42,11 +42,6 @@ TriangleFEMForceField() , d_thickness(initData(&d_thickness, Real(1.), "thickness", "Thickness of the elements")) , d_planeStrain(initData(&d_planeStrain, false, "planeStrain", "Plane strain or plane stress assumption")) { - _initialPoints.setOriginalData(&d_initialPoints); - f_method.setOriginalData(&d_method); - f_thickness.setOriginalData(&d_thickness); - f_planeStrain.setOriginalData(&d_planeStrain); - } template @@ -251,7 +246,7 @@ void TriangleFEMForceField::initSmall() { _rotatedInitialElements.resize(_indexedElements->size()); - const VecCoord& pos = _initialPoints.getValue(); + const VecCoord& pos = d_initialPoints.getValue(); for (unsigned i = 0; i < _indexedElements->size(); ++i) { _rotations[i] = Transformation::Identity(); diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularAnisotropicFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularAnisotropicFEMForceField.h index 27231b69eba..d7c86d2b922 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularAnisotropicFEMForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularAnisotropicFEMForceField.h @@ -32,8 +32,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::fem::elastic { @@ -76,22 +74,6 @@ class TriangularAnisotropicFEMForceField : public TriangularFEMForceField d_young2; ///< Young modulus along transverse direction typedef typename TriangularAnisotropicFEMForceField::Deriv TriangleFiberDirection; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData> f_young2; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_theta; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_fiberCenter; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData showFiber; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData > localFiberDirection; - - Data > f_poisson2; Data > d_young2; ///< Young modulus along transverse direction Data d_theta; ///< Fiber angle in global reference frame (in degrees) diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularAnisotropicFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularAnisotropicFEMForceField.inl index 9357c4fe811..918c563cc9c 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularAnisotropicFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularAnisotropicFEMForceField.inl @@ -47,15 +47,7 @@ TriangularAnisotropicFEMForceField::TriangularAnisotropicFEMForceFiel , d_localFiberDirection(initData(&d_localFiberDirection, "localFiberDirection", "Computed fibers direction within each triangle")) { this->_anisotropicMaterial = true; - d_young2.setRequired(true); - - f_young2.setOriginalData(&d_young2); - f_theta.setOriginalData(&d_theta); - f_fiberCenter.setOriginalData(&d_fiberCenter); - showFiber.setOriginalData(&d_showFiber); - localFiberDirection.setOriginalData(&d_localFiberDirection); - } diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.h index 67273d2f9e5..cd4b126c66c 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.h @@ -33,8 +33,6 @@ #include #endif -#include - namespace sofa::helper { class ColorMap; @@ -186,12 +184,6 @@ class TriangularFEMForceField : public BaseLinearElasticityFEMForceField> triangleInfo; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData > vertexInfo; - /// Topology Data core::topology::TriangleData > d_triangleInfo; core::topology::PointData > d_vertexInfo; ///< Internal point data @@ -255,39 +247,6 @@ protected : /// Forcefield intern parameters int method; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_method; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData> f_poisson; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData> f_young; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData > > m_rotatedInitialElements; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData > m_initialTransformation; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData hosfordExponant; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData criteriaValue; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData showStressValue; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData showStressVector; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData showFracturableTriangles; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::lifecycle::RenamedData f_computePrincipalStress; - Data d_method; ///< large: large displacements, small: small displacements /// Initial strain parameters (if FEM is initialised with predefine values) diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.inl index 814c57bdb09..1b5b2040195 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.inl @@ -63,27 +63,14 @@ TriangularFEMForceField::TriangularFEMForceField() , p_computeDrawInfo(false) { _anisotropicMaterial = false; + p_drawColorMap = new helper::ColorMap(256, "Blue to Red"); + #ifdef PLOT_CURVE f_graphStress.setWidget("graph"); f_graphCriteria.setWidget("graph"); f_graphOrientation.setWidget("graph"); #endif - - p_drawColorMap = new helper::ColorMap(256, "Blue to Red"); - - triangleInfo.setOriginalData(&d_triangleInfo); - vertexInfo.setOriginalData(&d_vertexInfo); - f_method.setOriginalData(&d_method); - m_rotatedInitialElements.setOriginalData(&d_rotatedInitialElements); - m_initialTransformation.setOriginalData(&d_initialTransformation); - hosfordExponant.setOriginalData(&d_hosfordExponant); - criteriaValue.setOriginalData(&d_criteriaValue); - showStressValue.setOriginalData(&d_showStressValue); - showStressVector.setOriginalData(&d_showStressVector); - showFracturableTriangles.setOriginalData(&d_showFracturableTriangles); - f_computePrincipalStress.setOriginalData(&d_computePrincipalStress); - - } +} template diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/config.h.in b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/config.h.in index 3f4b8f013c2..70ae54e297d 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/config.h.in +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/config.h.in @@ -36,12 +36,3 @@ namespace sofa::component::solidmechanics::fem::elastic constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::solidmechanics::fem::elastic - -#ifdef SOFA_BUILD_SOFA_COMPONENT_SOLIDMECHANICS_FEM_ELASTIC -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/AngularSpringForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/AngularSpringForceField.h index 54c20464e36..2244a33072f 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/AngularSpringForceField.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/AngularSpringForceField.h @@ -28,8 +28,6 @@ #include #include -#include - namespace sofa::core::behavior { @@ -66,21 +64,6 @@ class AngularSpringForceField : public core::behavior::ForceField typedef core::objectmodel::Data DataVecCoord; typedef core::objectmodel::Data DataVecDeriv; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData< type::vector< sofa::Index > > indices; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData angularStiffness; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData angularLimit; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData drawSpring; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData springColor; - Data< type::vector< sofa::Index > > d_indices; ///< index of nodes controlled by the angular springs Data< VecReal > d_angularStiffness; ///< angular stiffness for the controlled nodes Data d_angularLimit; ///< angular limit (max; min) values where the force applies diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/AngularSpringForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/AngularSpringForceField.inl index 44250d1a445..c25fabfded0 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/AngularSpringForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/AngularSpringForceField.inl @@ -40,12 +40,6 @@ AngularSpringForceField::AngularSpringForceField() , d_drawSpring(initData(&d_drawSpring, false, "drawSpring", "draw Spring")) , d_springColor(initData(&d_springColor, type::RGBAColor::green(), "springColor", "spring color")) { - indices.setOriginalData(&d_indices); - angularStiffness.setOriginalData(&d_angularStiffness); - angularLimit.setOriginalData(&d_angularLimit); - drawSpring.setOriginalData(&d_drawSpring); - springColor.setOriginalData(&d_springColor); - } diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FrameSpringForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FrameSpringForceField.h index 2e29259fc59..6896b63d2e2 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FrameSpringForceField.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FrameSpringForceField.h @@ -29,8 +29,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::spring { @@ -155,15 +153,6 @@ class FrameSpringForceField : public core::behavior::PairInteractionForceField > springs; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData showLawfulTorsion; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData showExtraTorsion; - SReal m_potentialEnergy; /// the list of the springs Data > d_springs; diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FrameSpringForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FrameSpringForceField.inl index 8b9e2678e75..75370da7f91 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FrameSpringForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FrameSpringForceField.inl @@ -46,10 +46,6 @@ FrameSpringForceField::FrameSpringForceField ( MechanicalState* objec , d_showLawfulTorsion (initData (&d_showLawfulTorsion, false, "showLawfulTorsion", "display the lawful part of the joint rotation" ) ) , d_showExtraTorsion (initData (&d_showExtraTorsion, false, "showExtraTorsion", "display the illicit part of the joint rotation" ) ) { - springs.setOriginalData(&d_springs); - showLawfulTorsion.setOriginalData(&d_showLawfulTorsion); - showExtraTorsion.setOriginalData(&d_showExtraTorsion); - } template diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/GearSpringForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/GearSpringForceField.h index c555fc89d15..e75c0dde5b5 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/GearSpringForceField.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/GearSpringForceField.h @@ -31,8 +31,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::spring { @@ -288,21 +286,6 @@ class GearSpringForceField : public core::behavior::PairInteractionForceField > springs; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::DataFileName f_filename; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData f_period; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData f_reinit; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData showFactorSize; - /// the list of the springs Data > d_springs; sofa::core::objectmodel::DataFileName d_filename; ///< output file name @@ -312,7 +295,6 @@ class GearSpringForceField : public core::behavior::PairInteractionForceField d_showFactorSize; - }; #if !defined(SOFA_COMPONENT_FORCEFIELD_GEARSPRINGFORCEFIELD_CPP) diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/GearSpringForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/GearSpringForceField.inl index 86d8bbced6c..4d810d89a98 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/GearSpringForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/GearSpringForceField.inl @@ -78,11 +78,6 @@ GearSpringForceField::GearSpringForceField(MechanicalState* object1, , lastTime((Real)0.0) , d_showFactorSize(initData(&d_showFactorSize, (Real)1.0, "showFactorSize", "modify the size of the debug information of a given factor" )) { - springs.setOriginalData(&d_springs); - f_filename.setParent(&d_filename); - f_period.setOriginalData(&d_period); - f_reinit.setOriginalData(&d_reinit); - showFactorSize.setOriginalData(&d_showFactorSize); } template diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/JointSpringForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/JointSpringForceField.h index 535bc3df98d..c3d0c4e2251 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/JointSpringForceField.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/JointSpringForceField.h @@ -25,8 +25,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::spring { @@ -134,18 +132,6 @@ class JointSpringForceField : public core::behavior::PairInteractionForceField f_period; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData f_reinit; - sofa::core::objectmodel::DataFileName d_outfilename; ///< output file name sofa::core::objectmodel::DataFileName d_infilename; ///< input file containing constant joint force Data d_period; ///< period between outputs diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/JointSpringForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/JointSpringForceField.inl index b3d745d79fc..135f255bd81 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/JointSpringForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/JointSpringForceField.inl @@ -54,10 +54,6 @@ JointSpringForceField::JointSpringForceField(MechanicalState* object1 , d_showExtraTorsion(initData(&d_showExtraTorsion, false, "showExtraTorsion", "display the illicit part of the joint rotation")) , d_showFactorSize(initData(&d_showFactorSize, (Real)1.0, "showFactorSize", "modify the size of the debug information of a given factor" )) { - f_outfilename.setParent(&d_outfilename); - f_infilename.setParent(&d_infilename); - f_period.setOriginalData(&d_period); - f_reinit.setOriginalData(&d_reinit); } template diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.h index 21059847a7c..6c9a7d0b585 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::spring { @@ -46,9 +44,6 @@ class QuadBendingSprings : public SpringForceField typedef typename DataTypes::VecCoord VecCoord; typedef core::behavior::MechanicalState MechanicalState; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData> localRange; - /// optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitioning) Data< type::Vec<2,int> > d_localRange; diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.inl index a9408c8d8a9..177e0961420 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.inl @@ -36,7 +36,6 @@ QuadBendingSprings::QuadBendingSprings() , d_localRange( initData(&d_localRange, type::Vec<2,int>(-1,-1), "localRange", "optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitioning)" ) ) , l_topology(initLink("topology", "link to the topology container")) { - localRange.setOriginalData(&d_localRange); } diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/StiffSpringForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/StiffSpringForceField.inl index 26246e5518f..fa2a33ff14c 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/StiffSpringForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/StiffSpringForceField.inl @@ -22,5 +22,5 @@ #pragma once #include -SOFA_DEPRECATED_HEADER("v24.06", "v25.06", "sofa/component/solidmechanics/spring/SpringForceField.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/solidmechanics/spring/SpringForceField.inl") diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBendingSprings.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBendingSprings.h index 9940fd7add4..4d7c2a04e14 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBendingSprings.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBendingSprings.h @@ -28,8 +28,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::spring { @@ -97,8 +95,6 @@ class TriangularBendingSprings : public core::behavior::ForceField return in; } }; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData> edgeInfo; sofa::core::topology::EdgeData > d_edgeInfo; ///< Internal edge data diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBendingSprings.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBendingSprings.inl index c1433fd080e..a1dd62736d6 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBendingSprings.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBendingSprings.inl @@ -293,7 +293,6 @@ TriangularBendingSprings::TriangularBendingSprings() , m_potentialEnergy(0.0) , m_topology(nullptr) { - edgeInfo.setOriginalData(&d_edgeInfo); } template diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBiquadraticSpringsForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBiquadraticSpringsForceField.h index 28fc16c2501..ca2da174cd8 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBiquadraticSpringsForceField.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBiquadraticSpringsForceField.h @@ -29,8 +29,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::spring { @@ -123,34 +121,6 @@ class TriangularBiquadraticSpringsForceField : public core::behavior::ForceField } }; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData > triangleInfo; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData > edgeInfo; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData _initialPoints; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData f_poissonRatio; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData f_youngModulus; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData f_dampingRatio; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData f_useAngularSprings; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData f_compressible; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData f_stiffnessMatrixRegularizationWeight; - - sofa::core::topology::TriangleData > d_triangleInfo; ///< Internal triangle data sofa::core::topology::EdgeData > d_edgeInfo; ///< Internal edge data @@ -159,8 +129,6 @@ class TriangularBiquadraticSpringsForceField : public core::behavior::ForceField bool updateMatrix; - - Data d_poissonRatio; ///< Poisson ratio in Hooke's law Data d_youngModulus; ///< Young modulus in Hooke's law Data d_dampingRatio; ///< Ratio damping/stiffness diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBiquadraticSpringsForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBiquadraticSpringsForceField.inl index 13ae5ad30d9..71f30cb6252 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBiquadraticSpringsForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBiquadraticSpringsForceField.inl @@ -141,16 +141,6 @@ template TriangularBiquadraticSpringsForceField::Tr , l_topology(initLink("topology", "link to the topology container")) , m_topology(nullptr) { - triangleInfo.setOriginalData(&d_triangleInfo); - edgeInfo.setOriginalData(&d_edgeInfo); - _initialPoints.setOriginalData(&d_initialPoints); - f_poissonRatio.setOriginalData(&d_poissonRatio); - f_youngModulus.setOriginalData(&d_youngModulus); - f_dampingRatio.setOriginalData(&d_dampingRatio); - f_useAngularSprings.setOriginalData(&d_useAngularSprings); - f_compressible.setOriginalData(&d_compressible); - f_stiffnessMatrixRegularizationWeight.setOriginalData(&d_stiffnessMatrixRegularizationWeight); - } template TriangularBiquadraticSpringsForceField::~TriangularBiquadraticSpringsForceField() diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularQuadraticSpringsForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularQuadraticSpringsForceField.h index 9697d00e39b..5d0ef97bf44 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularQuadraticSpringsForceField.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularQuadraticSpringsForceField.h @@ -29,8 +29,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::spring { @@ -115,22 +113,6 @@ class TriangularQuadraticSpringsForceField : public core::behavior::ForceField _initialPoints; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData f_poissonRatio; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData f_youngModulus; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData f_dampingRatio; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData f_useAngularSprings; - - Data< VecCoord > d_initialPoints; ///< Initial Position bool updateMatrix; @@ -203,13 +185,7 @@ class TriangularQuadraticSpringsForceField : public core::behavior::ForceField> triangleInfo; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData > edgeInfo; - +protected: sofa::core::topology::TriangleData > d_triangleInfo; ///< Internal triangle data sofa::core::topology::EdgeData > d_edgeInfo; ///< Internal edge data diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularQuadraticSpringsForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularQuadraticSpringsForceField.inl index 1e2c3113357..b64dc1f1b86 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularQuadraticSpringsForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularQuadraticSpringsForceField.inl @@ -121,20 +121,10 @@ template TriangularQuadraticSpringsForceField::Tria , d_edgeInfo(initData(&d_edgeInfo, "edgeInfo", "Internal edge data")) , m_topology(nullptr) { - _initialPoints.setOriginalData(&d_initialPoints); - f_poissonRatio.setOriginalData(&d_poissonRatio); - f_youngModulus.setOriginalData(&d_youngModulus); - f_dampingRatio.setOriginalData(&d_dampingRatio); - f_useAngularSprings.setOriginalData(&d_useAngularSprings); - triangleInfo.setOriginalData(&d_triangleInfo); - edgeInfo.setOriginalData(&d_edgeInfo); - - } template TriangularQuadraticSpringsForceField::~TriangularQuadraticSpringsForceField() { - } template void TriangularQuadraticSpringsForceField::init() diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.h index 03680f095eb..b896bfd5a1a 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.h @@ -31,8 +31,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::spring { @@ -94,23 +92,6 @@ class VectorSpringForceField: public core::behavior::PairInteractionForceField > springArray; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::DataFileName m_filename; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData m_stiffness; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData m_viscosity; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::lifecycle::RenamedData m_useTopology; - - /// where the springs information are stored sofa::core::topology::EdgeData > d_springArray; diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.inl index be2238b13e6..f6c9d3d5aea 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.inl @@ -132,12 +132,6 @@ VectorSpringForceField::VectorSpringForceField(MechanicalState* _obje , l_topology(initLink("topology", "link to the topology container")) , m_topology(nullptr) { - springArray.setOriginalData(&d_springArray); - m_filename.setParent(&d_filename); - m_stiffness.setOriginalData(&d_stiffness); - m_viscosity.setOriginalData(&d_viscosity); - m_useTopology.setOriginalData(&d_useTopology); - } template diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/config.h.in b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/config.h.in index af93ebba7a5..c933e5d342b 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/config.h.in +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/config.h.in @@ -36,12 +36,3 @@ namespace sofa::component::solidmechanics::spring constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::solidmechanics::spring - -#ifdef SOFA_BUILD_SOFA_COMPONENT_SOLIDMECHANICS_SPRING -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.h b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.h index 32b23bff853..8a02630cb23 100644 --- a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.h +++ b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.h @@ -33,8 +33,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::tensormass { @@ -88,12 +86,6 @@ class TetrahedralTensorMassForceField : public core::behavior::ForceField f_poissonRatio; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_TENSORMASS() - sofa::core::objectmodel::lifecycle::RenamedData f_youngModulus; - Data d_poissonRatio; ///< Poisson ratio in Hooke's law Data d_youngModulus; ///< Young's modulus in Hooke's law @@ -165,9 +157,6 @@ class TetrahedralTensorMassForceField : public core::behavior::ForceField& getEdgeInfo() { return d_edgeInfo; } protected: - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_TENSORMASS() - sofa::core::objectmodel::lifecycle::RenamedData edgeInfo; - core::topology::EdgeData < edgeRestInfoVector > d_edgeInfo; ///< Internal edge data sofa::core::topology::BaseMeshTopology* m_topology; diff --git a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.inl b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.inl index e3bec0e9b24..24e5120560f 100644 --- a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.inl +++ b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.inl @@ -236,15 +236,11 @@ TetrahedralTensorMassForceField::TetrahedralTensorMassForceField() , d_edgeInfo(initData(&d_edgeInfo, "edgeInfo", "Internal edge data")) , m_topology(nullptr) { - f_poissonRatio.setOriginalData(&d_poissonRatio); - edgeInfo.setOriginalData(&d_edgeInfo); - f_youngModulus.setOriginalData(&d_youngModulus); } template TetrahedralTensorMassForceField::~TetrahedralTensorMassForceField() { - } template void diff --git a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TriangularTensorMassForceField.h b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TriangularTensorMassForceField.h index 7612409982e..1a1778334aa 100644 --- a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TriangularTensorMassForceField.h +++ b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TriangularTensorMassForceField.h @@ -29,8 +29,6 @@ #include #include -#include - namespace sofa::component::solidmechanics::tensormass { @@ -90,8 +88,6 @@ class TriangularTensorMassForceField : public core::behavior::ForceField> edgeInfo; sofa::core::topology::EdgeData > d_edgeInfo; ///< Internal edge data @@ -123,12 +119,6 @@ class TriangularTensorMassForceField : public core::behavior::ForceField f_poissonRatio; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_TENSORMASS() - sofa::core::objectmodel::lifecycle::RenamedData f_youngModulus; - Data d_poissonRatio; ///< Poisson ratio in Hooke's law Data d_youngModulus; ///< Young's modulus in Hooke's law diff --git a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TriangularTensorMassForceField.inl b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TriangularTensorMassForceField.inl index d53f2c1a06f..ec224f6c1c9 100644 --- a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TriangularTensorMassForceField.inl +++ b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TriangularTensorMassForceField.inl @@ -233,9 +233,6 @@ template TriangularTensorMassForceField::Triangular , mu(0) , m_topology(nullptr) { - edgeInfo.setOriginalData(&d_edgeInfo); - f_poissonRatio.setOriginalData(&d_poissonRatio); - f_youngModulus.setOriginalData(&d_youngModulus); } template TriangularTensorMassForceField::~TriangularTensorMassForceField() diff --git a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/config.h.in b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/config.h.in index 91e1c71a5b8..fe08b526dba 100644 --- a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/config.h.in +++ b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/config.h.in @@ -36,12 +36,3 @@ namespace sofa::component::solidmechanics::tensormass constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::solidmechanics::tensormass - -#ifdef SOFA_BUILD_SOFA_COMPONENT_SOLIDMECHANICS_TENSORMASS -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_TENSORMASS() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_TENSORMASS() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif \ No newline at end of file diff --git a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.h b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.h index c9de6e7431e..4701b7053e1 100644 --- a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.h +++ b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.h @@ -26,8 +26,6 @@ #include #include -#include - namespace sofa::component::statecontainer { //using core::objectmodel::Data; @@ -64,12 +62,6 @@ class MappedObject : public core::State public: void init() override; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_STATECONTAINER() - sofa::core::objectmodel::lifecycle::RenamedData f_X; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_STATECONTAINER() - sofa::core::objectmodel::lifecycle::RenamedData f_V; - Data d_X; ///< position vector Data d_V; ///< velocity vector diff --git a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.inl b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.inl index 7650c76b5f8..babc1997385 100644 --- a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.inl +++ b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.inl @@ -32,9 +32,6 @@ MappedObject::MappedObject() : d_X(initData(&d_X, "position", "position vector") ) , d_V(initData(&d_V, "velocity", "velocity vector") ) { - f_X.setOriginalData(&d_X); - f_V.setOriginalData(&d_V); - } template diff --git a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/config.h.in b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/config.h.in index 4fa80fb3703..69c0f4463d1 100644 --- a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/config.h.in +++ b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/config.h.in @@ -36,12 +36,3 @@ namespace sofa::component::statecontainer constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::statecontainer - -#ifdef SOFA_BUILD_SOFA_COMPONENT_STATECONTAINER -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_STATECONTAINER() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_STATECONTAINER() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/CubeTopology.cpp b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/CubeTopology.cpp index d2eaa4d0ec2..a42bbb2dfbd 100644 --- a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/CubeTopology.cpp +++ b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/CubeTopology.cpp @@ -73,13 +73,6 @@ CubeTopology::CubeTopology(int _nx, int _ny, int _nz) , d_max(initData(&d_max, Vec3(1.0_sreal, 1.0_sreal, 1.0_sreal), "max", "Max")) { setSize(); - nx.setOriginalData(&d_nx); - ny.setOriginalData(&d_ny); - nz.setOriginalData(&d_nz); - internalPoints.setOriginalData(&d_internalPoints); - splitNormals.setOriginalData(&d_splitNormals); - min.setOriginalData(&d_min); - max.setOriginalData(&d_max); } CubeTopology::CubeTopology() @@ -89,13 +82,6 @@ CubeTopology::CubeTopology() , d_min(initData(&d_min, Vec3(0.0_sreal, 0.0_sreal, 0.0_sreal), "min", "Min")) , d_max(initData(&d_max, Vec3(1.0_sreal, 1.0_sreal, 1.0_sreal), "max", "Max")) { - nx.setOriginalData(&d_nx); - ny.setOriginalData(&d_ny); - nz.setOriginalData(&d_nz); - internalPoints.setOriginalData(&d_internalPoints); - splitNormals.setOriginalData(&d_splitNormals); - min.setOriginalData(&d_min); - max.setOriginalData(&d_max); } void CubeTopology::setSize(int nx, int ny, int nz) diff --git a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/CubeTopology.h b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/CubeTopology.h index ba8bf8d6f4c..61c6fada66f 100644 --- a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/CubeTopology.h +++ b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/CubeTopology.h @@ -24,8 +24,6 @@ #include -#include - namespace sofa::component::topology::container::constant { @@ -94,28 +92,6 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_CONSTANT_API CubeTopology : public MeshT void setSplitNormals(bool b) {d_splitNormals.setValue(b);} protected: - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData nx; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData ny; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData nz; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData internalPoints; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData splitNormals; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData min; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData max; - - Data d_nx; ///< x grid resolution Data d_ny; ///< y grid resolution Data d_nz; ///< z grid resolution diff --git a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.cpp b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.cpp index d41efbaed97..d9d14ed8895 100644 --- a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.cpp +++ b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.cpp @@ -508,19 +508,6 @@ MeshTopology::MeshTopology() addAlias(&d_seqTetrahedra, "tetras"); addAlias(&d_seqHexahedra, "hexas"); addAlias(&d_seqUVs, "texcoords"); - - seqPoints.setOriginalData(&d_seqPoints); - seqEdges.setOriginalData(&d_seqEdges); - seqTriangles.setOriginalData(&d_seqTriangles); - seqQuads.setOriginalData(&d_seqQuads); - seqTetrahedra.setOriginalData(&d_seqTetrahedra); - seqHexahedra.setOriginalData(&d_seqHexahedra); - seqUVs.setOriginalData(&d_seqUVs); - _drawEdges.setOriginalData(&d_drawEdges); - _drawTriangles.setOriginalData(&d_drawTriangles); - _drawQuads.setOriginalData(&d_drawQuads); - _drawTetra.setOriginalData(&d_drawTetra); - _drawHexa.setOriginalData(&d_drawHexa); } void MeshTopology::init() diff --git a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.h b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.h index ffab38c37f3..789243f8ac4 100644 --- a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.h +++ b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::component::topology::container::constant { @@ -308,42 +306,6 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_CONSTANT_API MeshTopology : public core: public: typedef type::vector SeqPoints; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData< SeqPoints > seqPoints; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData seqEdges; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData seqTriangles; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData seqQuads; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData seqTetrahedra; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData seqHexahedra; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData seqUVs; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData _drawEdges; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData _drawTriangles; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData _drawQuads; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData _drawTetra; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData _drawHexa; - Data< SeqPoints > d_seqPoints; ///< List of point positions Data d_seqEdges; ///< List of edge indices Data d_seqTriangles; ///< List of triangle indices diff --git a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/SphereQuadTopology.cpp b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/SphereQuadTopology.cpp index 73e7bfaf9de..2502ce31631 100644 --- a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/SphereQuadTopology.cpp +++ b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/SphereQuadTopology.cpp @@ -40,16 +40,12 @@ SphereQuadTopology::SphereQuadTopology(int nx, int ny, int nz) d_center(initData(&d_center, Vec3(0.0_sreal, 0.0_sreal, 0.0_sreal), "center", "Center of the sphere")), d_radius(initData(&d_radius, 1.0_sreal, "radius", "Radius of the sphere")) { - center.setOriginalData(&d_center); - radius.setOriginalData(&d_radius); } SphereQuadTopology::SphereQuadTopology() : d_center(initData(&d_center, Vec3(0.0_sreal, 0.0_sreal, 0.0_sreal), "center", "Center of the sphere")), d_radius(initData(&d_radius, 0_sreal, "radius", "Radius of the sphere")) { - center.setOriginalData(&d_center); - radius.setOriginalData(&d_radius); } Vec3 SphereQuadTopology::getPoint(int x, int y, int z) const diff --git a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/SphereQuadTopology.h b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/SphereQuadTopology.h index bf184421b11..dcfb8a9218d 100644 --- a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/SphereQuadTopology.h +++ b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/SphereQuadTopology.h @@ -22,8 +22,6 @@ #pragma once #include -#include - namespace sofa::component::topology::container::constant { @@ -39,14 +37,6 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_CONSTANT_API SphereQuadTopology : public Vec3 getPoint(int x, int y, int z) const override; protected: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData< Vec3 > center; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::lifecycle::RenamedData< SReal > radius; - - Data< Vec3 > d_center; ///< Center of the sphere Data< SReal > d_radius; ///< Radius of the sphere }; diff --git a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/config.h.in b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/config.h.in index b864055c7c0..8a5fdd1c0ec 100644 --- a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/config.h.in +++ b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/config.h.in @@ -36,12 +36,3 @@ namespace sofa::component::topology::container::constant constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::topology::container::constant - -#ifdef SOFA_BUILD_SOFA_COMPONENT_TOPOLOGY_CONTAINER_CONSTANT -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif \ No newline at end of file diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetGeometryAlgorithms.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetGeometryAlgorithms.h index c623f90e9a3..4b3ff43434a 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetGeometryAlgorithms.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetGeometryAlgorithms.h @@ -170,8 +170,8 @@ class EdgeSetGeometryAlgorithms : public PointSetGeometryAlgorithms NumericalIntegrationDescriptor &getEdgeNumericalIntegrationDescriptor(); - SOFA_ATTRIBUTE_DEPRECATED("v24.06", "v24.12", "Use the method computeEdgeSegmentIntersection returning a Coord") - bool computeEdgeSegmentIntersection(EdgeID edgeID, const type::Vec3& a, const type::Vec3& b, Real &baryCoef); + SOFA_ATTRIBUTE_DISABLED("v24.06", "v24.12", "Use the method computeEdgeSegmentIntersection returning a Coord") + bool computeEdgeSegmentIntersection(EdgeID edgeID, const type::Vec3& a, const type::Vec3& b, Real &baryCoef) = delete; // compute barycentric coefficients diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetGeometryAlgorithms.inl b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetGeometryAlgorithms.inl index 73a4475a475..0e64855d305 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetGeometryAlgorithms.inl +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetGeometryAlgorithms.inl @@ -732,26 +732,6 @@ void EdgeSetGeometryAlgorithms::initPointAdded(PointID index, const c } } -template -bool EdgeSetGeometryAlgorithms::computeEdgeSegmentIntersection(EdgeID edgeID, - const type::Vec3& a, - const type::Vec3& b, - Real &baryCoef) -{ - const Edge& theEdge = this->m_topology->getEdge(edgeID); - const VecCoord& pos = (this->object->read(core::vec_id::read_access::position)->getValue()); - - const typename DataTypes::Coord& e0 = pos[theEdge[0]]; - const typename DataTypes::Coord& e1 = pos[theEdge[1]]; - auto p0 = type::Vec3(DataTypes::getCPos(e0)); - auto p1 = type::Vec3(DataTypes::getCPos(e1)); - - type::Vec2 baryCoords(type::NOINIT); - bool is_intersect = sofa::geometry::Edge::intersectionWithEdge(p0, p1, a, b, baryCoords); - baryCoef = baryCoords[0]; - - return is_intersect; -} template bool EdgeSetGeometryAlgorithms::mustComputeBBox() const diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.inl b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.inl index 35818c299d7..5604e44bd21 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.inl +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.inl @@ -1324,7 +1324,7 @@ bool TriangleSetGeometryAlgorithms< DataTypes >::computeSegmentTriangleIntersect sofa::type::vector& baryCoefs) const { // Get coordinates of each vertex of the triangle - const typename DataTypes::VecCoord& coords = (this->object->read(core::ConstVecCoordId::position())->getValue()); + const typename DataTypes::VecCoord& coords = (this->object->read(core::vec_id::read_access::position)->getValue()); const Triangle& tri = this->m_topology->getTriangle(triId); const typename DataTypes::Coord& c0 = coords[tri[0]]; @@ -1949,7 +1949,7 @@ bool TriangleSetGeometryAlgorithms< DataTypes >::computeSegmentTriangulationInte if (ind_ta == ind_tb) return false; - const typename DataTypes::VecCoord& coords = (this->object->read(core::ConstVecCoordId::position())->getValue()); + const typename DataTypes::VecCoord& coords = (this->object->read(core::vec_id::read_access::position)->getValue()); sofa::type::Vec<3, Real> current_point = ptA; TriangleID current_triID = ind_ta; EdgeID current_edgeID = sofa::InvalidID; diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.cpp b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.cpp index cd3a49ba2c9..9673bbd3cac 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.cpp +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.cpp @@ -41,11 +41,6 @@ SparseGridMultipleTopology::SparseGridMultipleTopology( bool _isVirtual ) , d_computeRamifications(initData(&d_computeRamifications, true , "computeRamifications", "Are ramifications wanted?")) , d_erasePreviousCoef(initData(&d_erasePreviousCoef, false , "erasePreviousCoef", "Does a new stiffness/mass coefficient replace the previous or blend half/half with it?")) { - _fileTopologies.setOriginalData(&d_fileTopologies); - _dataStiffnessCoefs.setOriginalData(&d_dataStiffnessCoefs); - _dataMassCoefs.setOriginalData(&d_dataMassCoefs); - _computeRamifications.setOriginalData(&d_computeRamifications); - _erasePreviousCoef.setOriginalData(&d_erasePreviousCoef); } diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.h b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.h index c9c2d204123..5fc6f5b8607 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.h +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.h @@ -26,8 +26,6 @@ #include -#include - namespace sofa::component::topology::container::grid { @@ -80,32 +78,12 @@ public : protected : - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData> _fileTopologies; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData> _dataStiffnessCoefs; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData> _dataMassCoefs; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData _computeRamifications; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData _erasePreviousCoef; - - Data< type::vector< std::string > > d_fileTopologies; ///< All topology filenames Data< type::vector< float > > d_dataStiffnessCoefs; ///< A stiffness coefficient for each topology filename Data< type::vector< float > > d_dataMassCoefs; ///< A mass coefficient for each topology filename Data d_computeRamifications; ///< Are ramifications wanted? Data d_erasePreviousCoef; ///< Does a new stiffness/mass coefficient replace the previous or blend half/half with it? - - - void buildFromTriangleMesh(helper::io::Mesh*, unsigned fileIdx); type::vector< RegularGridTopology::SPtr > _regularGrids; type::vector< type::vector > _regularGridTypes; diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridRamificationTopology.cpp b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridRamificationTopology.cpp index ea4c192920c..04feb9f0e03 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridRamificationTopology.cpp +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridRamificationTopology.cpp @@ -37,7 +37,6 @@ SparseGridRamificationTopology::SparseGridRamificationTopology(bool isVirtual) : SparseGridTopology(isVirtual) , d_finestConnectivity(initData(&d_finestConnectivity, true, "finestConnectivity", "Test for connectivity at the finest level? (more precise but slower by testing all intersections between the model mesh and the faces between boundary cubes)")) { - _finestConnectivity.setOriginalData(&d_finestConnectivity); } SparseGridRamificationTopology::~SparseGridRamificationTopology() diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridRamificationTopology.h b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridRamificationTopology.h index 923960b7bca..a362171d0bc 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridRamificationTopology.h +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridRamificationTopology.h @@ -25,8 +25,6 @@ #include -#include - namespace sofa::component::topology::container::grid { @@ -77,10 +75,6 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridRamificationTopology // just to remember enum {UP,DOWN,RIGHT,LEFT,BEFORE,BEHIND,NUM_CONNECTED_NODES}; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData _finestConnectivity; - - // Does the connectivity test have to be done at the finest level? (more precise but slow) Data d_finestConnectivity; ///< Test for connectivity at the finest level? (more precise but slower by testing all intersections between the model mesh and the faces between boundary cubes) diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridTopology.cpp b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridTopology.cpp index a52bcce657e..cc9bcde67b8 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridTopology.cpp +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridTopology.cpp @@ -97,19 +97,6 @@ SparseGridTopology::SparseGridTopology(bool _isVirtual) _usingMC = false; _regularGrid = sofa::core::objectmodel::New(); - - _fillWeighted.setOriginalData(&d_fillWeighted); - n.setOriginalData(&d_n); - _min.setOriginalData(&d_min); - _max.setOriginalData(&d_max); - _cellWidth.setOriginalData(&d_cellWidth); - _nbVirtualFinerLevels.setOriginalData(&d_nbVirtualFinerLevels); - dataResolution.setOriginalData(&d_dataResolution); - voxelSize.setOriginalData(&d_voxelSize); - marchingCubeStep.setOriginalData(&d_marchingCubeStep); - convolutionSize.setOriginalData(&d_convolutionSize); - facets.setOriginalData(&d_facets); - dataVoxels.setOriginalData(&d_dataVoxels); } SparseGridTopology::SparseGridTopology(type::Vec3i numVertices, type::BoundingBox box, bool _isVirtual) diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridTopology.h b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridTopology.h index b6d0f027bb5..6a107a54973 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridTopology.h +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridTopology.h @@ -32,8 +32,6 @@ #include #include -#include - namespace sofa::core::loader { class VoxelLoader; @@ -186,42 +184,12 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridTopology : public con { return d_dataVoxels.getValue()[index] == 1; } - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData _fillWeighted; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData bOnlyInsideCells; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData< type::vector< unsigned char > > dataVoxels; - Data< type::vector< unsigned char > > d_dataVoxels; - Data d_fillWeighted; ///< Is quantity of matter inside a cell taken into account? (.5 for boundary, 1 for inside) - Data d_bOnlyInsideCells; ///< Select only inside cells (exclude boundary cells) - protected: - - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::Vec< 3, int > > n; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData _min; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData _max; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData _cellWidth; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData _nbVirtualFinerLevels; - - bool isVirtual; /// cutting number in all directions Data< sofa::type::Vec< 3, int > > d_n; @@ -231,24 +199,8 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridTopology : public con Data< int > d_nbVirtualFinerLevels; ///< create virtual (not in the animation tree) finer sparse grids in order to dispose of finest information (useful to compute better mechanical properties for example) public: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData dataResolution; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData voxelSize; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData marchingCubeStep; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData convolutionSize; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID()SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::lifecycle::RenamedData< type::vector< type::vector > > facets; - - Data< type::Vec3i > d_dataResolution; ///< Dimension of the voxel File - Data< type::Vec3 > d_voxelSize; ///< Dimension of one voxel + Data< type::Vec3i > d_dataResolution; ///< Dimension of the voxel File + Data< type::Vec3 > d_voxelSize; ///< Dimension of one voxel Data< unsigned int > d_marchingCubeStep; ///< Step of the Marching Cube algorithm Data< unsigned int > d_convolutionSize; ///< Dimension of the convolution kernel to smooth the voxels. 0 if no smoothing is required. diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/config.h.in b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/config.h.in index a1361ab408c..2c886e67ba4 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/config.h.in +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/config.h.in @@ -36,12 +36,3 @@ namespace sofa::component::topology::container::grid constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::topology::container::grid - -#ifdef SOFA_BUILD_SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2QuadTopologicalMapping.cpp b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2QuadTopologicalMapping.cpp index c749876cfe9..ce9baa97814 100644 --- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2QuadTopologicalMapping.cpp +++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2QuadTopologicalMapping.cpp @@ -57,8 +57,6 @@ Hexa2QuadTopologicalMapping::Hexa2QuadTopologicalMapping() { m_inputType = geometry::ElementType::HEXAHEDRON; m_outputType = geometry::ElementType::QUAD; - - flipNormals.setOriginalData(&d_flipNormals); } void Hexa2QuadTopologicalMapping::init() diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2QuadTopologicalMapping.h b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2QuadTopologicalMapping.h index 234ba72670a..35870bc3171 100644 --- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2QuadTopologicalMapping.h +++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2QuadTopologicalMapping.h @@ -29,8 +29,6 @@ #include -#include - namespace sofa::component::topology::mapping { @@ -76,13 +74,7 @@ class SOFA_COMPONENT_TOPOLOGY_MAPPING_API Hexa2QuadTopologicalMapping : public s Index getFromIndex(Index ind) override; protected: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData flipNormals; - - Data d_flipNormals; ///< Flip Normal ? (Inverse point order when creating triangle) - }; } //namespace sofa::component::topology::mapping diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2TetraTopologicalMapping.cpp b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2TetraTopologicalMapping.cpp index 5bb3e007d07..2c556b359b7 100644 --- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2TetraTopologicalMapping.cpp +++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2TetraTopologicalMapping.cpp @@ -56,8 +56,6 @@ Hexa2TetraTopologicalMapping::Hexa2TetraTopologicalMapping() { m_inputType = geometry::ElementType::HEXAHEDRON; m_outputType = geometry::ElementType::TETRAHEDRON; - - swapping.setOriginalData(&d_swapping); } Hexa2TetraTopologicalMapping::~Hexa2TetraTopologicalMapping() diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2TetraTopologicalMapping.h b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2TetraTopologicalMapping.h index 53e04c13fb8..4fd57449aee 100644 --- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2TetraTopologicalMapping.h +++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2TetraTopologicalMapping.h @@ -29,9 +29,6 @@ #include -#include - - namespace sofa::component::topology::mapping { @@ -76,11 +73,8 @@ class SOFA_COMPONENT_TOPOLOGY_MAPPING_API Hexa2TetraTopologicalMapping : public void updateTopologicalMappingTopDown() override; Index getFromIndex(Index ind) override; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData swapping; sofa::core::objectmodel::Data d_swapping; ///< Boolean enabling to swapp hexa-edges in order to avoid bias effect - }; } //namespace sofa::component::topology::mapping diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/SubsetTopologicalMapping.cpp b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/SubsetTopologicalMapping.cpp index 3330149e011..849694e9433 100644 --- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/SubsetTopologicalMapping.cpp +++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/SubsetTopologicalMapping.cpp @@ -76,24 +76,6 @@ SubsetTopologicalMapping::SubsetTopologicalMapping() , d_hexahedronS2D(initData(&d_hexahedronS2D, "hexahedronS2D", "Internal source -> destination topology hexahedra map")) , d_hexahedronD2S(initData(&d_hexahedronD2S, "hexahedronD2S", "Internal destination -> source topology hexahedra map")) { - samePoints.setOriginalData(&d_samePoints); - handleEdges.setOriginalData(&d_handleEdges); - handleTriangles.setOriginalData(&d_handleTriangles); - handleQuads.setOriginalData(&d_handleQuads); - handleTetrahedra.setOriginalData(&d_handleTetrahedra); - handleHexahedra.setOriginalData(&d_handleHexahedra); - pointS2D.setOriginalData(&d_pointS2D); - pointD2S.setOriginalData(&d_pointD2S); - edgeS2D.setOriginalData(&d_edgeS2D); - edgeD2S.setOriginalData(&d_edgeD2S); - triangleS2D.setOriginalData(&d_triangleS2D); - triangleD2S.setOriginalData(&d_triangleD2S); - quadS2D.setOriginalData(&d_quadS2D); - quadD2S.setOriginalData(&d_quadD2S); - tetrahedronS2D.setOriginalData(&d_tetrahedronS2D); - tetrahedronD2S.setOriginalData(&d_tetrahedronD2S); - hexahedronS2D.setOriginalData(&d_hexahedronS2D); - hexahedronD2S.setOriginalData(&d_hexahedronD2S); } diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/SubsetTopologicalMapping.h b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/SubsetTopologicalMapping.h index b083a5442cd..a9c18df724c 100644 --- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/SubsetTopologicalMapping.h +++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/SubsetTopologicalMapping.h @@ -29,8 +29,6 @@ #include -#include - namespace sofa::component::topology::mapping { @@ -51,61 +49,6 @@ class SOFA_COMPONENT_TOPOLOGY_MAPPING_API SubsetTopologicalMapping : public sofa SubsetTopologicalMapping(); ~SubsetTopologicalMapping() override; public: - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData samePoints; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData handleEdges; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData handleTriangles; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData handleQuads; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData handleTetrahedra; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData handleHexahedra; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData pointS2D; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData pointD2S; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData edgeS2D; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData edgeD2S; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData triangleS2D; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData triangleD2S; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData quadS2D; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData quadD2S; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData tetrahedronS2D; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData tetrahedronD2S; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData hexahedronS2D; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData hexahedronD2S; - Data d_samePoints; ///< True if the same set of points is used in both topologies Data d_handleEdges; ///< True if edges events and mapping should be handled Data d_handleTriangles; ///< True if triangles events and mapping should be handled diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Tetra2TriangleTopologicalMapping.cpp b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Tetra2TriangleTopologicalMapping.cpp index d66221835b3..11f6ebbe178 100644 --- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Tetra2TriangleTopologicalMapping.cpp +++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Tetra2TriangleTopologicalMapping.cpp @@ -60,10 +60,6 @@ Tetra2TriangleTopologicalMapping::Tetra2TriangleTopologicalMapping() { m_inputType = geometry::ElementType::TETRAHEDRON; m_outputType = geometry::ElementType::TRIANGLE; - - flipNormals.setOriginalData(&d_flipNormals); - noNewTriangles.setOriginalData(&d_noNewTriangles); - noInitialTriangles.setOriginalData(&d_noInitialTriangles); } void Tetra2TriangleTopologicalMapping::init() diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Tetra2TriangleTopologicalMapping.h b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Tetra2TriangleTopologicalMapping.h index c38d8c0858b..e4b0f935cb8 100644 --- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Tetra2TriangleTopologicalMapping.h +++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Tetra2TriangleTopologicalMapping.h @@ -29,8 +29,6 @@ #include -#include - namespace sofa::component::topology::container::dynamic { class TriangleSetTopologyModifier; @@ -83,16 +81,6 @@ class SOFA_COMPONENT_TOPOLOGY_MAPPING_API Tetra2TriangleTopologicalMapping : pub bool checkTopologies() override; protected: - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData flipNormals; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData noNewTriangles; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::lifecycle::RenamedData noInitialTriangles; - - Data d_flipNormals; ///< Flip Normal ? (Inverse point order when creating triangle) Data d_noNewTriangles; ///< If true no new triangles are being created Data d_noInitialTriangles; ///< If true the list of initial triangles is initially empty. Only additional triangles will be added in the list diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/config.h.in b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/config.h.in index dc520e94b1f..cab4ad9344c 100644 --- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/config.h.in +++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/config.h.in @@ -36,12 +36,3 @@ namespace sofa::component::topology::mapping constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::topology::mapping - -#ifdef SOFA_BUILD_SOFA_COMPONENT_TOPOLOGY_MAPPING -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif \ No newline at end of file diff --git a/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/TopologicalChangeProcessor.cpp b/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/TopologicalChangeProcessor.cpp index 48802c4cbed..3554cad102f 100644 --- a/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/TopologicalChangeProcessor.cpp +++ b/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/TopologicalChangeProcessor.cpp @@ -85,24 +85,6 @@ TopologicalChangeProcessor::TopologicalChangeProcessor() , loopTime(0) { this->f_listening.setValue(true); - m_filename.setParent(&d_filename); - m_listChanges.setOriginalData(&d_listChanges); - m_interval.setOriginalData(&d_interval); - m_shift.setOriginalData(&d_shift); - m_loop.setOriginalData(&d_loop); - m_useDataInputs.setOriginalData(&d_useDataInputs); - m_timeToRemove.setOriginalData(&d_timeToRemove); - m_pointsToRemove.setOriginalData(&d_pointsToRemove); - m_edgesToRemove.setOriginalData(&d_edgesToRemove); - m_trianglesToRemove.setOriginalData(&d_trianglesToRemove); - m_quadsToRemove.setOriginalData(&d_quadsToRemove); - m_tetrahedraToRemove.setOriginalData(&d_tetrahedraToRemove); - m_hexahedraToRemove.setOriginalData(&d_hexahedraToRemove); - m_saveIndicesAtInit.setOriginalData(&d_saveIndicesAtInit); - m_epsilonSnapPath.setOriginalData(&d_epsilonSnapPath); - m_epsilonSnapBorder.setOriginalData(&d_epsilonSnapBorder); - m_draw.setOriginalData(&d_draw); - } diff --git a/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/TopologicalChangeProcessor.h b/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/TopologicalChangeProcessor.h index 9fa48c8277d..2d7eeff331d 100644 --- a/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/TopologicalChangeProcessor.h +++ b/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/TopologicalChangeProcessor.h @@ -29,9 +29,6 @@ #include -#include - - #if SOFAMISCTOPOLOGY_HAVE_ZLIB #include #endif // SOFAMISCTOPOLOGY_HAVE_ZLIB @@ -54,56 +51,6 @@ class SOFA_COMPONENT_TOPOLOGY_UTILITY_API TopologicalChangeProcessor: public cor SOFA_CLASS(TopologicalChangeProcessor,core::objectmodel::BaseObject); using Index = sofa::Index; - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::DataFileName m_filename; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData < type::vector< type::vector > > m_listChanges; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData m_interval; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData m_shift; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData m_loop; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData m_useDataInputs; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData m_timeToRemove; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData >m_pointsToRemove; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData > m_edgesToRemove; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData > m_trianglesToRemove; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData > m_quadsToRemove; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData > m_tetrahedraToRemove; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData > m_hexahedraToRemove; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData m_saveIndicesAtInit; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData m_epsilonSnapPath; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData m_epsilonSnapBorder; - - SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::lifecycle::RenamedData m_draw; sofa::core::objectmodel::DataFileName d_filename; Data < type::vector< type::vector > > d_listChanges; ///< 0 for adding, 1 for removing, 2 for cutting and associated indices. diff --git a/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/config.h.in b/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/config.h.in index ab24e23f3e1..f0f1b9d429e 100644 --- a/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/config.h.in +++ b/Sofa/Component/Topology/Utility/src/sofa/component/topology/utility/config.h.in @@ -40,12 +40,3 @@ namespace sofa::component::topology::utility constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::topology::utility - -#ifdef SOFA_BUILD_SOFA_COMPONENT_TOPOLOGY_UTILITY -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.06", "v24.12", \ - "Data renamed according to the guidelines") -#endif \ No newline at end of file diff --git a/Sofa/Component/Visual/src/sofa/component/visual/LineAxis.h b/Sofa/Component/Visual/src/sofa/component/visual/LineAxis.h index 18ae5ec9a17..a9ff24d333a 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/LineAxis.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/LineAxis.h @@ -37,7 +37,6 @@ class SOFA_COMPONENT_VISUAL_API LineAxis : public core::visual::VisualModel Data d_infinite; ///< If true, ignore the "size" and draw infinite lines Data d_thickness; ///< Thickness of the lines Data d_vanishing; ///< In case of infinite lines, should the lines gradually vanish. - core::objectmodel::lifecycle::RemovedData d_draw {this, "v23.06", "23.12", "draw", "Use the 'enable' data field instead of 'draw'"}; LineAxis(); diff --git a/Sofa/Component/Visual/src/sofa/component/visual/VisualGrid.h b/Sofa/Component/Visual/src/sofa/component/visual/VisualGrid.h index d6c00faf1e3..db3c27b8092 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/VisualGrid.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/VisualGrid.h @@ -52,8 +52,6 @@ class SOFA_COMPONENT_VISUAL_API VisualGrid : public core::visual::VisualModel Data d_color; ///< Color of the lines in the grid. default=(0.34,0.34,0.34,1.0) Data d_thickness; ///< Thickness of the lines in the grid - core::objectmodel::lifecycle::RemovedData d_draw {this, "v23.06", "23.12", "draw", "Use the 'enable' data field instead of 'draw'"}; - VisualGrid(); ~VisualGrid() override = default; diff --git a/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglCylinderModel.h b/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglCylinderModel.h index bcbd1d60cfa..896a1fca219 100644 --- a/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglCylinderModel.h +++ b/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglCylinderModel.h @@ -22,11 +22,4 @@ #pragma once #include -SOFA_HEADER_DEPRECATED("v24.12", "v25.06", "sofa/component/visual/CylinderVisualModel.h") - -#include - -namespace sofa::gl::component::rendering3d -{ -using OglCylinderModel = sofa::component::visual::CylinderVisualModel; -} +SOFA_HEADER_DISABLED("v24.12", "v25.06", "sofa/component/visual/CylinderVisualModel.h") diff --git a/Sofa/framework/Core/src/sofa/core/VecId.h b/Sofa/framework/Core/src/sofa/core/VecId.h index 99fea5eeb8e..0863fc0e0ac 100644 --- a/Sofa/framework/Core/src/sofa/core/VecId.h +++ b/Sofa/framework/Core/src/sofa/core/VecId.h @@ -95,14 +95,14 @@ class TStandardVec return MyVecId(static_cast>(v_state)); } - SOFA_ATTRIBUTE_DEPRECATED__POSITION() - static constexpr MyVecId position() { return state();} - SOFA_ATTRIBUTE_DEPRECATED__REST_POSITION() - static constexpr MyVecId restPosition() { return state();} - SOFA_ATTRIBUTE_DEPRECATED__FREE_POSITION() - static constexpr MyVecId freePosition() { return state();} - SOFA_ATTRIBUTE_DEPRECATED__RESET_POSITION() - static constexpr MyVecId resetPosition() { return state();} + SOFA_ATTRIBUTE_DISABLED__POSITION() + static constexpr MyVecId position() = delete; + SOFA_ATTRIBUTE_DISABLED__REST_POSITION() + static constexpr MyVecId restPosition() = delete; + SOFA_ATTRIBUTE_DISABLED__FREE_POSITION() + static constexpr MyVecId freePosition() = delete; + SOFA_ATTRIBUTE_DISABLED__RESET_POSITION() + static constexpr MyVecId resetPosition() = delete; ///< This is the first index used for dynamically allocated vectors static constexpr uint8_t V_FIRST_DYNAMIC_INDEX = static_cast(State::DYNAMIC_INDEX); @@ -174,22 +174,22 @@ class TStandardVec return MyVecId(static_cast>(v_state)); } - SOFA_ATTRIBUTE_DEPRECATED__VELOCITY() - static constexpr MyVecId velocity() { return state(); } - SOFA_ATTRIBUTE_DEPRECATED__RESET_VELOCITY() - static constexpr MyVecId resetVelocity() { return state(); } - SOFA_ATTRIBUTE_DEPRECATED__FREE_VELOCITY() - static constexpr MyVecId freeVelocity() { return state(); } - SOFA_ATTRIBUTE_DEPRECATED__NORMAL() - static constexpr MyVecId normal() { return state(); } - SOFA_ATTRIBUTE_DEPRECATED__FORCE() - static constexpr MyVecId force() { return state(); } - SOFA_ATTRIBUTE_DEPRECATED__EXTERNAL_FORCE() - static constexpr MyVecId externalForce() { return state(); } - SOFA_ATTRIBUTE_DEPRECATED__DX() - static constexpr MyVecId dx() { return state(); } - SOFA_ATTRIBUTE_DEPRECATED__DFORCE() - static constexpr MyVecId dforce() { return state(); } + SOFA_ATTRIBUTE_DISABLED__VELOCITY() + static constexpr MyVecId velocity() = delete; + SOFA_ATTRIBUTE_DISABLED__RESET_VELOCITY() + static constexpr MyVecId resetVelocity() = delete; + SOFA_ATTRIBUTE_DISABLED__FREE_VELOCITY() + static constexpr MyVecId freeVelocity() = delete; + SOFA_ATTRIBUTE_DISABLED__NORMAL() + static constexpr MyVecId normal() = delete; + SOFA_ATTRIBUTE_DISABLED__FORCE() + static constexpr MyVecId force() = delete; + SOFA_ATTRIBUTE_DISABLED__EXTERNAL_FORCE() + static constexpr MyVecId externalForce() = delete; + SOFA_ATTRIBUTE_DISABLED__DX() + static constexpr MyVecId dx() = delete; + SOFA_ATTRIBUTE_DISABLED__DFORCE() + static constexpr MyVecId dforce() = delete; ///< This is the first index used for dynamically allocated vectors static constexpr uint8_t V_FIRST_DYNAMIC_INDEX = static_cast(State::DYNAMIC_INDEX); @@ -270,10 +270,10 @@ class TStandardVec return MyVecId(static_cast>(v_state)); } - SOFA_ATTRIBUTE_DEPRECATED__CONSTRAINT_JACOBIAN() - static constexpr MyVecId constraintJacobian() { return state();} // jacobian matrix of constraints - SOFA_ATTRIBUTE_DEPRECATED__MAPPING_JACOBIAN() - static constexpr MyVecId mappingJacobian() { return state();} // accumulated matrix of the mappings + SOFA_ATTRIBUTE_DISABLED__CONSTRAINT_JACOBIAN() + static constexpr MyVecId constraintJacobian() = delete; + SOFA_ATTRIBUTE_DISABLED__MAPPING_JACOBIAN() + static constexpr MyVecId mappingJacobian() = delete; ///< This is the first index used for dynamically allocated vectors static constexpr uint8_t V_FIRST_DYNAMIC_INDEX = static_cast(State::DYNAMIC_INDEX); diff --git a/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraintSet.cpp b/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraintSet.cpp index a66f08ffc1b..6db56f911f2 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraintSet.cpp +++ b/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraintSet.cpp @@ -29,7 +29,6 @@ BaseConstraintSet::BaseConstraintSet() : group(initData(&group, 0, "group", "ID of the group containing this constraint. This ID is used to specify which constraints are solved by which solver, by specifying in each solver which groups of constraints it should handle.")) , d_constraintIndex(initData(&d_constraintIndex, 0u, "constraintIndex", "Constraint index (first index in the right hand term resolution vector)")) { - m_constraintIndex.setOriginalData(&d_constraintIndex); } diff --git a/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraintSet.h b/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraintSet.h index 896e7641675..8ce184c161b 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraintSet.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraintSet.h @@ -27,8 +27,6 @@ #include #include -#include - namespace sofa::core::behavior { @@ -93,15 +91,8 @@ class SOFA_CORE_API BaseConstraintSet : public virtual objectmodel::BaseObject public: Data< sofa::Index > d_constraintIndex; ///< Constraint index (first index in the right hand term resolution vector) - SOFA_ATTRIBUTE_DEPRECATED__CORE_RENAME_DATA_IN_CORE() - sofa::core::objectmodel::lifecycle::RenamedData< unsigned int > m_constraintIndex; - bool insertInNode( objectmodel::BaseNode* node ) override; bool removeInNode( objectmodel::BaseNode* node ) override; - - SOFA_ATTRIBUTE_DEPRECATED__REMOVED_CID() - DeprecatedAndRemoved m_cId{}; - }; } // namespace sofa::core::behavior diff --git a/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.h b/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.h index 4685318ccf1..63a704eb319 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.h @@ -186,13 +186,13 @@ class SOFA_CORE_API BaseForceField : public virtual StateAccessor /// @{ /// Considered as compliance, else considered as stiffness (default to false) - SOFA_ATTRIBUTE_DEPRECATED__COMPLIANT() - objectmodel::lifecycle::DeprecatedData isCompliance; + SOFA_ATTRIBUTE_DISABLED__COMPLIANT() + objectmodel::lifecycle::RemovedData isCompliance; /// Return a pointer to the compliance matrix C /// \f$ C = K^{-1} \f$ - SOFA_ATTRIBUTE_DEPRECATED__COMPLIANT() - virtual const sofa::linearalgebra::BaseMatrix* getComplianceMatrix(const MechanicalParams*) { return nullptr; } + SOFA_ATTRIBUTE_DISABLED__COMPLIANT() + virtual const sofa::linearalgebra::BaseMatrix* getComplianceMatrix(const MechanicalParams*) = delete; /// \brief Accumulate the contribution of the C compliant matrix multiplied /// by the given Lagrange multipliers lambda vector with the given cFactor coefficient. @@ -204,8 +204,8 @@ class SOFA_CORE_API BaseForceField : public virtual StateAccessor /// where C is the Compliant matrix (inverse of the Stiffness matrix \f$ K \f$: /// \f$ C = K^{-1} \f$) /// - SOFA_ATTRIBUTE_DEPRECATED__COMPLIANT() - virtual void addClambda(const MechanicalParams* /*mparams*/, MultiVecDerivId /*resId*/, MultiVecDerivId /*lambdaId*/, SReal /*cFactor*/ ){} + SOFA_ATTRIBUTE_DISABLED__COMPLIANT() + virtual void addClambda(const MechanicalParams* /*mparams*/, MultiVecDerivId /*resId*/, MultiVecDerivId /*lambdaId*/, SReal /*cFactor*/ ) = delete; /// @} diff --git a/Sofa/framework/Core/src/sofa/core/behavior/ForceField.h b/Sofa/framework/Core/src/sofa/core/behavior/ForceField.h index 8feb151c463..2af976c952c 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/ForceField.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/ForceField.h @@ -114,8 +114,8 @@ class ForceField : public BaseForceField, public SingleStateAccessor //To be removed once addClambda is disabled using BaseForceField::addClambda; - SOFA_ATTRIBUTE_DEPRECATED__COMPLIANT() - virtual void addClambda(const MechanicalParams* mparams, DataVecDeriv& df, const DataVecDeriv& lambda, SReal cFactor ); + SOFA_ATTRIBUTE_DISABLED__COMPLIANT() + virtual void addClambda(const MechanicalParams* mparams, DataVecDeriv& df, const DataVecDeriv& lambda, SReal cFactor ) = delete; /// Get the potential energy associated to this ForceField. /// diff --git a/Sofa/framework/Core/src/sofa/core/behavior/ForceField.inl b/Sofa/framework/Core/src/sofa/core/behavior/ForceField.inl index 810e97c336b..954567d348c 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/ForceField.inl +++ b/Sofa/framework/Core/src/sofa/core/behavior/ForceField.inl @@ -76,14 +76,6 @@ void ForceField::addDForce(const MechanicalParams* mparams, MultiVecD } } -template -void ForceField::addClambda(const MechanicalParams* /*mparams*/, DataVecDeriv& /*df*/, const DataVecDeriv& /*lambda*/, SReal /*cFactor*/ ) -{ - msg_error()<<"function 'addClambda' is not implemented"; -} - - - template SReal ForceField::getPotentialEnergy(const MechanicalParams* mparams) const { diff --git a/Sofa/framework/Core/src/sofa/core/config.h.in b/Sofa/framework/Core/src/sofa/core/config.h.in index 3f88923790e..a444e394817 100644 --- a/Sofa/framework/Core/src/sofa/core/config.h.in +++ b/Sofa/framework/Core/src/sofa/core/config.h.in @@ -54,26 +54,17 @@ #endif #ifdef SOFA_BUILD_SOFA_CORE -#define SOFA_ATTRIBUTE_DEPRECATED__COMPLIANT() +#define SOFA_ATTRIBUTE_DISABLED__COMPLIANT() #else -#define SOFA_ATTRIBUTE_DEPRECATED__COMPLIANT() \ - SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Used only by the deprecated Compliant plugin.") +#define SOFA_ATTRIBUTE_DISABLED__COMPLIANT() \ + SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Used only by the deprecated Compliant plugin.") #endif #ifdef SOFA_BUILD_SOFA_CORE -#define SOFA_ATTRIBUTE_DEPRECATED__CORE_RENAME_DATA_IN_CORE() +#define SOFA_ATTRIBUTE_DISABLED__UNNECESSARY_PARAMETER_IN_TYPENAME() #else -#define SOFA_ATTRIBUTE_DEPRECATED__CORE_RENAME_DATA_IN_CORE() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Data renamed according to the guidelines") -#endif - -#ifdef SOFA_BUILD_SOFA_CORE -#define SOFA_ATTRIBUTE_DEPRECATED__UNNECESSARY_PARAMETER_IN_TYPENAME() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__UNNECESSARY_PARAMETER_IN_TYPENAME() \ - SOFA_ATTRIBUTE_DEPRECATED( \ +#define SOFA_ATTRIBUTE_DISABLED__UNNECESSARY_PARAMETER_IN_TYPENAME() \ + SOFA_ATTRIBUTE_DISABLED( \ "v24.12", "v25.06", \ "The parameter is not necessary. Use the function without parameter.") #endif @@ -86,17 +77,10 @@ #endif #ifdef SOFA_BUILD_SOFA_CORE -#define SOFA_ATTRIBUTE_DEPRECATED__REMOVED_CID() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__REMOVED_CID() \ - SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use d_constraintIndex instead.") -#endif - -#ifdef SOFA_BUILD_SOFA_CORE -#define SOFA_ATTRIBUTE_DEPRECATED__BASEWRITEDATAS() +#define SOFA_ATTRIBUTE_DISABLED__BASEWRITEDATAS() #else -#define SOFA_ATTRIBUTE_DEPRECATED__BASEWRITEDATAS() \ - SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "This function is not used.") +#define SOFA_ATTRIBUTE_DISABLED__BASEWRITEDATAS() \ + SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "This function is not used.") #endif @@ -104,40 +88,40 @@ #ifdef SOFA_BUILD_SOFA_CORE - #define SOFA_ATTRIBUTE_DEPRECATED__POSITION() - #define SOFA_ATTRIBUTE_DEPRECATED__REST_POSITION() - #define SOFA_ATTRIBUTE_DEPRECATED__FREE_POSITION() - #define SOFA_ATTRIBUTE_DEPRECATED__RESET_POSITION() + #define SOFA_ATTRIBUTE_DISABLED__POSITION() + #define SOFA_ATTRIBUTE_DISABLED__REST_POSITION() + #define SOFA_ATTRIBUTE_DISABLED__FREE_POSITION() + #define SOFA_ATTRIBUTE_DISABLED__RESET_POSITION() - #define SOFA_ATTRIBUTE_DEPRECATED__VELOCITY() - #define SOFA_ATTRIBUTE_DEPRECATED__RESET_VELOCITY() - #define SOFA_ATTRIBUTE_DEPRECATED__FREE_VELOCITY() - #define SOFA_ATTRIBUTE_DEPRECATED__NORMAL() - #define SOFA_ATTRIBUTE_DEPRECATED__FORCE() - #define SOFA_ATTRIBUTE_DEPRECATED__EXTERNAL_FORCE() - #define SOFA_ATTRIBUTE_DEPRECATED__DX() - #define SOFA_ATTRIBUTE_DEPRECATED__DFORCE() + #define SOFA_ATTRIBUTE_DISABLED__VELOCITY() + #define SOFA_ATTRIBUTE_DISABLED__RESET_VELOCITY() + #define SOFA_ATTRIBUTE_DISABLED__FREE_VELOCITY() + #define SOFA_ATTRIBUTE_DISABLED__NORMAL() + #define SOFA_ATTRIBUTE_DISABLED__FORCE() + #define SOFA_ATTRIBUTE_DISABLED__EXTERNAL_FORCE() + #define SOFA_ATTRIBUTE_DISABLED__DX() + #define SOFA_ATTRIBUTE_DISABLED__DFORCE() - #define SOFA_ATTRIBUTE_DEPRECATED__CONSTRAINT_JACOBIAN() - #define SOFA_ATTRIBUTE_DEPRECATED__MAPPING_JACOBIAN() + #define SOFA_ATTRIBUTE_DISABLED__CONSTRAINT_JACOBIAN() + #define SOFA_ATTRIBUTE_DISABLED__MAPPING_JACOBIAN() #else - #define SOFA_ATTRIBUTE_DEPRECATED__POSITION() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::position or sofa::core::vec_id::write_access::position instead") - #define SOFA_ATTRIBUTE_DEPRECATED__REST_POSITION() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::restPosition or sofa::core::vec_id::write_access::restPosition instead") - #define SOFA_ATTRIBUTE_DEPRECATED__FREE_POSITION() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::freePosition or sofa::core::vec_id::write_access::freePosition instead") - #define SOFA_ATTRIBUTE_DEPRECATED__RESET_POSITION() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::resetPosition or sofa::core::vec_id::write_access::resetPosition instead") - - #define SOFA_ATTRIBUTE_DEPRECATED__VELOCITY() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::velocity or sofa::core::vec_id::write_access::velocity instead") - #define SOFA_ATTRIBUTE_DEPRECATED__RESET_VELOCITY() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::resetVelocity or sofa::core::vec_id::write_access::resetVelocity instead") - #define SOFA_ATTRIBUTE_DEPRECATED__FREE_VELOCITY() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::freeVelocity or sofa::core::vec_id::write_access::freeVelocity instead") - #define SOFA_ATTRIBUTE_DEPRECATED__NORMAL() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::normal or sofa::core::vec_id::write_access::normal instead") - #define SOFA_ATTRIBUTE_DEPRECATED__FORCE() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::force or sofa::core::vec_id::write_access::force instead") - #define SOFA_ATTRIBUTE_DEPRECATED__EXTERNAL_FORCE() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::externalForce or sofa::core::vec_id::write_access::externalForce instead") - #define SOFA_ATTRIBUTE_DEPRECATED__DX() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::dx or sofa::core::vec_id::write_access::dx instead") - #define SOFA_ATTRIBUTE_DEPRECATED__DFORCE() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::dforce or sofa::core::vec_id::write_access::dforce instead") - - #define SOFA_ATTRIBUTE_DEPRECATED__CONSTRAINT_JACOBIAN() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::constraintJacobian or sofa::core::vec_id::write_access::constraintJacobian instead") - #define SOFA_ATTRIBUTE_DEPRECATED__MAPPING_JACOBIAN() SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::mappingJacobian or sofa::core::vec_id::write_access::mappingJacobian instead") + #define SOFA_ATTRIBUTE_DISABLED__POSITION() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::position or sofa::core::vec_id::write_access::position instead") + #define SOFA_ATTRIBUTE_DISABLED__REST_POSITION() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::restPosition or sofa::core::vec_id::write_access::restPosition instead") + #define SOFA_ATTRIBUTE_DISABLED__FREE_POSITION() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::freePosition or sofa::core::vec_id::write_access::freePosition instead") + #define SOFA_ATTRIBUTE_DISABLED__RESET_POSITION() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::resetPosition or sofa::core::vec_id::write_access::resetPosition instead") + + #define SOFA_ATTRIBUTE_DISABLED__VELOCITY() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::velocity or sofa::core::vec_id::write_access::velocity instead") + #define SOFA_ATTRIBUTE_DISABLED__RESET_VELOCITY() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::resetVelocity or sofa::core::vec_id::write_access::resetVelocity instead") + #define SOFA_ATTRIBUTE_DISABLED__FREE_VELOCITY() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::freeVelocity or sofa::core::vec_id::write_access::freeVelocity instead") + #define SOFA_ATTRIBUTE_DISABLED__NORMAL() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::normal or sofa::core::vec_id::write_access::normal instead") + #define SOFA_ATTRIBUTE_DISABLED__FORCE() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::force or sofa::core::vec_id::write_access::force instead") + #define SOFA_ATTRIBUTE_DISABLED__EXTERNAL_FORCE() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::externalForce or sofa::core::vec_id::write_access::externalForce instead") + #define SOFA_ATTRIBUTE_DISABLED__DX() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::dx or sofa::core::vec_id::write_access::dx instead") + #define SOFA_ATTRIBUTE_DISABLED__DFORCE() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::dforce or sofa::core::vec_id::write_access::dforce instead") + + #define SOFA_ATTRIBUTE_DISABLED__CONSTRAINT_JACOBIAN() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::constraintJacobian or sofa::core::vec_id::write_access::constraintJacobian instead") + #define SOFA_ATTRIBUTE_DISABLED__MAPPING_JACOBIAN() SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use the variable sofa::core::vec_id::read_access::mappingJacobian or sofa::core::vec_id::write_access::mappingJacobian instead") #endif diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/Base.cpp b/Sofa/framework/Core/src/sofa/core/objectmodel/Base.cpp index d94402a8445..1e3e1ef9fcf 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/Base.cpp +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/Base.cpp @@ -581,26 +581,6 @@ void Base::updateLinks(bool logErrors) } } -void Base::writeDatas ( std::map& args ) -{ - for(const auto& field : m_vecData) - { - std::string name = field->getName(); - if( args[name] != nullptr ) - *args[name] = field->getValueString(); - else - args[name] = new string(field->getValueString()); - } - for(const auto& link : m_vecLink) - { - std::string name = link->getName(); - if( args[name] != nullptr ) - *args[name] = link->getValueString(); - else - args[name] = new string(link->getValueString()); - } -} - static std::string xmlencode(const std::string& str) { std::string res; diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/Base.h b/Sofa/framework/Core/src/sofa/core/objectmodel/Base.h index 81202a77fc3..ab1acf57676 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/Base.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/Base.h @@ -176,8 +176,8 @@ class SOFA_CORE_API Base : public IntrusiveObject virtual void parseFields ( const std::map& str ); /// Write the current field values to the given map of name -> value pairs - SOFA_ATTRIBUTE_DEPRECATED__BASEWRITEDATAS() - void writeDatas (std::map& str); + SOFA_ATTRIBUTE_DISABLED__BASEWRITEDATAS() + void writeDatas (std::map& str) = delete; /// Write the current field values to the given output stream /// separated with the given separator (" " used by default for XML) diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseData.h b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseData.h index 5fe4163a683..3c45a0d52dd 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseData.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseData.h @@ -298,10 +298,7 @@ class SOFA_CORE_API BaseData : public DDGNode } template - SOFA_ATTRIBUTE_DEPRECATED__UNNECESSARY_PARAMETER_IN_TYPENAME() static std::string typeName(const T*) - { - return typeName(); - } + SOFA_ATTRIBUTE_DISABLED__UNNECESSARY_PARAMETER_IN_TYPENAME() static std::string typeName(const T*) = delete; protected: /// Try to update this Data from the value of its parent in "fast mode"; diff --git a/Sofa/framework/Core/test/VecId_test.cpp b/Sofa/framework/Core/test/VecId_test.cpp index ed15bbb961f..b509a81e12f 100644 --- a/Sofa/framework/Core/test/VecId_test.cpp +++ b/Sofa/framework/Core/test/VecId_test.cpp @@ -38,63 +38,63 @@ TEST(BaseVecId, constructor) TEST(VecId, name) { - static constexpr auto position = sofa::core::VecCoordId::position(); + static constexpr auto position = sofa::core::vec_id::read_access::position; EXPECT_EQ(position.getName(), "position(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::read_access::position.getName(), "position(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::write_access::position.getName(), "position(V_COORD)"); - static constexpr auto restPosition = sofa::core::VecCoordId::restPosition(); + static constexpr auto restPosition = sofa::core::vec_id::read_access::restPosition; EXPECT_EQ(restPosition.getName(), "restPosition(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::read_access::restPosition.getName(), "restPosition(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::write_access::restPosition.getName(), "restPosition(V_COORD)"); - static constexpr auto freePosition = sofa::core::VecCoordId::freePosition(); + static constexpr auto freePosition = sofa::core::vec_id::read_access::freePosition; EXPECT_EQ(freePosition.getName(), "freePosition(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::read_access::freePosition.getName(), "freePosition(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::write_access::freePosition.getName(), "freePosition(V_COORD)"); - static constexpr auto resetPosition = sofa::core::VecCoordId::resetPosition(); + static constexpr auto resetPosition = sofa::core::vec_id::read_access::resetPosition; EXPECT_EQ(resetPosition.getName(), "resetPosition(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::read_access::resetPosition.getName(), "resetPosition(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::write_access::resetPosition.getName(), "resetPosition(V_COORD)"); - static constexpr auto velocity = sofa::core::VecDerivId::velocity(); + static constexpr auto velocity = sofa::core::vec_id::read_access::velocity; EXPECT_EQ(velocity.getName(), "velocity(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::velocity.getName(), "velocity(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::velocity.getName(), "velocity(V_DERIV)"); - static constexpr auto resetVelocity = sofa::core::VecDerivId::resetVelocity(); + static constexpr auto resetVelocity = sofa::core::vec_id::read_access::resetVelocity; EXPECT_EQ(resetVelocity.getName(), "resetVelocity(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::resetVelocity.getName(), "resetVelocity(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::resetVelocity.getName(), "resetVelocity(V_DERIV)"); - static constexpr auto freeVelocity = sofa::core::VecDerivId::freeVelocity(); + static constexpr auto freeVelocity = sofa::core::vec_id::read_access::freeVelocity; EXPECT_EQ(freeVelocity.getName(), "freeVelocity(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::freeVelocity.getName(), "freeVelocity(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::freeVelocity.getName(), "freeVelocity(V_DERIV)"); - static constexpr auto normal = sofa::core::VecDerivId::normal(); + static constexpr auto normal = sofa::core::vec_id::read_access::normal; EXPECT_EQ(normal.getName(), "normal(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::normal.getName(), "normal(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::normal.getName(), "normal(V_DERIV)"); - static constexpr auto force = sofa::core::VecDerivId::force(); + static constexpr auto force = sofa::core::vec_id::read_access::force; EXPECT_EQ(force.getName(), "force(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::force.getName(), "force(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::force.getName(), "force(V_DERIV)"); - static constexpr auto externalForce = sofa::core::VecDerivId::externalForce(); + static constexpr auto externalForce = sofa::core::vec_id::read_access::externalForce; EXPECT_EQ(externalForce.getName(), "externalForce(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::externalForce.getName(), "externalForce(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::externalForce.getName(), "externalForce(V_DERIV)"); - static constexpr auto dx = sofa::core::VecDerivId::dx(); + static constexpr auto dx = sofa::core::vec_id::read_access::dx; EXPECT_EQ(dx.getName(), "dx(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::dx.getName(), "dx(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::dx.getName(), "dx(V_DERIV)"); - static constexpr auto dforce = sofa::core::VecDerivId::dforce(); + static constexpr auto dforce = sofa::core::vec_id::read_access::dforce; EXPECT_EQ(dforce.getName(), "dforce(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::dforce.getName(), "dforce(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::dforce.getName(), "dforce(V_DERIV)"); diff --git a/Sofa/framework/Helper/src/sofa/helper/Utils.cpp b/Sofa/framework/Helper/src/sofa/helper/Utils.cpp index dfbc586d9ab..3d1b6b6b4bd 100644 --- a/Sofa/framework/Helper/src/sofa/helper/Utils.cpp +++ b/Sofa/framework/Helper/src/sofa/helper/Utils.cpp @@ -59,30 +59,6 @@ using sofa::helper::system::FileSystem; namespace sofa::helper { -std::wstring Utils::widenString(const std::string& s) -{ - return sofa::helper::widenString(s); -} - - -std::string Utils::narrowString(const std::wstring& ws) -{ - return sofa::helper::narrowString(ws); -} - - -std::string Utils::downcaseString(const std::string& s) -{ - return sofa::helper::downcaseString(s); -} - - -std::string Utils::upcaseString(const std::string& s) -{ - return sofa::helper::upcaseString(s); -} - - #if defined WIN32 std::string Utils::GetLastError() { LPVOID lpErrMsgBuf; diff --git a/Sofa/framework/Helper/src/sofa/helper/Utils.h b/Sofa/framework/Helper/src/sofa/helper/Utils.h index 388c09e5d40..93fca9ff8d9 100644 --- a/Sofa/framework/Helper/src/sofa/helper/Utils.h +++ b/Sofa/framework/Helper/src/sofa/helper/Utils.h @@ -39,22 +39,22 @@ class SOFA_HELPER_API Utils /// @brief Convert a string to a wstring. /// /// @return The converted string on success, or a empty string on failure. -SOFA_HELPER_UTILS_IN_STRINGUTILS_DEPRECATED() -static std::wstring widenString(const std::string& s); +SOFA_HELPER_UTILS_IN_STRINGUTILS_DISABLED() +static std::wstring widenString(const std::string& s) = delete; /// @brief Convert a wstring to a string. /// /// @return The converted string on success, or a empty string on failure. -SOFA_HELPER_UTILS_IN_STRINGUTILS_DEPRECATED() -static std::string narrowString(const std::wstring& ws); +SOFA_HELPER_UTILS_IN_STRINGUTILS_DISABLED() +static std::string narrowString(const std::wstring& ws) = delete; /// @brief Convert a string to lower case. -SOFA_HELPER_UTILS_IN_STRINGUTILS_DEPRECATED() -static std::string downcaseString(const std::string& s); +SOFA_HELPER_UTILS_IN_STRINGUTILS_DISABLED() +static std::string downcaseString(const std::string& s) = delete; /// @brief Convert a string to upper case. -SOFA_HELPER_UTILS_IN_STRINGUTILS_DEPRECATED() -static std::string upcaseString(const std::string& s); +SOFA_HELPER_UTILS_IN_STRINGUTILS_DISABLED() +static std::string upcaseString(const std::string& s) = delete; #if defined WIN32 diff --git a/Sofa/framework/Helper/src/sofa/helper/config.h.in b/Sofa/framework/Helper/src/sofa/helper/config.h.in index 25d7674a081..69368c79b44 100644 --- a/Sofa/framework/Helper/src/sofa/helper/config.h.in +++ b/Sofa/framework/Helper/src/sofa/helper/config.h.in @@ -42,16 +42,16 @@ -#define SOFA_ATTRIBUTE_DEPRECATED__PLUGIN_GETCOMPONENTLIST() \ - SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", \ +#define SOFA_ATTRIBUTE_DISABLED__PLUGIN_GETCOMPONENTLIST() \ + SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", \ "Using entrypoint GetComponentList() from a plugin has been deprecated. Use the helper function listClassesFromTarget() from ObjectFactory instead.") #ifdef SOFA_BUILD_SOFA_HELPER -#define SOFA_HELPER_UTILS_IN_STRINGUTILS_DEPRECATED() +#define SOFA_HELPER_UTILS_IN_STRINGUTILS_DISABLED() #else -#define SOFA_HELPER_UTILS_IN_STRINGUTILS_DEPRECATED() \ -SOFA_ATTRIBUTE_DEPRECATED( \ -"v24.12", "v25.06", "This function is now in StringUtils.h") +#define SOFA_HELPER_UTILS_IN_STRINGUTILS_DISABLED() \ + SOFA_ATTRIBUTE_DISABLED( \ + "v24.12", "v25.06", "This function is now in StringUtils.h") #endif // SOFA_BUILD_SOFA_HELPER #ifdef SOFA_BUILD_SOFA_HELPER diff --git a/Sofa/framework/Helper/src/sofa/helper/system/PluginManager.h b/Sofa/framework/Helper/src/sofa/helper/system/PluginManager.h index e9b9de32aca..a8a70097a23 100644 --- a/Sofa/framework/Helper/src/sofa/helper/system/PluginManager.h +++ b/Sofa/framework/Helper/src/sofa/helper/system/PluginManager.h @@ -98,16 +98,8 @@ class SOFA_HELPER_API Plugin typedef const char* (*FuncPtr) (); FuncPtr func; - SOFA_ATTRIBUTE_DEPRECATED__PLUGIN_GETCOMPONENTLIST() - const char* operator() () const - { - if (func) - { - msg_warning("Plugin::GetModuleComponentList") << "This entrypoint is being deprecated, and should not be implemented anymore."; - return func(); - } - else return nullptr; - } + SOFA_ATTRIBUTE_DISABLED__PLUGIN_GETCOMPONENTLIST() + const char* operator() () const = delete; GetModuleComponentList():func(nullptr) {} } GetModuleComponentList; diff --git a/Sofa/framework/Helper/test/system/PluginManager_test.cpp b/Sofa/framework/Helper/test/system/PluginManager_test.cpp index 7d9ebf95dad..c27aee28fe9 100644 --- a/Sofa/framework/Helper/test/system/PluginManager_test.cpp +++ b/Sofa/framework/Helper/test/system/PluginManager_test.cpp @@ -196,8 +196,6 @@ TEST_F(PluginManager_test, pluginEntries) EXPECT_TRUE(p.getModuleVersion.func != nullptr); EXPECT_TRUE(p.getModuleLicense.func != nullptr); EXPECT_TRUE(p.getModuleDescription.func != nullptr); - EXPECT_TRUE(p.getModuleComponentList.func != nullptr); - } TEST_F(PluginManager_test, pluginEntriesValues) @@ -226,8 +224,8 @@ TEST_F(PluginManager_test, pluginEntriesValues) ASSERT_EQ(0, std::string(p.getModuleDescription()).compare(testModuleDescription)); ASSERT_NE(0, std::string(p.getModuleDescription()).compare(testModuleDescription + "blablablabalbal")); - ASSERT_EQ(0, std::string(p.getModuleComponentList()).compare(testModuleComponentList)); - ASSERT_NE(0, std::string(p.getModuleComponentList()).compare(testModuleComponentList + "ComponentZ")); + ASSERT_EQ(0, std::string(sofa::core::ObjectFactory::getInstance()->listClassesFromTarget(testModuleName)).compare(testModuleComponentList)); + ASSERT_NE(0, std::string(sofa::core::ObjectFactory::getInstance()->listClassesFromTarget(testModuleName)).compare(testModuleComponentList + "ComponentZ")); } diff --git a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/MatrixExpr.h b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/MatrixExpr.h index ddd75dc4aa4..118369654ef 100644 --- a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/MatrixExpr.h +++ b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/MatrixExpr.h @@ -502,8 +502,6 @@ class MatrixSubtraction } }; -template -using MatrixSubstraction SOFA_ATTRIBUTE_DEPRECATED__MATRIXSUBTRACTION() = MatrixSubtraction; template class MatrixProduct diff --git a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in index 99377355cc0..d3217a4b85b 100644 --- a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in +++ b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in @@ -41,13 +41,3 @@ # define SOFA_LINEARALGEBRA_API SOFA_IMPORT_DYNAMIC_LIBRARY #endif - - -#ifdef SOFA_BUILD_SOFA_LINEARALGEBRA -#define SOFA_ATTRIBUTE_DEPRECATED__MATRIXSUBTRACTION() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__MATRIXSUBTRACTION() \ - SOFA_ATTRIBUTE_DEPRECATED( \ - "v24.12", "v25.06", \ - "Use MatrixSubtraction instead (typo in the deprecated name).") -#endif // SOFA_BUILD_SOFA_LINEARALGEBRA diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/MechanicalOperations.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/MechanicalOperations.cpp index 3669e208d17..e99915bcfc0 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/MechanicalOperations.cpp +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/MechanicalOperations.cpp @@ -508,73 +508,6 @@ void MechanicalOperations::solveConstraint(MultiVecId id, core::ConstraintOrder } } -void MechanicalOperations::m_resetSystem() -{ - LinearSolver* s = ctx->get(ctx->getTags(), BaseContext::SearchDown); - if (!s) - { - showMissingLinearSolverError(); - return; - } - resetSystem(s); -} - -void MechanicalOperations::m_setSystemMBKMatrix(SReal mFact, SReal bFact, SReal kFact) -{ - LinearSolver* s = ctx->get(ctx->getTags(), BaseContext::SearchDown); - if (!s) - { - showMissingLinearSolverError(); - return; - } - setSystemMBKMatrix(MatricesFactors::M(mFact), MatricesFactors::B(bFact), MatricesFactors::K(kFact), s); -} - -void MechanicalOperations::m_setSystemRHVector(core::MultiVecDerivId v) -{ - LinearSolver* s = ctx->get(ctx->getTags(), BaseContext::SearchDown); - if (!s) - { - - return; - } - setSystemRHVector(v, s); -} - -void MechanicalOperations::m_setSystemLHVector(core::MultiVecDerivId v) -{ - LinearSolver* s = ctx->get(ctx->getTags(), BaseContext::SearchDown); - if (!s) - { - showMissingLinearSolverError(); - return; - } - setSystemLHVector(v, s); -} - -void MechanicalOperations::m_solveSystem() -{ - LinearSolver* s = ctx->get(ctx->getTags(), BaseContext::SearchDown); - if (!s) - { - showMissingLinearSolverError(); - return; - } - solveSystem(s); -} - -void MechanicalOperations::m_print( std::ostream& out ) -{ - LinearSolver* s = ctx->get(ctx->getTags(), BaseContext::SearchDown); - if (!s) - { - showMissingLinearSolverError(); - return; - } - print(out, s); -} - - // BaseMatrix & BaseVector Computations void MechanicalOperations::getMatrixDimension(sofa::Size* const nbRow, sofa::Size* const nbCol, sofa::core::behavior::MultiMatrixAccessor* matrix) { @@ -626,29 +559,10 @@ void MechanicalOperations::print( core::ConstMultiVecId /*v*/, std::ostream& /*o { } - void MechanicalOperations::printWithElapsedTime( core::ConstMultiVecId /*v*/, unsigned /*time*/, std::ostream& /*out*/ ) { } -void MechanicalOperations::addMBKdx(core::MultiVecDerivId df, SReal m, SReal b, - SReal k, bool clear, bool accumulate) -{ - addMBKdx(df, core::MatricesFactors::M(m), core::MatricesFactors::B(b), core::MatricesFactors::K(k), clear, accumulate); -} - -void MechanicalOperations::addMBKv(core::MultiVecDerivId df, SReal m, SReal b, - SReal k, bool clear, bool accumulate) -{ - addMBKv(df, core::MatricesFactors::M(m), core::MatricesFactors::B(b), core::MatricesFactors::K(k), clear, accumulate); -} - -void MechanicalOperations::setSystemMBKMatrix(SReal mFact, SReal bFact, - SReal kFact, core::behavior::LinearSolver* linearSolver) -{ - setSystemMBKMatrix(core::MatricesFactors::M(mFact), core::MatricesFactors::B(bFact), core::MatricesFactors::K(kFact), linearSolver); -} - void MechanicalOperations::showMissingLinearSolverError() const { if (!hasShownMissingLinearSolverMap[ctx]) diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/MechanicalOperations.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/MechanicalOperations.h index 0bf43392655..8271c98343a 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/MechanicalOperations.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/MechanicalOperations.h @@ -109,12 +109,12 @@ class SOFA_SIMULATION_CORE_API MechanicalOperations void solveSystem(core::behavior::LinearSolver* linearSolver); void print( std::ostream& out, core::behavior::LinearSolver* linearSolver); - SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_RESETSYSTEM() void m_resetSystem(); - SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX() void m_setSystemMBKMatrix(SReal mFact, SReal bFact, SReal kFact); - SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SETSYSTEMRHVECTOR() void m_setSystemRHVector(core::MultiVecDerivId v); - SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SETSYSTEMLHVECTOR() void m_setSystemLHVector(core::MultiVecDerivId v); - SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SOLVESYSTEM() void m_solveSystem(); - SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_PRINT() void m_print( std::ostream& out ); + SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_RESETSYSTEM() void m_resetSystem() = delete; + SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX() void m_setSystemMBKMatrix(SReal mFact, SReal bFact, SReal kFact) = delete; + SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMRHVECTOR() void m_setSystemRHVector(core::MultiVecDerivId v) = delete; + SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMLHVECTOR() void m_setSystemLHVector(core::MultiVecDerivId v) = delete; + SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SOLVESYSTEM() void m_solveSystem() = delete; + SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_PRINT() void m_print( std::ostream& out ) = delete; /// @} @@ -152,12 +152,12 @@ class SOFA_SIMULATION_CORE_API MechanicalOperations /// @} - SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_ADDMBKDX() - void addMBKdx(core::MultiVecDerivId df, SReal m, SReal b, SReal k, bool clear = true, bool accumulate = true); - SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_ADDMBKV() - void addMBKv(core::MultiVecDerivId df, SReal m, SReal b, SReal k, bool clear = true, bool accumulate = true); - SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX_OTHER() - void setSystemMBKMatrix(SReal mFact, SReal bFact, SReal kFact, core::behavior::LinearSolver* linearSolver); + SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_ADDMBKDX() + void addMBKdx(core::MultiVecDerivId df, SReal m, SReal b, SReal k, bool clear = true, bool accumulate = true) = delete; + SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_ADDMBKV() + void addMBKv(core::MultiVecDerivId df, SReal m, SReal b, SReal k, bool clear = true, bool accumulate = true) = delete; + SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX_OTHER() + void setSystemMBKMatrix(SReal mFact, SReal bFact, SReal kFact, core::behavior::LinearSolver* linearSolver) = delete; protected: VisitorExecuteFunc executeVisitor; diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in b/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in index a2d7d2e8af2..b989ec4c6f9 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in @@ -35,73 +35,73 @@ #ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_RESETSYSTEM() +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_RESETSYSTEM() #else -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_RESETSYSTEM() \ - SOFA_ATTRIBUTE_DEPRECATED( \ +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_RESETSYSTEM() \ + SOFA_ATTRIBUTE_DISABLED( \ "v24.06", "v24.12", "Use resetSystem instead") #endif // SOFA_BUILD_SOFA_SIMULATION_CORE #ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX() +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX() #else -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX() \ - SOFA_ATTRIBUTE_DEPRECATED( \ +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX() \ + SOFA_ATTRIBUTE_DISABLED( \ "v24.06", "v24.12", "Use setSystemMBKMatrix instead") #endif // SOFA_BUILD_SOFA_SIMULATION_CORE #ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SETSYSTEMRHVECTOR() +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMRHVECTOR() #else -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SETSYSTEMRHVECTOR() \ - SOFA_ATTRIBUTE_DEPRECATED( \ +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMRHVECTOR() \ + SOFA_ATTRIBUTE_DISABLED( \ "v24.06", "v24.12", "Use setSystemRHVector instead") #endif // SOFA_BUILD_SOFA_SIMULATION_CORE #ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SETSYSTEMLHVECTOR() +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMLHVECTOR() #else -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SETSYSTEMLHVECTOR() \ - SOFA_ATTRIBUTE_DEPRECATED( \ +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMLHVECTOR() \ + SOFA_ATTRIBUTE_DISABLED( \ "v24.06", "v24.12", "Use setSystemLHVector instead") #endif // SOFA_BUILD_SOFA_SIMULATION_CORE #ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SOLVESYSTEM() +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SOLVESYSTEM() #else -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SOLVESYSTEM() \ - SOFA_ATTRIBUTE_DEPRECATED( \ +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SOLVESYSTEM() \ + SOFA_ATTRIBUTE_DISABLED( \ "v24.06", "v24.12", "Use solveSystem instead") #endif // SOFA_BUILD_SOFA_SIMULATION_CORE #ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_PRINT() +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_PRINT() #else -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_PRINT() \ - SOFA_ATTRIBUTE_DEPRECATED( \ +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_PRINT() \ + SOFA_ATTRIBUTE_DISABLED( \ "v24.06", "v24.12", "Use print instead") #endif // SOFA_BUILD_SOFA_SIMULATION_CORE #ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_ADDMBKDX() +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_ADDMBKDX() #else -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_ADDMBKDX() \ - SOFA_ATTRIBUTE_DEPRECATED( \ +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_ADDMBKDX() \ + SOFA_ATTRIBUTE_DISABLED( \ "v24.12", "v25.06", "Use the other addMBKdx overload instead.") #endif // SOFA_BUILD_SOFA_SIMULATION_CORE #ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_ADDMBKV() +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_ADDMBKV() #else -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_ADDMBKV() \ - SOFA_ATTRIBUTE_DEPRECATED( \ +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_ADDMBKV() \ + SOFA_ATTRIBUTE_DISABLED( \ "v24.12", "v25.06", "Use the other addMBKv overload instead.") #endif // SOFA_BUILD_SOFA_SIMULATION_CORE #ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX_OTHER() +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX_OTHER() #else -#define SOFA_ATTRIBUTE_DEPRECATED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX_OTHER() \ - SOFA_ATTRIBUTE_DEPRECATED( \ +#define SOFA_ATTRIBUTE_DISABLED_MECHANICALOPERATIONS_SETSYSTEMMBKMATRIX_OTHER() \ + SOFA_ATTRIBUTE_DISABLED( \ "v24.12", "v25.06", "Use the other setSystemMBKMatrix overload instead.") #endif // SOFA_BUILD_SOFA_SIMULATION_CORE diff --git a/Sofa/framework/Testing/src/sofa/testing/BaseSimulationTest.cpp b/Sofa/framework/Testing/src/sofa/testing/BaseSimulationTest.cpp index 16b3fbb21ee..5a602329b3a 100644 --- a/Sofa/framework/Testing/src/sofa/testing/BaseSimulationTest.cpp +++ b/Sofa/framework/Testing/src/sofa/testing/BaseSimulationTest.cpp @@ -40,12 +40,6 @@ using sofa::helper::system::PluginManager ; namespace sofa::testing { -bool BaseSimulationTest::importPlugin(const std::string& name) -{ - this->loadPlugins({name}); - return true; -} - BaseSimulationTest::SceneInstance::SceneInstance(const std::string& type, const std::string& desc) { if(type != "xml"){ diff --git a/Sofa/framework/Testing/src/sofa/testing/BaseSimulationTest.h b/Sofa/framework/Testing/src/sofa/testing/BaseSimulationTest.h index 3254ce2e17c..fcc8ea977f8 100644 --- a/Sofa/framework/Testing/src/sofa/testing/BaseSimulationTest.h +++ b/Sofa/framework/Testing/src/sofa/testing/BaseSimulationTest.h @@ -37,8 +37,8 @@ class SOFA_TESTING_API BaseSimulationTest : public virtual BaseTest public: BaseSimulationTest() ; - SOFA_ATTRIBUTE_DEPRECATED__TESTING_IMPORT_PLUGIN() - bool importPlugin(const std::string& name) ; + SOFA_ATTRIBUTE_DISABLED__TESTING_IMPORT_PLUGIN() + bool importPlugin(const std::string& name) = delete; class SOFA_TESTING_API SceneInstance { diff --git a/Sofa/framework/Testing/src/sofa/testing/config.h.in b/Sofa/framework/Testing/src/sofa/testing/config.h.in index 04dedf7c8fb..4408f7d8e33 100644 --- a/Sofa/framework/Testing/src/sofa/testing/config.h.in +++ b/Sofa/framework/Testing/src/sofa/testing/config.h.in @@ -37,10 +37,10 @@ constexpr char SOFA_TESTING_RESOURCES_DIR[] = "@SOFA_TESTING_RESOURCES_DIR@"; #endif #ifdef SOFA_BUILD_SOFA_TESTING -#define SOFA_ATTRIBUTE_DEPRECATED__TESTING_IMPORT_PLUGIN() +#define SOFA_ATTRIBUTE_DISABLED__TESTING_IMPORT_PLUGIN() #else -#define SOFA_ATTRIBUTE_DEPRECATED__TESTING_IMPORT_PLUGIN() \ - SOFA_ATTRIBUTE_DEPRECATED( \ +#define SOFA_ATTRIBUTE_DISABLED__TESTING_IMPORT_PLUGIN() \ + SOFA_ATTRIBUTE_DISABLED( \ "v24.06", "v24.12", "Use sofa::simpleapi::importPlugin() instead.") #endif // SOFA_BUILD_SOFA_TESTING diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.h b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.h index d5336d1f9b7..79865ed4602 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.h +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.h @@ -131,11 +131,11 @@ class TBulletConvexHullModel : public sofa::core::CollisionModel ,public BulletC inline virtual void setMargin(SReal margin){_bt_cshape.setMargin(margin);} inline const Coord & center()const{ - return DataTypes::getCPos(_mstate->read(core::ConstVecCoordId::position())->getValue()[0]); + return DataTypes::getCPos(_mstate->read(core::vec_id::read_access::position)->getValue()[0]); } inline const Quaternion & orientation()const{ - return _mstate->read(core::ConstVecCoordId::position())->getValue()[0].getOrientation(); + return _mstate->read(core::vec_id::read_access::position)->getValue()[0].getOrientation(); } Data computeConvexHullDecomposition; ///< compute convex hull decomposition using HACD diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.inl b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.inl index 56b5e47a90d..cae6ed3906b 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.inl +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.inl @@ -113,8 +113,8 @@ void TBulletConvexHullModel::initBullet(){ } } - const Quaternion & ori = _mstate->read(core::ConstVecCoordId::position())->getValue()[0].getOrientation(); - const Coord & center = _mstate->read(core::ConstVecCoordId::position())->getValue()[0].getCenter(); + const Quaternion & ori = _mstate->read(core::vec_id::read_access::position)->getValue()[0].getOrientation(); + const Coord & center = _mstate->read(core::vec_id::read_access::position)->getValue()[0].getCenter(); _bt_trans.setRotation(btQuaternion(ori[0],ori[1],ori[2],ori[3])); _bt_trans.setOrigin(btVector3(center[0],center[1],center[2])); @@ -276,8 +276,8 @@ void TBulletConvexHullModel::initBullet(){ template void TBulletConvexHullModel::updateBullet(){ - const Quaternion & ori = _mstate->read(core::ConstVecCoordId::position())->getValue()[0].getOrientation(); - const Coord & center = _mstate->read(core::ConstVecCoordId::position())->getValue()[0].getCenter(); + const Quaternion & ori = _mstate->read(core::vec_id::read_access::position)->getValue()[0].getOrientation(); + const Coord & center = _mstate->read(core::vec_id::read_access::position)->getValue()[0].getCenter(); _bt_trans.setIdentity(); _bt_trans.setOrigin(btVector3(center[0],center[1],center[2])); @@ -349,8 +349,8 @@ void TBulletConvexHullModel::draw(const core::visual::VisualParams* v if(!bmsh) return; - const Quaternion & ori = _mstate->read(core::ConstVecCoordId::position())->getValue()[0].getOrientation(); - const Coord & center = _mstate->read(core::ConstVecCoordId::position())->getValue()[0].getCenter(); + const Quaternion & ori = _mstate->read(core::vec_id::read_access::position)->getValue()[0].getOrientation(); + const Coord & center = _mstate->read(core::vec_id::read_access::position)->getValue()[0].getCenter(); type::Matrix3 sofa_mat; ori.toMatrix(sofa_mat); diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletRigidContactMapper.h b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletRigidContactMapper.h index b24893e63ff..ec06f11fd8a 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletRigidContactMapper.h +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletRigidContactMapper.h @@ -90,7 +90,7 @@ class BulletRigidContactMapper : public BaseContactMapper } else { - helper::WriteAccessor > xData = *outmodel->write(core::VecCoordId::position()); + helper::WriteAccessor > xData = *outmodel->write(core::vec_id::write_access::position); xData.wref()[i] = P; } return i; @@ -101,8 +101,8 @@ class BulletRigidContactMapper : public BaseContactMapper if (mapping!=NULL) { core::BaseMapping* map = mapping.get(); - map->apply(core::mechanicalparams::defaultInstance(), core::VecCoordId::position(), core::ConstVecCoordId::position()); - map->applyJ(core::mechanicalparams::defaultInstance(), core::VecDerivId::velocity(), core::ConstVecDerivId::velocity()); + map->apply(core::mechanicalparams::defaultInstance(), core::vec_id::write_access::position, core::vec_id::read_access::position); + map->applyJ(core::mechanicalparams::defaultInstance(), core::vec_id::write_access::velocity, core::vec_id::read_access::velocity); } } @@ -111,7 +111,7 @@ class BulletRigidContactMapper : public BaseContactMapper if (mapping!=NULL) { core::BaseMapping* map = mapping.get(); - map->apply(core::mechanicalparams::defaultInstance(), core::VecCoordId::freePosition(), core::ConstVecCoordId::freePosition()); + map->apply(core::mechanicalparams::defaultInstance(), core::vec_id::write_access::freePosition, core::vec_id::read_access::freePosition); } } }; diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletSphereModel.inl b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletSphereModel.inl index deca13325bf..42bd7e7b355 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletSphereModel.inl +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletSphereModel.inl @@ -52,7 +52,7 @@ void TBulletSphereModel::initBullet(){ sofa::core::objectmodel::BaseObject::f_listening.setValue(true); _bt_cshape = new btCompoundShape(); - const VecCoord & pos = this->mstate->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord & pos = this->mstate->read(core::vec_id::read_access::position)->getValue(); int npoints = pos.size(); const VecReal & radii = this->radius.getValue(); @@ -78,7 +78,7 @@ template void TBulletSphereModel::updateBullet(){ sofa::core::objectmodel::BaseObject::f_listening.setValue(true); - const VecCoord & pos = this->mstate->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord & pos = this->mstate->read(core::vec_id::read_access::position)->getValue(); int npoints = pos.size(); for(int i = 0 ; i < npoints ; ++i){ diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletTriangleModel.inl b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletTriangleModel.inl index 013ee376534..0da91749056 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletTriangleModel.inl +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletTriangleModel.inl @@ -46,7 +46,7 @@ void TBulletTriangleModel::initBullet(){ _bt_mesh = new btTriangleMesh(); const SeqTriangles & tri = m_topology->getTriangles(); - const VecCoord & pos = m_mstate->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord & pos = m_mstate->read(core::vec_id::read_access::position)->getValue(); int npoints = m_mstate->getSize(); int nTri = m_topology->getNbTriangles(); @@ -124,7 +124,7 @@ void TBulletTriangleModel::reinit(){ // _bt_mesh->getLockedVertexIndexBase(&vertexbase,numverts,type,vertexStride,&indexbase,indexstride,numfaces,indicestype); -// const VecCoord & pos = mstate->read(core::ConstVecCoordId::position())->getValue(); +// const VecCoord & pos = mstate->read(core::vec_id::read_access::position)->getValue(); // assert(mstate->getSize() == numverts); // if(type == PHY_FLOAT){ @@ -171,7 +171,7 @@ void TBulletTriangleModel::updateBullet(){ _bt_mesh->getLockedVertexIndexBase(&vertexbase,numverts,type,vertexStride,&indexbase,indexstride,numfaces,indicestype); - const VecCoord & pos = m_mstate->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord & pos = m_mstate->read(core::vec_id::read_access::position)->getValue(); assert(m_mstate->getSize() == (size_t)numverts); if(type == PHY_FLOAT){ diff --git a/applications/plugins/MultiThreading/src/MultiThreading/component/solidmechanics/spring/ParallelStiffSpringForceField.inl b/applications/plugins/MultiThreading/src/MultiThreading/component/solidmechanics/spring/ParallelStiffSpringForceField.inl index f69b9f27848..d6336cab00a 100644 --- a/applications/plugins/MultiThreading/src/MultiThreading/component/solidmechanics/spring/ParallelStiffSpringForceField.inl +++ b/applications/plugins/MultiThreading/src/MultiThreading/component/solidmechanics/spring/ParallelStiffSpringForceField.inl @@ -22,5 +22,5 @@ #pragma once #include -SOFA_DEPRECATED_HEADER("v24.06", "v25.06", "sofa/component/solidmechanics/spring/ParallelSpringForceField.inl") +SOFA_HEADER_DISABLED("v24.06", "v25.06", "sofa/component/solidmechanics/spring/ParallelSpringForceField.inl") diff --git a/applications/plugins/PersistentContact/PersistentContactBarycentricMapping.inl b/applications/plugins/PersistentContact/PersistentContactBarycentricMapping.inl index b695c82fbeb..4adc930f7c5 100644 --- a/applications/plugins/PersistentContact/PersistentContactBarycentricMapping.inl +++ b/applications/plugins/PersistentContact/PersistentContactBarycentricMapping.inl @@ -400,7 +400,7 @@ int PersistentContactBarycentricMapping::addContactPointFromInputMapp { if (m_persistentMapper) { - const InVecCoord& xfrom = this->fromModel->read(core::ConstVecCoordId::position())->getValue(); + const InVecCoord& xfrom = this->fromModel->read(core::vec_id::read_access::position)->getValue(); int index = m_persistentMapper->addContactPointFromInputMapping(xfrom, pos, baryCoords); this->toModel->resize(index+1); @@ -519,10 +519,10 @@ void PersistentContactBarycentricMapping::createPersistentMapperFromT template void PersistentContactBarycentricMapping::applyPositionAndFreePosition() { - core::Mapping::apply(0, sofa::core::VecCoordId::position(), sofa::core::ConstVecCoordId::position()); - core::Mapping::applyJ(0, sofa::core::VecDerivId::velocity(), sofa::core::ConstVecDerivId::velocity()); - core::Mapping::apply(0, sofa::core::VecCoordId::freePosition(), sofa::core::ConstVecCoordId::freePosition()); - core::Mapping::applyJ(0, sofa::core::VecDerivId::freeVelocity(), sofa::core::ConstVecDerivId::freeVelocity()); + core::Mapping::apply(0, sofa::core::vec_id::write_access::position, sofa::core::vec_id::read_access::position); + core::Mapping::applyJ(0, sofa::core::vec_id::write_access::velocity, sofa::core::vec_id::read_access::velocity); + core::Mapping::apply(0, sofa::core::vec_id::write_access::freePosition, sofa::core::vec_id::read_access::freePosition); + core::Mapping::applyJ(0, sofa::core::vec_id::write_access::freeVelocity, sofa::core::vec_id::read_access::freeVelocity); } diff --git a/applications/plugins/PersistentContact/PersistentContactRigidMapping.h b/applications/plugins/PersistentContact/PersistentContactRigidMapping.h index 604be33ca49..a0501006cd9 100644 --- a/applications/plugins/PersistentContact/PersistentContactRigidMapping.h +++ b/applications/plugins/PersistentContact/PersistentContactRigidMapping.h @@ -100,7 +100,7 @@ class PersistentContactRigidMapping : public RigidMapping, public Per void applyJT(const core::ConstraintParams *cparams /* PARAMS FIRST */, Data& out, const Data& in) { - m_previousPosition = this->fromModel->read(core::ConstVecCoordId::position())->getValue(); + m_previousPosition = this->fromModel->read(core::vec_id::read_access::position)->getValue(); // std::cout<<"applyJT m_previousPosition = "<::beginAddContactPoint() { if (this->f_printLog.getValue()) { - std::cout << "BeginAddContactPoint : pos = " << this->toModel->read(core::ConstVecCoordId::position())->getValue() << " before suppr the contact" << std::endl; + std::cout << "BeginAddContactPoint : pos = " << this->toModel->read(core::vec_id::read_access::position)->getValue() << " before suppr the contact" << std::endl; } m_previousPoints = this->points.getValue(); @@ -77,7 +77,7 @@ int PersistentContactRigidMapping::addContactPointFromInputMapping(co std::cout << "addContactPointFromInputMapping Pos Ref = " << pos <fromModel->read(core::ConstVecCoordId::position())->getValue(); + const typename In::VecCoord& xfrom = this->fromModel->read(core::vec_id::read_access::position)->getValue(); Coord posContact; for (unsigned int i = 0; i < 3; i++) @@ -184,8 +184,8 @@ void PersistentContactRigidMapping::reset() template void PersistentContactRigidMapping::setDefaultValues() { - m_previousPosition = this->fromModel->read(core::ConstVecCoordId::position())->getValue(); - m_previousFreePosition = this->fromModel->read(core::ConstVecCoordId::position())->getValue(); + m_previousPosition = this->fromModel->read(core::vec_id::read_access::position)->getValue(); + m_previousFreePosition = this->fromModel->read(core::vec_id::read_access::position)->getValue(); m_previousDx.resize(m_previousFreePosition.size()); } @@ -204,8 +204,8 @@ void PersistentContactRigidMapping::handleEvent(sofa::core::objectmod template void PersistentContactRigidMapping::storeFreePositionAndDx() { - m_previousFreePosition = this->fromModel->read(core::ConstVecCoordId::freePosition())->getValue(); - m_previousDx = this->fromModel->read(core::ConstVecDerivId::dx())->getValue(); + m_previousFreePosition = this->fromModel->read(core::vec_id::read_access::freePosition)->getValue(); + m_previousDx = this->fromModel->read(core::vec_id::read_access::dx)->getValue(); if (this->f_printLog.getValue()) { @@ -240,7 +240,7 @@ void PersistentContactRigidMapping::applyLinearizedPosition() this->applyJ(0, newDx, prevDx); - Data< VecCoord >* newPos_d = this->toModel->write(core::VecCoordId::position()); + Data< VecCoord >* newPos_d = this->toModel->write(core::vec_id::read_access::position); VecCoord &newPos = *newPos_d->beginEdit(); newPos = newXFree.getValue(); @@ -258,9 +258,9 @@ template void PersistentContactRigidMapping::applyPositionAndFreePosition() { applyLinearizedPosition(); - core::Mapping::apply(0, sofa::core::VecCoordId::freePosition(), sofa::core::ConstVecCoordId::freePosition()); - core::Mapping::applyJ(0, sofa::core::VecDerivId::velocity(), sofa::core::ConstVecDerivId::velocity()); - core::Mapping::applyJ(0, sofa::core::VecDerivId::freeVelocity(), sofa::core::ConstVecDerivId::freeVelocity()); + core::Mapping::apply(0, sofa::core::vec_id::write_access::freePosition, sofa::core::vec_id::read_access::freePosition); + core::Mapping::applyJ(0, sofa::core::vec_id::write_access::velocity, sofa::core::vec_id::read_access::velocity); + core::Mapping::applyJ(0, sofa::core::vec_id::write_access::freeVelocity, sofa::core::vec_id::read_access::freeVelocity); } diff --git a/applications/plugins/PersistentContact/PersistentUnilateralInteractionConstraint.inl b/applications/plugins/PersistentContact/PersistentUnilateralInteractionConstraint.inl index 6c731b70c0c..eaaf9e2970b 100644 --- a/applications/plugins/PersistentContact/PersistentUnilateralInteractionConstraint.inl +++ b/applications/plugins/PersistentContact/PersistentUnilateralInteractionConstraint.inl @@ -150,8 +150,8 @@ void PersistentUnilateralInteractionConstraint::addContact(double mu, typename Inherited::Contact& c = this->contacts[lastContactIndex]; - c.P = this->getMState2()->read(core::ConstVecCoordId::position())->getValue()[m2]; - c.Q = this->getMState1()->read(core::ConstVecCoordId::position())->getValue()[m1]; + c.P = this->getMState2()->read(core::vec_id::read_access::position)->getValue()[m2]; + c.Q = this->getMState1()->read(core::vec_id::read_access::position)->getValue()[m1]; c.m1 = m1; c.m2 = m2; c.norm = norm; @@ -169,8 +169,8 @@ void PersistentUnilateralInteractionConstraint::addContact(double mu, template void PersistentUnilateralInteractionConstraint::getPositionViolation(linearalgebra::BaseVector *v) { - const VecCoord &PfreeVec = this->getMState2()->read(core::ConstVecCoordId::freePosition())->getValue(); - const VecCoord &QfreeVec = this->getMState1()->read(core::ConstVecCoordId::freePosition())->getValue(); + const VecCoord &PfreeVec = this->getMState2()->read(core::vec_id::read_access::freePosition)->getValue(); + const VecCoord &QfreeVec = this->getMState1()->read(core::vec_id::read_access::freePosition)->getValue(); Real dfree = (Real)0.0; Real dfree_t = (Real)0.0; @@ -250,8 +250,8 @@ void PersistentUnilateralInteractionConstraint::getPositionViolation( template void PersistentUnilateralInteractionConstraint::getVelocityViolation(linearalgebra::BaseVector *v) { - const VecDeriv &PvfreeVec = this->getMState2()->read(core::ConstVecDerivId::freeVelocity())->getValue(); - const VecDeriv &QvfreeVec = this->getMState1()->read(core::ConstVecDerivId::freeVelocity())->getValue(); + const VecDeriv &PvfreeVec = this->getMState2()->read(core::vec_id::read_access::freeVelocity)->getValue(); + const VecDeriv &QvfreeVec = this->getMState1()->read(core::vec_id::read_access::freeVelocity)->getValue(); const unsigned int cSize = this->contacts.size(); diff --git a/applications/plugins/Sensable/NewOmniDriver.cpp b/applications/plugins/Sensable/NewOmniDriver.cpp index ded4863fabb..8d710586f64 100644 --- a/applications/plugins/Sensable/NewOmniDriver.cpp +++ b/applications/plugins/Sensable/NewOmniDriver.cpp @@ -648,7 +648,7 @@ void NewOmniDriver::bwdInit() } else { - sofa::helper::WriteAccessor > xfree = *DOFs->write(this->setRestShape.getValue() ? sofa::core::VecCoordId::restPosition() : sofa::core::VecCoordId::freePosition()); + sofa::helper::WriteAccessor > xfree = *DOFs->write(this->setRestShape.getValue() ? sofa::core::vec_id::write_access::restPosition : sofa::core::vec_id::write_access::freePosition); if (xfree.size() == 0) xfree.resize(1); autreOmniDriver[this->deviceIndex.getValue()]->DOFs = DOFs; @@ -990,8 +990,8 @@ void NewOmniDriver::onAnimateBeginEvent() if(DOFs!=NULL) { - sofa::helper::WriteAccessor > x = *DOFs->write(this->setRestShape.getValue() ? sofa::core::VecCoordId::restPosition() : sofa::core::VecCoordId::position()); - sofa::helper::WriteAccessor > xfree = *DOFs->write(this->setRestShape.getValue() ? sofa::core::VecCoordId::restPosition() : sofa::core::VecCoordId::freePosition()); + sofa::helper::WriteAccessor > x = *DOFs->write(this->setRestShape.getValue() ? sofa::core::vec_id::write_access::restPosition : sofa::core::vec_id::write_access::position); + sofa::helper::WriteAccessor > xfree = *DOFs->write(this->setRestShape.getValue() ? sofa::core::vec_id::write_access::restPosition : sofa::core::vec_id::write_access::freePosition); unsigned int index = 0; x [index].getCenter()=world_H_virtualTool.getOrigin(); diff --git a/applications/plugins/Sensable/OmniDriver.cpp b/applications/plugins/Sensable/OmniDriver.cpp index df38dd2f33a..bc6112c2fc4 100644 --- a/applications/plugins/Sensable/OmniDriver.cpp +++ b/applications/plugins/Sensable/OmniDriver.cpp @@ -518,8 +518,8 @@ void OmniDriver::handleEvent(core::objectmodel::Event *event) /// TODO : SHOULD INCLUDE VELOCITY !! - helper::WriteAccessor > > > x = *this->mState->write(core::VecCoordId::position()); - helper::WriteAccessor > > > xfree = *this->mState->write(core::VecCoordId::freePosition()); + helper::WriteAccessor > > > x = *this->mState->write(core::vec_id::write_access::position); + helper::WriteAccessor > > > xfree = *this->mState->write(core::vec_id::write_access::freePosition); sofa::helper::AdvancedTimer::stepEnd("OmniDriver::3"); sofa::helper::AdvancedTimer::stepBegin("OmniDriver::4"); diff --git a/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaSPHFluidForceField.inl b/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaSPHFluidForceField.inl index 5493d61e1b5..752ea1f1502 100644 --- a/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaSPHFluidForceField.inl +++ b/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaSPHFluidForceField.inl @@ -128,7 +128,7 @@ void SPHFluidForceField::addDForce(const core::Mechan VecDeriv& df = *d_df.beginEdit(); const VecDeriv& dx = d_dx.getValue(); - const VecDeriv& v = this->mstate->read(core::ConstVecDerivId::velocity())->getValue(); + const VecDeriv& v = this->mstate->read(core::vec_id::read_access::velocity)->getValue(); data.fillParams(this, kernelT, mparams->kFactor(), sofa::core::mechanicalparams::bFactor(mparams)); df.resize(dx.size()); Grid::Grid* g = m_grid->getGrid(); @@ -212,7 +212,7 @@ void SPHFluidForceField::addDForce(const core::Mechan VecDeriv& df = *d_df.beginEdit(); const VecDeriv& dx = d_dx.getValue(); //const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue(); - const VecDeriv& v = this->mstate->read(core::ConstVecDerivId::velocity())->getValue(); + const VecDeriv& v = this->mstate->read(core::vec_id::read_access::velocity)->getValue(); data.fillParams(this, mparams->kFactor(), sofa::core::mechanicalparams::bFactor(mparams)); df.resize(dx.size()); Grid::Grid* g = m_grid->getGrid(); diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaFixedConstraint.h b/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaFixedConstraint.h index 91c955f9821..200b4c1dd36 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaFixedConstraint.h +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaFixedConstraint.h @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v23.12", "v24.12", "SofaCUDA/component/constraint/projective/CudaFixedProjectiveConstraint.h") +SOFA_HEADER_DISABLED("v23.12", "v24.12", "SofaCUDA/component/constraint/projective/CudaFixedProjectiveConstraint.h") diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaFixedConstraint.inl b/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaFixedConstraint.inl index ac870a3e2c5..914359c71ee 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaFixedConstraint.inl +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaFixedConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v23.12", "v24.12", "SofaCUDA/component/constraint/projective/CudaFixedProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v23.12", "v24.12", "SofaCUDA/component/constraint/projective/CudaFixedProjectiveConstraint.inl") diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaLinearMovementConstraint.h b/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaLinearMovementConstraint.h index 0e4c87ff6b7..48ed016cd12 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaLinearMovementConstraint.h +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaLinearMovementConstraint.h @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v23.12", "v24.12", "SofaCUDA/component/constraint/projective/CudaLinearMovementProjectiveConstraint.h") +SOFA_HEADER_DISABLED("v23.12", "v24.12", "SofaCUDA/component/constraint/projective/CudaLinearMovementProjectiveConstraint.h") diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaLinearMovementConstraint.inl b/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaLinearMovementConstraint.inl index 2da259426fa..b2724c4efdb 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaLinearMovementConstraint.inl +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaLinearMovementConstraint.inl @@ -23,4 +23,4 @@ #include -SOFA_HEADER_DEPRECATED("v23.12", "v24.12", "SofaCUDA/component/constraint/projective/CudaLinearMovementProjectiveConstraint.inl") +SOFA_HEADER_DISABLED("v23.12", "v24.12", "SofaCUDA/component/constraint/projective/CudaLinearMovementProjectiveConstraint.inl") diff --git a/applications/plugins/SofaHAPI/SofaHAPIHapticsDevice.cpp b/applications/plugins/SofaHAPI/SofaHAPIHapticsDevice.cpp index edf7973e1d3..861091ce939 100644 --- a/applications/plugins/SofaHAPI/SofaHAPIHapticsDevice.cpp +++ b/applications/plugins/SofaHAPI/SofaHAPIHapticsDevice.cpp @@ -365,7 +365,7 @@ namespace sofa { sout << "Enabling tool transition spring" << sendl; - sofa::helper::ReadAccessor > > > x = *this->mState->read(sofa::core::VecCoordId::position()); + sofa::helper::ReadAccessor > > > x = *this->mState->read(sofa::core::vec_id::read_access::position); Transform world_H_new_virtualTool(x[newToolIndex].getCenter(), x[newToolIndex].getOrientation()); Transform baseDevice_H_endDevice2 = data.world_H_baseDevice.inversed() * world_H_new_virtualTool * data.endDevice_H_virtualTool.inversed(); transitionEffect.reset( @@ -415,8 +415,8 @@ namespace sofa sofa::helper::AdvancedTimer::stepBegin("SetState"); /// TODO : SHOULD INCLUDE VELOCITY !! - sofa::helper::WriteAccessor > > > x = *this->mState->write(sofa::core::VecCoordId::position()); - sofa::helper::WriteAccessor > > > xfree = *this->mState->write(sofa::core::VecCoordId::freePosition()); + sofa::helper::WriteAccessor > > > x = *this->mState->write(sofa::core::vec_id::write_access::position); + sofa::helper::WriteAccessor > > > xfree = *this->mState->write(sofa::core::vec_id::write_access::freePosition); xfree[currentToolIndex].getCenter() = world_H_virtualTool.getOrigin(); x[currentToolIndex].getCenter() = world_H_virtualTool.getOrigin(); diff --git a/applications/plugins/SofaOpenCL/OpenCLMechanicalObject.inl b/applications/plugins/SofaOpenCL/OpenCLMechanicalObject.inl index 56fc7cd279b..43bb91a1d72 100644 --- a/applications/plugins/SofaOpenCL/OpenCLMechanicalObject.inl +++ b/applications/plugins/SofaOpenCL/OpenCLMechanicalObject.inl @@ -821,7 +821,7 @@ template void MechanicalObjectInternalData< gpu::opencl::OpenCLVectorTypes >::resetForce(Main* m) { DEBUG_TEXT("*MechanicalObjectInternalData::resetForce "); - Data* d_f = m->write(core::VecDerivId::force()); + Data* d_f = m->write(core::vec_id::write_access::force); VecDeriv& f = *d_f->beginEdit(); if (f.size() > 0) Kernels::vClear(f.size(), f.deviceWrite()); @@ -832,7 +832,7 @@ void MechanicalObjectInternalData< gpu::opencl::OpenCLVectorTypes void MechanicalObject< T >::accumulateForce(const core::ExecParams* params, core::VecDerivId fid) \ -{ if( fid==core::VecDerivId::force() ) data.accumulateForce(this); else core::behavior::BaseMechanicalState::accumulateForce(params,fid); } \ +{ if( fid==core::vec_id::write_access::force ) data.accumulateForce(this); else core::behavior::BaseMechanicalState::accumulateForce(params,fid); } \ template<> void MechanicalObject< T >::vOp(const core::ExecParams* /* params */ /* PARAMS FIRST */, core::VecId v, core::ConstVecId a, core::ConstVecId b, SReal f) \ { data.vOp(this, v, a, b, f); } \ template<> void MechanicalObject< T >::vMultiOp(const core::ExecParams* params /* PARAMS FIRST */, const VMultiOp& ops) \ diff --git a/applications/plugins/SofaOpenCL/OpenCLSPHFluidForceField.inl b/applications/plugins/SofaOpenCL/OpenCLSPHFluidForceField.inl index cc81ccafcc8..88dcc58c00d 100644 --- a/applications/plugins/SofaOpenCL/OpenCLSPHFluidForceField.inl +++ b/applications/plugins/SofaOpenCL/OpenCLSPHFluidForceField.inl @@ -121,7 +121,7 @@ void SPHFluidForceField::addDForce(const core::Me const VecDeriv& dx = d_dx.getValue(); msg_info() << "addDForce(" << mparams->kFactor() << "," << sofa::core::mechanicalparams::bFactor(mparams) << ")"; - const VecDeriv& v = this->mstate->read(core::ConstVecDerivId::velocity())->getValue(); + const VecDeriv& v = this->mstate->read(core::vec_id::read_access::velocity)->getValue(); data.fillParams(this, mparams->kFactor(), sofa::core::mechanicalparams::bFactor(mparams)); df.resize(dx.size()); Grid::Grid* g = m_grid->getGrid(); @@ -182,7 +182,7 @@ void SPHFluidForceField::addDForce(const core::Me VecDeriv& df = *d_df.beginEdit(); const VecDeriv& dx = d_dx.getValue(); //const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue(); - const VecDeriv& v = this->mstate->read(core::ConstVecDerivId::velocity())->getValue(); + const VecDeriv& v = this->mstate->read(core::vec_id::read_access::velocity)->getValue(); data.fillParams(this, mparams->kFactor(), sofa::core::mechanicalparams::bFactor(mparams)); df.resize(dx.size()); Grid::Grid* g = m_grid->getGrid(); @@ -199,7 +199,7 @@ void SPHFluidForceField::draw(const sofa::core::v //if (!getContext()->getShowForceFields()) return; //if (m_grid != NULL) // m_grid->draw(vparams); - const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue(); const gpu::opencl::OpenCLVector pos4 = this->data.pos4; if (pos4.empty()) return; diff --git a/applications/plugins/SofaOpenCL/OpenCLSpringForceField.inl b/applications/plugins/SofaOpenCL/OpenCLSpringForceField.inl index 3c222e63962..2c0cad7677e 100644 --- a/applications/plugins/SofaOpenCL/OpenCLSpringForceField.inl +++ b/applications/plugins/SofaOpenCL/OpenCLSpringForceField.inl @@ -355,7 +355,7 @@ void SpringForceFieldInternalData< gpu::opencl::OpenCLVectorTypesmstate1->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord& x = m->mstate1->read(core::vec_id::read_access::position)->getValue(); df.resize(x.size()); int d = data.springs1.vertex0; if (data.springs1.nbSpringPerVertex > 0) @@ -372,8 +372,8 @@ void SpringForceFieldInternalData< gpu::opencl::OpenCLVectorTypesmstate1->read(core::ConstVecCoordId::position())->getValue(); - const VecCoord& x2 = m->mstate2->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord& x1 = m->mstate1->read(core::vec_id::read_access::position)->getValue(); + const VecCoord& x2 = m->mstate2->read(core::vec_id::read_access::position)->getValue(); df1.resize(x1.size()); df2.resize(x2.size()); if (data.springs1.nbSpringPerVertex > 0) diff --git a/applications/plugins/SofaOpenCL/OpenCLUniformMass.inl b/applications/plugins/SofaOpenCL/OpenCLUniformMass.inl index 67e782bbba8..f0100d2e21b 100644 --- a/applications/plugins/SofaOpenCL/OpenCLUniformMass.inl +++ b/applications/plugins/SofaOpenCL/OpenCLUniformMass.inl @@ -179,7 +179,7 @@ void UniformMassdisplayFlags().getShowBehaviorModels())return; // if (!getContext()->getShowBehaviorModels())return; - const VecCoord& x = mstate->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord& x = mstate->read(core::vec_id::read_access::position)->getValue(); type::Vec3d len; // The moment of inertia of a box is: @@ -344,7 +344,7 @@ void UniformMass { if(!vparams->displayFlags().getShowBehaviorModels())return; // if (!getContext()->getShowBehaviorModels())return; - const VecCoord& x = mstate->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord& x = mstate->read(core::vec_id::read_access::position)->getValue(); type::Vec3d len; // The moment of inertia of a box is: diff --git a/applications/plugins/SofaTest/ForceField_test.h b/applications/plugins/SofaTest/ForceField_test.h index 14d0012dee2..c22aa3c3a85 100644 --- a/applications/plugins/SofaTest/ForceField_test.h +++ b/applications/plugins/SofaTest/ForceField_test.h @@ -178,9 +178,9 @@ struct ForceField_test : public Sofa_testinit(this->node.get()); core::MechanicalParams mparams; mparams.setKFactor(1.0); - MechanicalResetForceVisitor resetForce(&mparams, core::VecDerivId::force()); + MechanicalResetForceVisitor resetForce(&mparams, core::vec_id::write_access::force); node->execute(resetForce); - MechanicalComputeForceVisitor computeForce( &mparams, core::VecDerivId::force() ); + MechanicalComputeForceVisitor computeForce( &mparams, core::vec_id::write_access::force ); this->node->execute(computeForce); // check force @@ -251,10 +251,10 @@ struct ForceField_test : public Sofa_testexecute(resetForce); - dof->vRealloc( &mparams, core::VecDerivId::dx()); // dx is not allocated by default + dof->vRealloc( &mparams, core::vec_id::write_access::dx); // dx is not allocated by default typename DOF::WriteVecDeriv wdx = dof->writeDx(); copyToData ( wdx, dX ); - MechanicalComputeDfVisitor computeDf( &mparams, core::VecDerivId::force() ); + MechanicalComputeDfVisitor computeDf( &mparams, core::vec_id::write_access::force ); node->execute(computeDf); VecDeriv dF; copyFromData( dF, dof->readForces() ); diff --git a/applications/plugins/SofaTest/Mapping_test.h b/applications/plugins/SofaTest/Mapping_test.h index 507283e179f..df109e30fde 100644 --- a/applications/plugins/SofaTest/Mapping_test.h +++ b/applications/plugins/SofaTest/Mapping_test.h @@ -241,8 +241,8 @@ struct Mapping_test: public Sofa_test /// Updated to parentNew copyToData(xin,parentNew); - mapping->apply(&mparams, core::VecCoordId::position(), core::VecCoordId::position()); - mapping->applyJ(&mparams, core::VecDerivId::velocity(), core::VecDerivId::velocity()); + mapping->apply(&mparams, core::vec_id::write_access::position, core::vec_id::read_access::position); + mapping->applyJ(&mparams, core::vec_id::write_access::velocity, core::vec_id::read_access::velocity); /// test apply: check if the child positions are the expected ones bool succeed=true; @@ -284,7 +284,7 @@ struct Mapping_test: public Sofa_test // cout<<"random child forces fc = "<writeForces(); copyToData( fout, fc ); - mapping->applyJT( &mparams, core::VecDerivId::force(), core::VecDerivId::force() ); + mapping->applyJT( &mparams, core::vec_id::write_access::force, core::vec_id::read_access::force ); copyFromData( fp, inDofs->readForces() ); // cout<<"parent forces fp = "< // propagate small velocity WriteInVecDeriv vin = inDofs->writeVelocities(); copyToData( vin, vp ); - mapping->applyJ( &mparams, core::VecDerivId::velocity(), core::VecDerivId::velocity() ); + mapping->applyJ( &mparams, core::vec_id::write_access::velocity, core::vec_id::read_access::velocity ); ReadOutVecDeriv vout = outDofs->readVelocities(); copyFromData( vc, vout); // cout<<"child velocity vc = " << vc << endl; // apply geometric stiffness - inDofs->vRealloc( &mparams, core::VecDerivId::dx() ); // dx is not allocated by default + inDofs->vRealloc( &mparams, core::vec_id::write_access::dx() ); // dx is not allocated by default WriteInVecDeriv dxin = inDofs->writeDx(); copyToData( dxin, vp ); dfp.fill( InDeriv() ); copyToData( fin, dfp ); - mapping->updateK( &mparams, core::ConstVecDerivId::force() ); // updating stiffness matrix for the current state and force - mapping->applyDJT( &mparams, core::VecDerivId::force(), core::VecDerivId::force() ); + mapping->updateK( &mparams, core::vec_id::write_access::force ); // updating stiffness matrix for the current state and force + mapping->applyDJT( &mparams, core::vec_id::write_access::force, core::vec_id::read_access::force ); copyFromData( dfp, inDofs->readForces() ); // fp + df due to geometric stiffness // cout<<"dfp = " << dfp << endl; @@ -366,7 +366,7 @@ struct Mapping_test: public Sofa_test fp.fill( InDeriv() ); copyToData( fin, fp ); // reset parent forces before accumulating child forces copyToData( fout, preTreatment(fc) ); - mapping->applyJT( &mparams, core::VecDerivId::force(), core::VecDerivId::force() ); + mapping->applyJT( &mparams, core::vec_id::write_access::force, core::vec_id::read_access::force ); copyFromData( fp, inDofs->readForces() ); @@ -378,7 +378,7 @@ struct Mapping_test: public Sofa_test WriteInVecCoord pin (inDofs->writePositions()); copyToData( pin, xp1 ); // cout<<"new parent positions xp1 = " << xp1 << endl; - mapping->apply ( &mparams, core::VecCoordId::position(), core::VecCoordId::position() ); + mapping->apply ( &mparams, core::vec_id::write_access::position, core::vec_id::read_access::position ); ReadOutVecCoord pout = outDofs->readPositions(); copyFromData( xc1, pout ); // cout<<"old child positions xc = " << xc << endl; diff --git a/applications/plugins/SofaTest/Multi2Mapping_test.h b/applications/plugins/SofaTest/Multi2Mapping_test.h index 8964cec245e..70cf3981cc6 100644 --- a/applications/plugins/SofaTest/Multi2Mapping_test.h +++ b/applications/plugins/SofaTest/Multi2Mapping_test.h @@ -201,8 +201,8 @@ struct Multi2Mapping_test : public Sofa_test /// Apply the mapping // --- Use of the method apply - this->mapping->apply(&mparams, core::VecCoordId::position(), core::VecCoordId::position()); - this->mapping->applyJ(&mparams, core::VecDerivId::velocity(), core::VecDerivId::velocity() ); + this->mapping->apply(&mparams, core::vec_id::write_access::position, core::vec_id::read_access::position); + this->mapping->applyJ(&mparams, core::vec_id::write_access::velocity, core::vec_id::read_access::velocity ); // ================ test apply : check if the child positions are the expected ones bool succeed = true; ReadOutVecCoord xout = this->outDofs->readPositions(); @@ -250,7 +250,7 @@ struct Multi2Mapping_test : public Sofa_test WriteOutVecDeriv fout = outDofs->writeForces(); copyToData(fout, fc); - this->mapping->applyJT( &mparams, core::VecDerivId::force(), core::VecDerivId::force() ); + this->mapping->applyJT( &mparams, core::vec_id::write_access::force, core::vec_id::read_access::force ); for (Index i = 0; i < Np1.size(); i++) copyFromData(fIn1p[i], this->in1Dofs[i]->readForces()); for (Index i = 0; i < Np2.size(); i++) copyFromData(fIn2p[i], this->in2Dofs[i]->readForces()); @@ -285,7 +285,7 @@ struct Multi2Mapping_test : public Sofa_test WriteIn2VecDeriv vIn2 = this->in2Dofs[p]->writeVelocities(); copyToData(vIn2, vIn2p[p]); } - this->mapping->applyJ(&mparams, core::VecDerivId::velocity(), core::VecDerivId::velocity() ); + this->mapping->applyJ(&mparams, core::vec_id::write_access::velocity, core::vec_id::read_access::velocity ); ReadOutVecDeriv vout = this->outDofs->readVelocities(); copyFromData(vc, vout); @@ -308,7 +308,7 @@ struct Multi2Mapping_test : public Sofa_test WriteIn2VecDeriv fin2 = this->in2Dofs[p]->writeForces(); copyToData( fin2, dfIn2p[p] ); } - mapping->applyDJT( &mparams, core::VecDerivId::force(), core::VecDerivId::force() ); + mapping->applyDJT( &mparams, core::vec_id::write_access::force, core::vec_id::read_access::force ); for( Index p=0; preadForces() ); // fp + df due to geometric stiffness for( Index p=0; preadForces() ); // fp + df due to geometric stiffness @@ -367,7 +367,7 @@ struct Multi2Mapping_test : public Sofa_test copyToData(fin, fIn2p[p]); // reset parent forces before accumulating child forces } copyToData(fout, fc); - this->mapping->applyJT( &mparams, core::VecDerivId::force(), core::VecDerivId::force() ); + this->mapping->applyJT( &mparams, core::vec_id::write_access::force, core::vec_id::read_access::force ); for (Index i = 0; i < Np1.size(); i++) copyFromData(fIn1p[i], this->in1Dofs[i]->readForces()); for (Index i = 0; i < Np2.size(); i++) copyFromData(fIn2p[i], this->in2Dofs[i]->readForces()); @@ -383,7 +383,7 @@ struct Multi2Mapping_test : public Sofa_test WriteIn2VecCoord pin2 = in2Dofs[p]->writePositions(); copyToData(pin2, xIn2p1[p]); } - this->mapping->apply(&mparams, core::VecCoordId::position(), core::VecCoordId::position()); + this->mapping->apply(&mparams, core::vec_id::write_access::position, core::vec_id::read_access::position); WriteOutVecCoord pout = this->outDofs->writePositions(); copyFromData(xc1, pout); diff --git a/applications/plugins/SofaTest/MultiMapping_test.h b/applications/plugins/SofaTest/MultiMapping_test.h index 845690b3f4e..7c026f9cbde 100644 --- a/applications/plugins/SofaTest/MultiMapping_test.h +++ b/applications/plugins/SofaTest/MultiMapping_test.h @@ -166,8 +166,8 @@ struct MultiMapping_test : public Sofa_test sofa::simulation::getSimulation()->init(root.get()); /// apply the mapping - mapping->apply(&mparams, core::VecCoordId::position(), core::VecCoordId::position()); - mapping->applyJ(&mparams, core::VecDerivId::velocity(), core::VecDerivId::velocity()); + mapping->apply(&mparams, core::vec_id::write_access::position, core::vec_id::read_access::position); + mapping->applyJ(&mparams, core::vec_id::write_access::velocity, core::vec_id::read_access::velocity); /// test apply: check if the child positions are the expected ones bool succeed=true; @@ -217,7 +217,7 @@ struct MultiMapping_test : public Sofa_test } WriteOutVecDeriv fout = outDofs->writeForces(); copyToData( fout, fc ); - mapping->applyJT( &mparams, core::VecDerivId::force(), core::VecDerivId::force() ); + mapping->applyJT( &mparams, core::vec_id::write_access::force, core::vec_id::read_access::force ); for(Index i=0; ireadForces() ); // cout<<"parent forces fp = "< WriteInVecDeriv vin = inDofs[p]->writeVelocities(); copyToData( vin, vp[p] ); } - mparams.setDx(core::ConstVecDerivId::velocity()); - mapping->applyJ( &mparams, core::VecDerivId::velocity(), core::VecDerivId::velocity() ); + mparams.setDx(core::vec_id::write_access::velocity); + mapping->applyJ( &mparams, core::vec_id::write_access::velocity, core::vec_id::read_access::velocity ); ReadOutVecDeriv vout = outDofs->readVelocities(); copyFromData( vc, vout); // cout<<"child velocity vc = " << vc << endl; @@ -255,8 +255,8 @@ struct MultiMapping_test : public Sofa_test WriteInVecDeriv fin = inDofs[p]->writeForces(); copyToData( fin, dfp[p] ); } - mapping->updateK( &mparams, core::ConstVecDerivId::force() ); // updating stiffness matrix for the current state and force - mapping->applyDJT( &mparams, core::VecDerivId::force(), core::VecDerivId::force() ); + mapping->updateK( &mparams, core::vec_id::write_access::force ); // updating stiffness matrix for the current state and force + mapping->applyDJT( &mparams, core::vec_id::write_access::force, core::vec_id::read_access::force ); for( Index p=0; preadForces() ); // fp + df due to geometric stiffness // cout<<"dfp["<< p <<"] = " << dfp[p] << endl; @@ -308,7 +308,7 @@ struct MultiMapping_test : public Sofa_test copyToData( fin, fp[p] ); // reset parent forces before accumulating child forces } copyToData( fout, fc ); - mapping->applyJT( &mparams, core::VecDerivId::force(), core::VecDerivId::force() ); + mapping->applyJT( &mparams, core::vec_id::write_access::force, core::vec_id::read_access::force ); for( Index p=0; preadForces() ); @@ -323,7 +323,7 @@ struct MultiMapping_test : public Sofa_test copyToData( pin, xp1[p] ); // cout<<"new parent positions xp1["<< p << "] = " << xp1[p] << endl; } - mapping->apply ( &mparams, core::VecCoordId::position(), core::VecCoordId::position() ); + mapping->apply ( &mparams, core::vec_id::write_access::position, core::vec_id::read_access::position ); ReadOutVecCoord pout = outDofs->readPositions(); copyFromData( xc1, pout ); // cout<<"new child positions xc1 = " << xc1 << endl; @@ -349,7 +349,7 @@ struct MultiMapping_test : public Sofa_test copyToData( fin, fp2[p] ); // reset parent forces before accumulating child forces } copyToData( fout, fc ); - mapping->applyJT( &mparams, core::VecDerivId::force(), core::VecDerivId::force() ); + mapping->applyJT( &mparams, core::vec_id::write_access::force, core::vec_id::read_access::force ); type::vector fp12(Np.size()); for( Index p=0; preadForces() ); diff --git a/applications/plugins/Xitact/ITPDriver.cpp b/applications/plugins/Xitact/ITPDriver.cpp index c7d85cd6634..696c96c45b7 100644 --- a/applications/plugins/Xitact/ITPDriver.cpp +++ b/applications/plugins/Xitact/ITPDriver.cpp @@ -280,7 +280,7 @@ void ITPDriver::handleEvent(core::objectmodel::Event *event) if(_mstate->getSize()>5) { - Data* dataTrocar = _mstate->write(sofa::core::VecCoordId::restPosition()); + Data* dataTrocar = _mstate->write(sofa::core::vec_id::write_access::restPosition); helper::WriteAccessor< Data< Vec1dTypes::VecCoord > > vecXTrocar = dataTrocar; vecXTrocar[0].x() = thetaX; diff --git a/applications/tutorials/oneParticleWithSofaTypedefs/oneParticleWithSofaTypedefs.cpp b/applications/tutorials/oneParticleWithSofaTypedefs/oneParticleWithSofaTypedefs.cpp index 00baab7ecf9..3e43914366f 100644 --- a/applications/tutorials/oneParticleWithSofaTypedefs/oneParticleWithSofaTypedefs.cpp +++ b/applications/tutorials/oneParticleWithSofaTypedefs/oneParticleWithSofaTypedefs.cpp @@ -99,10 +99,10 @@ int main(int argc, char** argv) particule_node->addObject(particle); particle->resize(1); // get write access the particle positions vector - WriteAccessor< Data > positions = *particle->write( VecId::position() ); + WriteAccessor< Data > positions = *particle->write( sofa::core::vec_id::write_access::position ); positions[0] = MechanicalObject_Vec3f::Coord(0,0,0); // get write access the particle velocities vector - WriteAccessor< Data > velocities = *particle->write( VecId::velocity() ); + WriteAccessor< Data > velocities = *particle->write( sofa::core::vec_id::write_access::velocity ); velocities[0] = MechanicalObject_Vec3f::Deriv(0,0,0); // Its properties, i.e, a simple mass node diff --git a/examples/Component/Engine/Select/PlaneROI.scn b/examples/Component/Engine/Select/PlaneROI.scn index efea84dec9c..1189e1154b7 100644 --- a/examples/Component/Engine/Select/PlaneROI.scn +++ b/examples/Component/Engine/Select/PlaneROI.scn @@ -41,7 +41,8 @@ - + + diff --git a/examples/Component/Engine/Select/ProximityROI.scn b/examples/Component/Engine/Select/ProximityROI.scn index 7ba48a66000..dc5b0a75de4 100644 --- a/examples/Component/Engine/Select/ProximityROI.scn +++ b/examples/Component/Engine/Select/ProximityROI.scn @@ -49,7 +49,8 @@ - + + diff --git a/examples/Component/Engine/Select/SphereROI.scn b/examples/Component/Engine/Select/SphereROI.scn index 0b9e6848cd1..c9d79d3e8f6 100644 --- a/examples/Component/Engine/Select/SphereROI.scn +++ b/examples/Component/Engine/Select/SphereROI.scn @@ -41,7 +41,8 @@ - + + diff --git a/examples/Component/Engine/Select/SubsetTopology_withtetrahedra.scn b/examples/Component/Engine/Select/SubsetTopology_withtetrahedra.scn index b5126ed248f..ee16eb01803 100644 --- a/examples/Component/Engine/Select/SubsetTopology_withtetrahedra.scn +++ b/examples/Component/Engine/Select/SubsetTopology_withtetrahedra.scn @@ -41,7 +41,8 @@ - + + diff --git a/examples/Component/SolidMechanics/FEM/TriangularForceFieldComparison.scn b/examples/Component/SolidMechanics/FEM/TriangularForceFieldComparison.scn index 6c1db8b3e1b..6d40913f9d8 100644 --- a/examples/Component/SolidMechanics/FEM/TriangularForceFieldComparison.scn +++ b/examples/Component/SolidMechanics/FEM/TriangularForceFieldComparison.scn @@ -123,7 +123,8 @@ - + + diff --git a/examples/Component/Topology/Container/Dynamic/TriangularForceFieldTopologyChangeHandling.scn b/examples/Component/Topology/Container/Dynamic/TriangularForceFieldTopologyChangeHandling.scn index 9967f3e8619..ef1f1b84816 100644 --- a/examples/Component/Topology/Container/Dynamic/TriangularForceFieldTopologyChangeHandling.scn +++ b/examples/Component/Topology/Container/Dynamic/TriangularForceFieldTopologyChangeHandling.scn @@ -131,7 +131,8 @@ - + + diff --git a/examples/Component/Topology/Mapping/Tetra2TriangleTopologicalMapping_with_TetrahedronModel.scn b/examples/Component/Topology/Mapping/Tetra2TriangleTopologicalMapping_with_TetrahedronModel.scn index 42e19ccc724..55c6a999054 100644 --- a/examples/Component/Topology/Mapping/Tetra2TriangleTopologicalMapping_with_TetrahedronModel.scn +++ b/examples/Component/Topology/Mapping/Tetra2TriangleTopologicalMapping_with_TetrahedronModel.scn @@ -45,7 +45,8 @@ - + +