diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.h b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.h index c377ece2a55..10347815e02 100644 --- a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.h +++ b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.h @@ -24,7 +24,7 @@ #include #include -#include +#include namespace sofa::core::behavior { @@ -45,7 +45,7 @@ class SOFA_COMPONENT_ANIMATIONLOOP_API FreeMotionAnimationLoop : public sofa::si SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP() - sofa::core::objectmodel::RenamedData m_solveVelocityConstraintFirst; + 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. diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.h b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.h index 84545c3eeb1..62c2a5e6ad8 100644 --- a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.h +++ b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.h @@ -25,7 +25,7 @@ #include #include -#include +#include namespace sofa::component::animationloop { @@ -43,10 +43,10 @@ class SOFA_COMPONENT_ANIMATIONLOOP_API MultiStepAnimationLoop : public sofa::sim void step (const sofa::core::ExecParams* params, SReal dt) override; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP() - sofa::core::objectmodel::RenamedData collisionSteps; + sofa::core::objectmodel::lifecycle::RenamedData collisionSteps; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP() - sofa::core::objectmodel::RenamedData integrationSteps; + 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/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 9c1460d219f..ba8fe667fed 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,7 @@ #include #include #include -#include +#include namespace sofa::component::collision::detection::algorithm { @@ -51,7 +51,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API BruteForceBroadPhase : pu 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::RenamedData > box; + 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.h b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.h index 3a787ff9059..aff6b8b8b6d 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,7 +42,7 @@ #include #include -#include +#include namespace sofa::component::collision::detection::algorithm @@ -215,7 +215,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API IncrSAP : 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::RenamedData< type::fixed_array > box; ///< if not empty, objects that do not intersect this bounding-box will be ignored + 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 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 8dbe24ea612..c7a336c1499 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,7 +25,7 @@ #include #include -#include +#include namespace sofa::component::collision::detection::intersection @@ -41,10 +41,10 @@ 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::RenamedData alarmDistance; + sofa::core::objectmodel::lifecycle::RenamedData alarmDistance; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::RenamedData contactDistance; + 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 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 eb3bc43afac..38f5709cbac 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,7 +31,7 @@ #include #include -#include +#include namespace sofa::component::collision::detection::intersection { @@ -64,16 +64,16 @@ 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::RenamedData filterIntersection; + sofa::core::objectmodel::lifecycle::RenamedData filterIntersection; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::RenamedData angleCone; + sofa::core::objectmodel::lifecycle::RenamedData angleCone; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::RenamedData coneFactor; + sofa::core::objectmodel::lifecycle::RenamedData coneFactor; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::RenamedData useLMDFilters; + sofa::core::objectmodel::lifecycle::RenamedData useLMDFilters; Data d_filterIntersection; ///< Activate LMD filter 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 2aa9bfc3295..144587cde24 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,7 +24,7 @@ #include -#include +#include namespace sofa::component::collision::detection::intersection { @@ -57,19 +57,19 @@ 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::RenamedData useSphereTriangle; + sofa::core::objectmodel::lifecycle::RenamedData useSphereTriangle; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::RenamedData usePointPoint; + sofa::core::objectmodel::lifecycle::RenamedData usePointPoint; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::RenamedData useSurfaceNormals; + sofa::core::objectmodel::lifecycle::RenamedData useSurfaceNormals; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::RenamedData useLinePoint; + sofa::core::objectmodel::lifecycle::RenamedData useLinePoint; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION() - sofa::core::objectmodel::RenamedData useLineLine; + sofa::core::objectmodel::lifecycle::RenamedData useLineLine; 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 84e1f701fbe..3464e87c33b 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,7 +26,7 @@ #include -#include +#include namespace sofa::component::collision::detection::intersection { @@ -58,7 +58,7 @@ 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::RenamedData useLineLine; + sofa::core::objectmodel::lifecycle::RenamedData useLineLine; Data d_useLineLine; ///< Line-line collision detection enabled 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 8b72e6d71ce..8b40670354a 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,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::collision::geometry @@ -145,7 +145,7 @@ public : int getLineFlags(sofa::Index i); SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::RenamedData bothSide; + 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) @@ -172,7 +172,7 @@ public : void computeBBox(const core::ExecParams* params, bool onlyVisible) override; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::RenamedData m_displayFreePosition; + sofa::core::objectmodel::lifecycle::RenamedData m_displayFreePosition; Data d_displayFreePosition; ///< Display Collision Model Points free position(in green) 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 84cbf118004..bd22bf85fb4 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,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::collision::geometry { @@ -104,7 +104,7 @@ class PointCollisionModel : public core::CollisionModel const Deriv& velocity(sofa::Index index) const; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::RenamedData bothSide; + 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) @@ -136,10 +136,10 @@ class PointCollisionModel : public core::CollisionModel core::behavior::MechanicalState* mstate; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::RenamedData computeNormals; + sofa::core::objectmodel::lifecycle::RenamedData computeNormals; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::RenamedData m_displayFreePosition; + sofa::core::objectmodel::lifecycle::RenamedData m_displayFreePosition; Data d_computeNormals; ///< activate computation of normal vectors (required for some collision detection algorithms) 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 a6a42b69339..75387b7df3c 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,7 +26,7 @@ #include #include -#include +#include namespace sofa::component::collision::response::contact { @@ -96,7 +96,7 @@ class SOFA_COMPONENT_COLLISION_GEOMETRY_API RayCollisionModel : public core::Col sofa::type::vector direction; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::RenamedData defaultLength; + sofa::core::objectmodel::lifecycle::RenamedData defaultLength; 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 ef5b8031204..a5f54206f4b 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,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::collision::geometry { @@ -165,10 +165,10 @@ class SphereCollisionModel : public core::CollisionModel } SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::RenamedData< VecReal > radius; + sofa::core::objectmodel::lifecycle::RenamedData< VecReal > radius; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY() - sofa::core::objectmodel::RenamedData defaultRadius; + sofa::core::objectmodel::lifecycle::RenamedData defaultRadius; Data< VecReal > d_radius; ///< Radius of each sphere Data< SReal > d_defaultRadius; ///< Default radius diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/AugmentedLagrangianResponse.h b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/AugmentedLagrangianResponse.h index 99ebec9c3d9..0d5d96101d9 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/AugmentedLagrangianResponse.h +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/AugmentedLagrangianResponse.h @@ -30,7 +30,7 @@ #include #include -#include +#include namespace sofa::component::collision::response::contact { 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 3b101a9c160..cb1347fc327 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,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::collision::response::contact { @@ -74,7 +74,7 @@ class BarycentricStickContact : public core::collision::Contact public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::RenamedData f_keepAlive; + 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 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 272201d37b5..cc1fcefa01f 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,7 +30,7 @@ #include #include -#include +#include namespace sofa::component::collision::response::contact { @@ -66,10 +66,10 @@ class BaseUnilateralContactResponse : public core::collision::Contact, public Co core::objectmodel::BaseContext* parent; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::RenamedData mu; + sofa::core::objectmodel::lifecycle::RenamedData mu; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::RenamedData tol; + 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; 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 15780754ae8..3d86715d815 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,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::collision::response::contact { @@ -38,10 +38,10 @@ public : SOFA_CLASS(CollisionResponse,sofa::core::collision::ContactManager); SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::RenamedData response; + sofa::core::objectmodel::lifecycle::RenamedData response; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::RenamedData responseParams; + sofa::core::objectmodel::lifecycle::RenamedData responseParams; Data d_response; ///< contact response class diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/FrictionContact.h b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/FrictionContact.h index 999831d9721..9c9869e53d5 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/FrictionContact.h +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/FrictionContact.h @@ -30,7 +30,7 @@ #include #include -#include +#include namespace sofa::component::collision::response::contact { 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 76afa084d0d..c88b084da9b 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,7 @@ #include #include -#include +#include namespace sofa::component::collision::response::contact { @@ -104,7 +104,7 @@ class SOFA_COMPONENT_COLLISION_RESPONSE_CONTACT_API RuleBasedContactManager : pu }; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::RenamedData< type::vector > rules; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector > 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 d23b57efc94..cea3442ec71 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,7 +31,7 @@ #include #include -#include +#include namespace sofa::component::collision::response::contact { @@ -73,7 +73,7 @@ class StickContactConstraint : public core::collision::Contact, public ContactId ~StickContactConstraint() override; public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_RESPONSE_CONTACT() - sofa::core::objectmodel::RenamedData f_keepAlive; + 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 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 2a296bc9b8c..f075378651d 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,7 +30,7 @@ #include #include -#include +#include namespace sofa::component::constraint::lagrangian::correction { @@ -61,22 +61,22 @@ class PrecomputedConstraintCorrection : public sofa::core::behavior::ConstraintC typedef sofa::type::MatNoInit<3, 3, Real> Transformation; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::RenamedData m_rotations; + sofa::core::objectmodel::lifecycle::RenamedData m_rotations; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::RenamedData m_restRotations; + sofa::core::objectmodel::lifecycle::RenamedData m_restRotations; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::RenamedData recompute; + sofa::core::objectmodel::lifecycle::RenamedData recompute; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::RenamedData debugViewFrameScale; + sofa::core::objectmodel::lifecycle::RenamedData debugViewFrameScale; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::RenamedData f_fileCompliance; + sofa::core::objectmodel::lifecycle::RenamedData f_fileCompliance; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::RenamedData fileDir; + 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/UncoupledConstraintCorrection.h b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/UncoupledConstraintCorrection.h index 0954dbefcec..4ee8641eb7d 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,7 +26,7 @@ #include #include -#include +#include namespace sofa::component::constraint::lagrangian::correction { @@ -113,13 +113,13 @@ class UncoupledConstraintCorrection : public sofa::core::behavior::ConstraintCor SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::RenamedData< VecReal > compliance; + sofa::core::objectmodel::lifecycle::RenamedData< VecReal > compliance; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::RenamedData defaultCompliance; + sofa::core::objectmodel::lifecycle::RenamedData defaultCompliance; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_CORRECTION() - sofa::core::objectmodel::RenamedData f_verbose; + 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 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 97b6f4a396b..9b693e076e3 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 @@ -35,7 +35,7 @@ #include -#include +#include namespace sofa::component::constraint::lagrangian::model { @@ -98,16 +98,16 @@ class BilateralLagrangianConstraint : public PairInteractionConstraint cid; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::RenamedData > m1; + sofa::core::objectmodel::lifecycle::RenamedData > m1; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::RenamedData > m2; + sofa::core::objectmodel::lifecycle::RenamedData > m2; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::RenamedData restVector; + sofa::core::objectmodel::lifecycle::RenamedData restVector; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::RenamedData keepOrientDiff; + 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 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 aeebd35cf94..2b7b3413745 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,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::constraint::lagrangian::model { @@ -89,13 +89,13 @@ class StopperLagrangianConstraint : public core::behavior::Constraint protected: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::RenamedData index; + sofa::core::objectmodel::lifecycle::RenamedData index; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::RenamedData min; + sofa::core::objectmodel::lifecycle::RenamedData min; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_MODEL() - sofa::core::objectmodel::RenamedData max; + sofa::core::objectmodel::lifecycle::RenamedData max; Data d_index; ///< index of the stop constraint 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 cd3c770fd97..f7d35b82e92 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 @@ -32,7 +32,7 @@ #include #include -#include +#include #include @@ -71,49 +71,49 @@ 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::RenamedData maxIt; + sofa::core::objectmodel::lifecycle::RenamedData maxIt; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData tolerance; + sofa::core::objectmodel::lifecycle::RenamedData tolerance; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData sor; + sofa::core::objectmodel::lifecycle::RenamedData sor; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData scaleTolerance; + sofa::core::objectmodel::lifecycle::RenamedData scaleTolerance; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData allVerified; + sofa::core::objectmodel::lifecycle::RenamedData allVerified; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData computeGraphs; + sofa::core::objectmodel::lifecycle::RenamedData computeGraphs; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData > > graphErrors; + sofa::core::objectmodel::lifecycle::RenamedData > > graphErrors; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData > > graphConstraints; + sofa::core::objectmodel::lifecycle::RenamedData > > graphConstraints; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData > > graphForces; + sofa::core::objectmodel::lifecycle::RenamedData > > graphForces; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData > > graphViolations; + sofa::core::objectmodel::lifecycle::RenamedData > > graphViolations; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData currentNumConstraints; + sofa::core::objectmodel::lifecycle::RenamedData currentNumConstraints; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData currentNumConstraintGroups; + sofa::core::objectmodel::lifecycle::RenamedData currentNumConstraintGroups; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData currentIterations; + sofa::core::objectmodel::lifecycle::RenamedData currentIterations; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData currentError; + sofa::core::objectmodel::lifecycle::RenamedData currentError; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData reverseAccumulateOrder; + 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 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 d4ba0ee2681..80603d91185 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,7 +35,7 @@ #include #include -#include +#include namespace sofa::component::constraint::lagrangian::solver { @@ -75,61 +75,61 @@ 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::RenamedData displayDebug; + sofa::core::objectmodel::lifecycle::RenamedData displayDebug; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData initial_guess; + sofa::core::objectmodel::lifecycle::RenamedData initial_guess; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData build_lcp; + sofa::core::objectmodel::lifecycle::RenamedData build_lcp; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData tol; + sofa::core::objectmodel::lifecycle::RenamedData tol; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData< int> maxIt; + sofa::core::objectmodel::lifecycle::RenamedData< int> maxIt; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData mu; + sofa::core::objectmodel::lifecycle::RenamedData mu; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData minW; + sofa::core::objectmodel::lifecycle::RenamedData minW; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData maxF; + sofa::core::objectmodel::lifecycle::RenamedData maxF; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData multi_grid; + sofa::core::objectmodel::lifecycle::RenamedData multi_grid; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData< int> multi_grid_levels; + sofa::core::objectmodel::lifecycle::RenamedData< int> multi_grid_levels; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData< int> merge_method; + sofa::core::objectmodel::lifecycle::RenamedData< int> merge_method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData< int> merge_spatial_step; + sofa::core::objectmodel::lifecycle::RenamedData< int> merge_spatial_step; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData< int> merge_local_levels; + sofa::core::objectmodel::lifecycle::RenamedData< int> merge_local_levels; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData < std::set > constraintGroups; + sofa::core::objectmodel::lifecycle::RenamedData < std::set > constraintGroups; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData > > f_graph; + sofa::core::objectmodel::lifecycle::RenamedData > > f_graph; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData< int> showLevels; + sofa::core::objectmodel::lifecycle::RenamedData< int> showLevels; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData showCellWidth; + sofa::core::objectmodel::lifecycle::RenamedData showCellWidth; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData showTranslation; + sofa::core::objectmodel::lifecycle::RenamedData showTranslation; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() - sofa::core::objectmodel::RenamedData showLevelTranslation; + sofa::core::objectmodel::lifecycle::RenamedData showLevelTranslation; Data d_displayDebug; ///< Display debug information. 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 a35f21fd8f9..6b8ee71a66e 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,7 +34,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -82,28 +82,28 @@ class AffineMovementProjectiveConstraint : public core::behavior::ProjectiveCons public : SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData > m_meshIndices; + sofa::core::objectmodel::lifecycle::RenamedData > m_meshIndices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData > m_indices; + sofa::core::objectmodel::lifecycle::RenamedData > m_indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_beginConstraintTime; + sofa::core::objectmodel::lifecycle::RenamedData m_beginConstraintTime; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_endConstraintTime; + sofa::core::objectmodel::lifecycle::RenamedData m_endConstraintTime; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_rotation; + sofa::core::objectmodel::lifecycle::RenamedData m_rotation; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_quaternion; + sofa::core::objectmodel::lifecycle::RenamedData m_quaternion; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_translation; + sofa::core::objectmodel::lifecycle::RenamedData m_translation; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_drawConstrainedPoints; + sofa::core::objectmodel::lifecycle::RenamedData m_drawConstrainedPoints; /// indices of the DOFs of the mesh 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 872ae61a5af..a4d357e85ae 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,7 +36,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -85,13 +85,13 @@ class DirectionProjectiveConstraint : public core::behavior::ProjectiveConstrain public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData > f_indices; + sofa::core::objectmodel::lifecycle::RenamedData > f_indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData f_drawSize; + sofa::core::objectmodel::lifecycle::RenamedData f_drawSize; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedDataf_direction; + 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) 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 827c65ac1fd..16f09ef7e35 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,7 +25,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -68,13 +68,13 @@ class FixedRotationProjectiveConstraint : public core::behavior::ProjectiveConst protected : SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< bool > FixedXRotation; + sofa::core::objectmodel::lifecycle::RenamedData< bool > FixedXRotation; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< bool > FixedYRotation; + sofa::core::objectmodel::lifecycle::RenamedData< bool > FixedYRotation; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< bool > FixedZRotation; + 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 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 2176f0d9d9c..ff9eae16e54 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,7 +26,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -65,16 +65,16 @@ class FixedTranslationProjectiveConstraint : public core::behavior::ProjectiveCo public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< sofa::type::vector > f_indices; + sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector > f_indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData f_fixAll; + sofa::core::objectmodel::lifecycle::RenamedData f_fixAll; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData _drawSize; + sofa::core::objectmodel::lifecycle::RenamedData _drawSize; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< sofa::type::vector > f_coordinates; + 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 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 6a3f327bc29..3e5e08fcefd 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,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -65,31 +65,31 @@ class HermiteSplineProjectiveConstraint : public core::behavior::ProjectiveConst public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< sofa::type::vector > m_indices; + sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector > m_indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_tBegin; + sofa::core::objectmodel::lifecycle::RenamedData m_tBegin; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_tEnd; + sofa::core::objectmodel::lifecycle::RenamedData m_tEnd; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_x0; + sofa::core::objectmodel::lifecycle::RenamedData m_x0; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_dx0; + sofa::core::objectmodel::lifecycle::RenamedData m_dx0; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_x1; + sofa::core::objectmodel::lifecycle::RenamedData m_x1; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_dx1; + sofa::core::objectmodel::lifecycle::RenamedData m_dx1; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_sx0; + sofa::core::objectmodel::lifecycle::RenamedData m_sx0; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_sx1; + 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/LineProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LineProjectiveConstraint.h index 0475832b1bb..3cdcedd43f0 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,7 +35,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -86,16 +86,16 @@ class LineProjectiveConstraint : public core::behavior::ProjectiveConstraintSet< public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< sofa::type::vector< sofa::Index > > f_indices; + sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector< sofa::Index > > f_indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData f_drawSize; + sofa::core::objectmodel::lifecycle::RenamedData f_drawSize; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData f_origin; + sofa::core::objectmodel::lifecycle::RenamedData f_origin; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData f_direction; + 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) 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 c6434edab57..7a86baae012 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,7 +35,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -78,16 +78,16 @@ class LinearMovementProjectiveConstraint : public core::behavior::ProjectiveCons public : SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< sofa::type::vector< sofa::Index> > m_indices; + sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector< sofa::Index> > m_indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData > m_keyTimes; + sofa::core::objectmodel::lifecycle::RenamedData > m_keyTimes; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_keyMovements; + sofa::core::objectmodel::lifecycle::RenamedData m_keyMovements; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData showMovement; + sofa::core::objectmodel::lifecycle::RenamedData showMovement; /// indices of the DOFs the constraint is applied to SetIndex d_indices; 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 5114ce41668..124e97dbcec 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,7 +26,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -83,7 +83,7 @@ class OscillatorProjectiveConstraint : public core::behavior::ProjectiveConstrai }; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< type::vector< Oscillator > > constraints; + 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] 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 8c079c99960..6ed3727da2e 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,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -60,22 +60,22 @@ class ParabolicProjectiveConstraint : public core::behavior::ProjectiveConstrain protected: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< sofa::type::vector > m_indices; + sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector > m_indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_P1; + sofa::core::objectmodel::lifecycle::RenamedData m_P1; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_P2; + sofa::core::objectmodel::lifecycle::RenamedData m_P2; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_P3; + sofa::core::objectmodel::lifecycle::RenamedData m_P3; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_tBegin; + sofa::core::objectmodel::lifecycle::RenamedData m_tBegin; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_tEnd; + 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/PartialLinearMovementProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.h index a2eb576ae4e..cb765b14317 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,7 +35,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -77,40 +77,40 @@ class PartialLinearMovementProjectiveConstraint : public core::behavior::Project public : SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData > m_indices; + sofa::core::objectmodel::lifecycle::RenamedData > m_indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData >m_keyTimes; + sofa::core::objectmodel::lifecycle::RenamedData >m_keyTimes; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData m_keyMovements; + sofa::core::objectmodel::lifecycle::RenamedData m_keyMovements; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< bool > showMovement; + sofa::core::objectmodel::lifecycle::RenamedData< bool > showMovement; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData linearMovementBetweenNodesInIndices; + sofa::core::objectmodel::lifecycle::RenamedData linearMovementBetweenNodesInIndices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData mainIndice; + sofa::core::objectmodel::lifecycle::RenamedData mainIndice; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData minDepIndice; + sofa::core::objectmodel::lifecycle::RenamedData minDepIndice; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData maxDepIndice; + sofa::core::objectmodel::lifecycle::RenamedData maxDepIndice; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData > m_imposedDisplacmentOnMacroNodes; + sofa::core::objectmodel::lifecycle::RenamedData > m_imposedDisplacmentOnMacroNodes; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData X0; + sofa::core::objectmodel::lifecycle::RenamedData X0; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData Y0; + sofa::core::objectmodel::lifecycle::RenamedData Y0; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData Z0; + sofa::core::objectmodel::lifecycle::RenamedData Z0; /// indices of the DOFs the constraint is applied to @@ -146,7 +146,7 @@ public : typedef sofa::type::fixed_array VecBool; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData movedDirections; + 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 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 e7311abd86a..740ef0e65c5 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,7 +35,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -85,16 +85,16 @@ class PlaneProjectiveConstraint : public core::behavior::ProjectiveConstraintSet public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< sofa::type::vector< sofa::Index > > f_indices; + sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector< sofa::Index > > f_indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData f_origin; + sofa::core::objectmodel::lifecycle::RenamedData f_origin; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData f_normal; + sofa::core::objectmodel::lifecycle::RenamedData f_normal; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData f_drawSize; + sofa::core::objectmodel::lifecycle::RenamedData f_drawSize; IndexSubsetData d_indices; ///< the particles to project Data d_origin; ///< A point in the plane 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 a843bc0f1fa..3289f2a4762 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,7 +33,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -79,16 +79,16 @@ class PointProjectiveConstraint : public core::behavior::ProjectiveConstraintSet public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData> f_indices; + sofa::core::objectmodel::lifecycle::RenamedData> f_indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData f_point; + sofa::core::objectmodel::lifecycle::RenamedData f_point; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData f_fixAll; + sofa::core::objectmodel::lifecycle::RenamedData f_fixAll; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData f_drawSize; + sofa::core::objectmodel::lifecycle::RenamedData f_drawSize; SetIndex d_indices; ///< the indices of the points to project to the target 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 7f350a7c256..302f762a888 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,7 +33,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -75,16 +75,16 @@ class PositionBasedDynamicsProjectiveConstraint : public core::behavior::Project public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData stiffness; + sofa::core::objectmodel::lifecycle::RenamedData stiffness; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< VecCoord > position; + sofa::core::objectmodel::lifecycle::RenamedData< VecCoord > position; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< VecDeriv > velocity; + sofa::core::objectmodel::lifecycle::RenamedData< VecDeriv > velocity; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData< VecCoord > old_position; + 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. 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 61ed359d467..f214bcbf850 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,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::constraint::projective { @@ -106,16 +106,16 @@ class SkeletalMotionProjectiveConstraint : public core::behavior::ProjectiveCons protected: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData > > skeletonJoints; + sofa::core::objectmodel::lifecycle::RenamedData > > skeletonJoints; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData > skeletonBones; + sofa::core::objectmodel::lifecycle::RenamedData > skeletonBones; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData animationSpeed; + sofa::core::objectmodel::lifecycle::RenamedData animationSpeed; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_PROJECTIVE() - sofa::core::objectmodel::RenamedData active; + sofa::core::objectmodel::lifecycle::RenamedData active; // every nodes needed in the animation chain diff --git a/Sofa/Component/Controller/src/sofa/component/controller/Controller.h b/Sofa/Component/Controller/src/sofa/component/controller/Controller.h index cd4b786665b..65e42a030e6 100644 --- a/Sofa/Component/Controller/src/sofa/component/controller/Controller.h +++ b/Sofa/Component/Controller/src/sofa/component/controller/Controller.h @@ -24,7 +24,7 @@ #include -#include +#include namespace sofa::core::objectmodel { @@ -111,7 +111,7 @@ class SOFA_COMPONENT_CONTROLLER_API Controller : public core::behavior::BaseCont protected: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONTROLLER() - sofa::core::objectmodel::RenamedData < bool > handleEventTriggersUpdate; + sofa::core::objectmodel::lifecycle::RenamedData < bool > handleEventTriggersUpdate; Data< bool > d_handleEventTriggersUpdate; ///< Event handling frequency controls the controller update frequency diff --git a/Sofa/Component/Controller/src/sofa/component/controller/MechanicalStateController.h b/Sofa/Component/Controller/src/sofa/component/controller/MechanicalStateController.h index 9913eaeb098..aae4eff9d21 100644 --- a/Sofa/Component/Controller/src/sofa/component/controller/MechanicalStateController.h +++ b/Sofa/Component/Controller/src/sofa/component/controller/MechanicalStateController.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::controller { @@ -131,16 +131,16 @@ class MechanicalStateController : public Controller void applyController(void); protected: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONTROLLER() - sofa::core::objectmodel::RenamedData< unsigned int > index; + sofa::core::objectmodel::lifecycle::RenamedData< unsigned int > index; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONTROLLER() - sofa::core::objectmodel::RenamedData< bool > onlyTranslation; + sofa::core::objectmodel::lifecycle::RenamedData< bool > onlyTranslation; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONTROLLER() - sofa::core::objectmodel::RenamedData< bool > buttonDeviceState; + sofa::core::objectmodel::lifecycle::RenamedData< bool > buttonDeviceState; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONTROLLER() - sofa::core::objectmodel::RenamedData< sofa::type::Vec<3,Real> > mainDirection; + 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 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 d0159ca3e35..2b542f34e16 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,7 +40,7 @@ #define TYPE_VORONOI 3 #define TYPE_HARMONIC_STIFFNESS 4 -#include +#include namespace sofa::component::engine::analyze { @@ -79,40 +79,40 @@ class Distances : public core::DataEngine public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData showMapIndex; + sofa::core::objectmodel::lifecycle::RenamedData showMapIndex; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData showDistanceMap; + sofa::core::objectmodel::lifecycle::RenamedData showDistanceMap; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData showGoalDistanceMap; + sofa::core::objectmodel::lifecycle::RenamedData showGoalDistanceMap; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData showTextScaleFactor; + sofa::core::objectmodel::lifecycle::RenamedData showTextScaleFactor; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData showGradientMap; + sofa::core::objectmodel::lifecycle::RenamedData showGradientMap; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData showGradientsScaleFactor; + sofa::core::objectmodel::lifecycle::RenamedData showGradientsScaleFactor; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData offset; + sofa::core::objectmodel::lifecycle::RenamedData offset; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData distanceType; + sofa::core::objectmodel::lifecycle::RenamedData distanceType; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData initTarget; + sofa::core::objectmodel::lifecycle::RenamedData initTarget; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData initTargetStep; + sofa::core::objectmodel::lifecycle::RenamedData initTargetStep; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData > zonesFramePair; + sofa::core::objectmodel::lifecycle::RenamedData > zonesFramePair; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData harmonicMaxValue; + sofa::core::objectmodel::lifecycle::RenamedData harmonicMaxValue; Data d_showMapIndex; ///< Frame DOF index on which display values. @@ -227,13 +227,13 @@ class Distances : public core::DataEngine private: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData fileDistance; + sofa::core::objectmodel::lifecycle::RenamedData fileDistance; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData targetPath; + sofa::core::objectmodel::lifecycle::RenamedData targetPath; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData hexaContainerPath; + sofa::core::objectmodel::lifecycle::RenamedData hexaContainerPath; Data d_fileDistance; ///< file containing the result of the computation of the distances 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 9631705ffcb..6f7187b4829 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,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::engine::analyze { @@ -62,22 +62,22 @@ class HausdorffDistance : public core::DataEngine void doUpdate() override; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData f_points_1; + sofa::core::objectmodel::lifecycle::RenamedData f_points_1; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData f_points_2; + sofa::core::objectmodel::lifecycle::RenamedData f_points_2; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData d12; + sofa::core::objectmodel::lifecycle::RenamedData d12; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData d21; + sofa::core::objectmodel::lifecycle::RenamedData d21; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData max; + sofa::core::objectmodel::lifecycle::RenamedData max; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData f_update; + sofa::core::objectmodel::lifecycle::RenamedData f_update; //Input Data d_points_1; ///< Points belonging to the first point cloud 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 6261365b93c..f11328a5b4f 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,7 +34,7 @@ #include #include -#include +#include namespace sofa::component::engine::analyze { @@ -72,28 +72,28 @@ 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::RenamedData iterations; + sofa::core::objectmodel::lifecycle::RenamedData iterations; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData affineRatio; + sofa::core::objectmodel::lifecycle::RenamedData affineRatio; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData fixedweight; + sofa::core::objectmodel::lifecycle::RenamedData fixedweight; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData fixedPosition0; + sofa::core::objectmodel::lifecycle::RenamedData fixedPosition0; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData fixedPosition; + sofa::core::objectmodel::lifecycle::RenamedData fixedPosition; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData position; + sofa::core::objectmodel::lifecycle::RenamedData position; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData< VVI > cluster; + sofa::core::objectmodel::lifecycle::RenamedData< VVI > cluster; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_ANALYZE() - sofa::core::objectmodel::RenamedData targetPosition; + sofa::core::objectmodel::lifecycle::RenamedData targetPosition; Data d_iterations; ///< Number of iterations. diff --git a/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/MeshTetraStuffing.h b/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/MeshTetraStuffing.h index f67ba6166d3..0b1b8805424 100644 --- a/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/MeshTetraStuffing.h +++ b/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/MeshTetraStuffing.h @@ -32,7 +32,7 @@ #include -#include +#include namespace sofa::component::engine::generate { @@ -72,40 +72,40 @@ class SOFA_COMPONENT_ENGINE_GENERATE_API MeshTetraStuffing : public core::DataEn SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE() - sofa::core::objectmodel::RenamedData< type::fixed_array > vbbox; + sofa::core::objectmodel::lifecycle::RenamedData< type::fixed_array > vbbox; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE() - sofa::core::objectmodel::RenamedData inputPoints; + sofa::core::objectmodel::lifecycle::RenamedData inputPoints; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE() - sofa::core::objectmodel::RenamedData inputTriangles; + sofa::core::objectmodel::lifecycle::RenamedData inputTriangles; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE() - sofa::core::objectmodel::RenamedData inputQuads; + sofa::core::objectmodel::lifecycle::RenamedData inputQuads; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE() - sofa::core::objectmodel::RenamedData outputPoints; + sofa::core::objectmodel::lifecycle::RenamedData outputPoints; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE() - sofa::core::objectmodel::RenamedData outputTetrahedra; + sofa::core::objectmodel::lifecycle::RenamedData outputTetrahedra; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE() - sofa::core::objectmodel::RenamedData< Real > alphaLong; + sofa::core::objectmodel::lifecycle::RenamedData< Real > alphaLong; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE() - sofa::core::objectmodel::RenamedData alphaShort; + sofa::core::objectmodel::lifecycle::RenamedData alphaShort; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE() - sofa::core::objectmodel::RenamedData bSnapPoints; + sofa::core::objectmodel::lifecycle::RenamedData bSnapPoints; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE() - sofa::core::objectmodel::RenamedData< bool > bSplitTetrahedra; + sofa::core::objectmodel::lifecycle::RenamedData< bool > bSplitTetrahedra; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE() - sofa::core::objectmodel::RenamedData< bool > bDraw; + sofa::core::objectmodel::lifecycle::RenamedData< bool > bDraw; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE() - sofa::core::objectmodel::RenamedData< Real > size; + sofa::core::objectmodel::lifecycle::RenamedData< Real > size; 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 c9c84070c0f..ba9ad625162 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,7 +29,7 @@ #include #include -#include +#include namespace sofa::component::engine::select { @@ -128,7 +128,7 @@ class BaseROI : public core::DataEngine 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::RenamedData d_X0; + sofa::core::objectmodel::lifecycle::RenamedData d_X0; protected: BaseROI(); ~BaseROI() override = default; 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 491a0cabd9a..2544903fc1a 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 @@ -34,7 +34,7 @@ #include -#include +#include namespace sofa::component::engine::select { @@ -109,11 +109,11 @@ class MeshROI : public BaseROI static bool isPointInIndices(const unsigned int i, const SetIndex& indices); SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::RenamedData d_X0_i; + sofa::core::objectmodel::lifecycle::RenamedData d_X0_i; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::RenamedData > d_edges_i;; + sofa::core::objectmodel::lifecycle::RenamedData > d_edges_i;; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::RenamedData > d_triangles_i; + 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/MeshSubsetEngine.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshSubsetEngine.h index 1ebefc40368..94786a04422 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,7 @@ #include #include -#include +#include #include #include #include @@ -72,23 +72,23 @@ class MeshSubsetEngine : public core::DataEngine Data< SeqHexahedra > d_hexahedra; ///< Hexahedra of mesh subset SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::RenamedData inputPosition; + core::objectmodel::lifecycle::RenamedData inputPosition; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::RenamedData inputEdges; + core::objectmodel::lifecycle::RenamedData inputEdges; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::RenamedData inputTriangles; + core::objectmodel::lifecycle::RenamedData inputTriangles; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::RenamedData inputQuads; + core::objectmodel::lifecycle::RenamedData inputQuads; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::RenamedData indices; + core::objectmodel::lifecycle::RenamedData indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::RenamedData position; + core::objectmodel::lifecycle::RenamedData position; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::RenamedData edges; + core::objectmodel::lifecycle::RenamedData edges; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::RenamedData triangles; + core::objectmodel::lifecycle::RenamedData triangles; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - core::objectmodel::RenamedData quads; + core::objectmodel::lifecycle::RenamedData quads; protected: MeshSubsetEngine(); 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 488aaebcc54..68804f9e49c 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,7 +29,7 @@ #include #include -#include +#include namespace sofa::component::engine::select { @@ -81,17 +81,17 @@ class SphereROI : public BaseROI 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::RenamedData< type::vector > centers; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector > centers; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::RenamedData< type::vector > radii; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector > radii; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::RenamedData< type::Vec3 > direction; + sofa::core::objectmodel::lifecycle::RenamedData< type::Vec3 > direction; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::RenamedData< type::Vec3 > normal; + sofa::core::objectmodel::lifecycle::RenamedData< type::Vec3 > normal; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::RenamedData< Real > edgeAngle; + sofa::core::objectmodel::lifecycle::RenamedData< Real > edgeAngle; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_SELECT() - sofa::core::objectmodel::RenamedData< Real > triAngle; + sofa::core::objectmodel::lifecycle::RenamedData< Real > triAngle; }; #if !defined(SOFA_COMPONENT_ENGINE_SPHEREROI_CPP) diff --git a/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h b/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h index 3b8494339b8..f6559fef3f7 100644 --- a/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h +++ b/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h @@ -29,7 +29,7 @@ #include -#include +#include namespace sofa::component::haptics { @@ -63,10 +63,10 @@ class LCPForceFeedback : public MechanicalStateForceFeedback } SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_HAPTICS() - sofa::core::objectmodel::RenamedData forceCoef; + sofa::core::objectmodel::lifecycle::RenamedData forceCoef; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_HAPTICS() - sofa::core::objectmodel::RenamedData solverTimeout; + sofa::core::objectmodel::lifecycle::RenamedData solverTimeout; Data< double > d_forceCoef; ///< multiply haptic force by this coef. diff --git a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BlenderExporter.h b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BlenderExporter.h index d6d9e614a59..d69c27e7806 100644 --- a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BlenderExporter.h +++ b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BlenderExporter.h @@ -38,7 +38,7 @@ #include -#include +#include namespace sofa::component { @@ -73,19 +73,19 @@ class SOFA_COMPONENT_IO_MESH_API BlenderExporter: public core::objectmodel::Base SOFA_CLASS(SOFA_TEMPLATE(BlenderExporter,T),core::objectmodel::BaseObject); SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData path; + sofa::core::objectmodel::lifecycle::RenamedData path; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData baseName; + sofa::core::objectmodel::lifecycle::RenamedData baseName; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData simulationType; + sofa::core::objectmodel::lifecycle::RenamedData simulationType; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData simulationStep; + sofa::core::objectmodel::lifecycle::RenamedData simulationStep; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData nbPtsByHair; + sofa::core::objectmodel::lifecycle::RenamedData nbPtsByHair; Data < std::string > d_path; ///< output path diff --git a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/GridMeshCreator.h b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/GridMeshCreator.h index 91a6a0370b4..f0018ed751a 100644 --- a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/GridMeshCreator.h +++ b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/GridMeshCreator.h @@ -24,7 +24,7 @@ #include -#include +#include namespace sofa::component::io::mesh { @@ -44,10 +44,10 @@ class SOFA_COMPONENT_IO_MESH_API GridMeshCreator : public sofa::core::loader::Me bool canLoad() override { return true; } bool doLoad() override; ///< create the grid SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< type::Vec2i > resolution; + sofa::core::objectmodel::lifecycle::RenamedData< type::Vec2i > resolution; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< int > trianglePattern; + sofa::core::objectmodel::lifecycle::RenamedData< int > trianglePattern; diff --git a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshSTLLoader.h b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshSTLLoader.h index 066b26113f1..f896ba79700 100644 --- a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshSTLLoader.h +++ b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshSTLLoader.h @@ -23,7 +23,7 @@ #include #include -#include +#include namespace sofa::component::io::mesh { @@ -51,10 +51,10 @@ class SOFA_COMPONENT_IO_MESH_API MeshSTLLoader : public sofa::core::loader::Mesh public: //Add Data here SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData _forceBinary; + sofa::core::objectmodel::lifecycle::RenamedData _forceBinary; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData _headerSize; + sofa::core::objectmodel::lifecycle::RenamedData _headerSize; diff --git a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshTrianLoader.h b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshTrianLoader.h index 92bd4e6124c..7a9aae5e63f 100644 --- a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshTrianLoader.h +++ b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/MeshTrianLoader.h @@ -24,7 +24,7 @@ #include -#include +#include namespace sofa::component::io::mesh { @@ -56,16 +56,16 @@ class SOFA_COMPONENT_IO_MESH_API MeshTrianLoader : public sofa::core::loader::Me public: //Add specific Data here: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData p_trian2; + sofa::core::objectmodel::lifecycle::RenamedData p_trian2; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData > > neighborTable; + sofa::core::objectmodel::lifecycle::RenamedData > > neighborTable; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData > > edgesOnBorder; + sofa::core::objectmodel::lifecycle::RenamedData > > edgesOnBorder; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData > trianglesOnBorderList; + sofa::core::objectmodel::lifecycle::RenamedData > trianglesOnBorderList; Data d_trian2; ///< Set to true if the mesh is a trian2 format. Data > > d_neighborTable; ///< Table of neighborhood triangle indices for each triangle. diff --git a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/OffSequenceLoader.h b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/OffSequenceLoader.h index aa8e4d25172..84bda24944a 100644 --- a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/OffSequenceLoader.h +++ b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/OffSequenceLoader.h @@ -24,7 +24,7 @@ #include -#include +#include namespace sofa::component::io::mesh { @@ -51,9 +51,9 @@ class SOFA_COMPONENT_IO_MESH_API OffSequenceLoader : public MeshOffLoader private: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData nbFiles; + sofa::core::objectmodel::lifecycle::RenamedData nbFiles; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData stepDuration; + sofa::core::objectmodel::lifecycle::RenamedData stepDuration; /// the number of files in the sequences diff --git a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/StringMeshCreator.h b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/StringMeshCreator.h index 8077b3587e2..166bf418493 100644 --- a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/StringMeshCreator.h +++ b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/StringMeshCreator.h @@ -24,7 +24,7 @@ #include -#include +#include namespace sofa::component::io::mesh { @@ -39,7 +39,7 @@ class SOFA_COMPONENT_IO_MESH_API StringMeshCreator : public sofa::core::loader:: { public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< unsigned > resolution; + sofa::core::objectmodel::lifecycle::RenamedData< unsigned > resolution; SOFA_CLASS(StringMeshCreator,sofa::core::loader::MeshLoader); virtual std::string type() { return "This object is procedurally created"; } 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 2d2c872068d..cc333ca90b5 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 @@ -30,7 +30,7 @@ #include -#include +#include namespace sofa::component::_vtkexporter_ { @@ -60,43 +60,43 @@ class SOFA_COMPONENT_IO_MESH_API VTKExporter : public core::objectmodel::BaseObj sofa::core::objectmodel::DataFileName vtkFilename; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< bool > fileFormat; + sofa::core::objectmodel::lifecycle::RenamedData< bool > fileFormat; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData position; + sofa::core::objectmodel::lifecycle::RenamedData position; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< bool > writeEdges; + sofa::core::objectmodel::lifecycle::RenamedData< bool > writeEdges; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< bool > writeTriangles; + sofa::core::objectmodel::lifecycle::RenamedData< bool > writeTriangles; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< bool > writeQuads; + sofa::core::objectmodel::lifecycle::RenamedData< bool > writeQuads; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< bool > writeTetras; + sofa::core::objectmodel::lifecycle::RenamedData< bool > writeTetras; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< bool > writeHexas; + sofa::core::objectmodel::lifecycle::RenamedData< bool > writeHexas; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData > dPointsDataFields; + sofa::core::objectmodel::lifecycle::RenamedData > dPointsDataFields; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData > dCellsDataFields; + sofa::core::objectmodel::lifecycle::RenamedData > dCellsDataFields; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< unsigned int > exportEveryNbSteps; + sofa::core::objectmodel::lifecycle::RenamedData< unsigned int > exportEveryNbSteps; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< bool > exportAtBegin; + sofa::core::objectmodel::lifecycle::RenamedData< bool > exportAtBegin; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< bool > exportAtEnd; + sofa::core::objectmodel::lifecycle::RenamedData< bool > exportAtEnd; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< bool > overwrite; + sofa::core::objectmodel::lifecycle::RenamedData< bool > overwrite; diff --git a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/VoxelGridLoader.h b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/VoxelGridLoader.h index 0b3e9255038..0921f06daf6 100644 --- a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/VoxelGridLoader.h +++ b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/VoxelGridLoader.h @@ -24,7 +24,7 @@ #include -#include +#include namespace sofa::component::io::mesh { @@ -74,31 +74,31 @@ class SOFA_COMPONENT_IO_MESH_API VoxelGridLoader : public sofa::core::loader::Vo // fill the texture by 'image' only where there is the 'segmentation' of 'd_activeValue' and give the 3D texture sizes void createSegmentation3DTexture( unsigned char **textureData, int& width, int& height, int& depth) override; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< type::Vec3 > voxelSize; + sofa::core::objectmodel::lifecycle::RenamedData< type::Vec3 > voxelSize; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< Vec3i > dataResolution; + sofa::core::objectmodel::lifecycle::RenamedData< Vec3i > dataResolution; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< Vec6i > roi; + sofa::core::objectmodel::lifecycle::RenamedData< Vec6i > roi; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< int > headerSize; + sofa::core::objectmodel::lifecycle::RenamedData< int > headerSize; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< int > segmentationHeaderSize; + sofa::core::objectmodel::lifecycle::RenamedData< int > segmentationHeaderSize; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< type::vector > idxInRegularGrid; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector > idxInRegularGrid; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< type::vector > backgroundValue; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector > backgroundValue; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData< type::vector > activeValue; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector > activeValue; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH() - sofa::core::objectmodel::RenamedData generateHexa; + sofa::core::objectmodel::lifecycle::RenamedData generateHexa; 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 7c8573a083f..118f170edc3 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,7 +32,7 @@ #include #include -#include +#include namespace sofa::component::linearsolver::direct { @@ -83,10 +83,10 @@ class PrecomputedLinearSolver : public sofa::component::linearsolver::MatrixLine typedef typename PrecomputedLinearSolverInternalData::TBaseMatrix TBaseMatrix; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_DIRECT() - sofa::core::objectmodel::RenamedData jmjt_twostep; + sofa::core::objectmodel::lifecycle::RenamedData jmjt_twostep; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_DIRECT() - sofa::core::objectmodel::RenamedData use_file; + sofa::core::objectmodel::lifecycle::RenamedData use_file; Data d_jmjt_twostep; ///< Use two step algorithm to compute JMinvJt 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 36a91409e55..f0d619e5467 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,7 +25,7 @@ #include #include -#include +#include namespace sofa::component::linearsolver::direct { @@ -51,13 +51,13 @@ class SVDLinearSolver : public sofa::component::linearsolver::MatrixLinearSolver typedef sofa::component::linearsolver::MatrixLinearSolver Inherit; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_DIRECT() - sofa::core::objectmodel::RenamedData f_verbose; + sofa::core::objectmodel::lifecycle::RenamedData f_verbose; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_DIRECT() - sofa::core::objectmodel::RenamedData f_minSingularValue; + sofa::core::objectmodel::lifecycle::RenamedData f_minSingularValue; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_DIRECT() - sofa::core::objectmodel::RenamedData f_conditionNumber; + sofa::core::objectmodel::lifecycle::RenamedData f_conditionNumber; Data d_verbose; ///< Dump system state at each iteration 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 1506256becd..50dd8f112fc 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,7 +28,7 @@ #include -#include +#include namespace sofa::component::linearsolver::iterative { @@ -45,22 +45,22 @@ class PCGLinearSolver : public sofa::component::linearsolver::MatrixLinearSolver typedef sofa::component::linearsolver::MatrixLinearSolver Inherit; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() - sofa::core::objectmodel::RenamedData f_maxIter; + sofa::core::objectmodel::lifecycle::RenamedData f_maxIter; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() - sofa::core::objectmodel::RenamedData f_tolerance; + sofa::core::objectmodel::lifecycle::RenamedData f_tolerance; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() - sofa::core::objectmodel::RenamedData f_use_precond; + sofa::core::objectmodel::lifecycle::RenamedData f_use_precond; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() - sofa::core::objectmodel::RenamedData f_update_step; + sofa::core::objectmodel::lifecycle::RenamedData f_update_step; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() - sofa::core::objectmodel::RenamedData f_build_precond; + sofa::core::objectmodel::lifecycle::RenamedData f_build_precond; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() - sofa::core::objectmodel::RenamedData > > f_graph; + 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 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 0c92b8e28ad..f3b2bfa187b 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,7 +32,7 @@ #include #include -#include +#include namespace sofa::component::linearsolver::preconditioner { @@ -113,19 +113,19 @@ class PrecomputedWarpPreconditioner : public sofa::component::linearsolver::Matr sofa::core::objectmodel::lifecycle::RemovedData f_verbose{this, "v23.12", "v24.06", "verbose", "This Data is no longer used"}; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() - sofa::core::objectmodel::RenamedData jmjt_twostep; + sofa::core::objectmodel::lifecycle::RenamedData jmjt_twostep; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() - sofa::core::objectmodel::RenamedData use_file; + sofa::core::objectmodel::lifecycle::RenamedData use_file; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() - sofa::core::objectmodel::RenamedData share_matrix; + sofa::core::objectmodel::lifecycle::RenamedData share_matrix; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() - sofa::core::objectmodel::RenamedData use_rotations; + sofa::core::objectmodel::lifecycle::RenamedData use_rotations; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() - sofa::core::objectmodel::RenamedData draw_rotations_scale; + sofa::core::objectmodel::lifecycle::RenamedData draw_rotations_scale; Data d_use_file; ///< Dump system matrix in a file 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 2e83259bd01..2dfceedf0e0 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,7 +30,7 @@ #include -#include +#include namespace sofa::component::linearsolver::preconditioner { @@ -57,7 +57,7 @@ class SSORPreconditioner : public sofa::component::linearsolver::MatrixLinearSol sofa::core::objectmodel::lifecycle::RemovedData f_verbose{this, "v23.12", "v24.06", "verbose", "This Data is no longer used"}; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() - sofa::core::objectmodel::RenamedData f_omega; + sofa::core::objectmodel::lifecycle::RenamedData f_omega; Data d_omega; ///< Omega coefficient protected: 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 857303b7686..3db305f50d9 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,7 +37,7 @@ #include #include -#include +#include namespace sofa::component::mapping::linear { @@ -70,10 +70,10 @@ class BarycentricMapperTetrahedronSetTopologyRigid : public TopologyBarycentricM protected: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData> map; + sofa::core::objectmodel::lifecycle::RenamedData> map; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData> mapOrient; + 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/DeformableOnRigidFrameMapping.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/DeformableOnRigidFrameMapping.h index aa4fb521355..ba1b963ae58 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,7 +26,7 @@ #include -#include +#include namespace sofa::component::mapping::linear { @@ -96,22 +96,22 @@ class DeformableOnRigidFrameMapping : public LinearMulti2Mapping data; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData index; + sofa::core::objectmodel::lifecycle::RenamedData index; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData indexFromEnd; + sofa::core::objectmodel::lifecycle::RenamedData indexFromEnd; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData > repartition; + sofa::core::objectmodel::lifecycle::RenamedData > repartition; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData globalToLocalCoords; + sofa::core::objectmodel::lifecycle::RenamedData globalToLocalCoords; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData m_rootAngularForceScaleFactor; + sofa::core::objectmodel::lifecycle::RenamedData m_rootAngularForceScaleFactor; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData m_rootLinearForceScaleFactor; + sofa::core::objectmodel::lifecycle::RenamedData m_rootLinearForceScaleFactor; Data d_index; ///< input DOF index 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 99090b31c8c..156ffe4f6b3 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,7 +32,7 @@ #include #include -#include +#include namespace sofa::component::mapping::linear { @@ -78,22 +78,22 @@ class SkinningMapping : public LinearMapping protected: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData f_initPos; + sofa::core::objectmodel::lifecycle::RenamedData f_initPos; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData< type::vector > nbRef; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector > nbRef; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData > > f_index; + sofa::core::objectmodel::lifecycle::RenamedData > > f_index; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData > > weight; + sofa::core::objectmodel::lifecycle::RenamedData > > weight; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData showFromIndex; + sofa::core::objectmodel::lifecycle::RenamedData showFromIndex; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData showWeights; + sofa::core::objectmodel::lifecycle::RenamedData showWeights; Data d_initPos; ///< initial child coordinates in the world reference frame. 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 21d97b01071..3a7d32b9a8e 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,7 +32,7 @@ #include #include -#include +#include namespace sofa::component::mapping::linear { @@ -87,25 +87,25 @@ class SubsetMapping : public LinearMapping typedef sofa::core::topology::PointSubsetData< IndexArray > SetIndex; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData f_indices; + sofa::core::objectmodel::lifecycle::RenamedData f_indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData f_first; + sofa::core::objectmodel::lifecycle::RenamedData f_first; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData f_last; + sofa::core::objectmodel::lifecycle::RenamedData f_last; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData f_radius; + sofa::core::objectmodel::lifecycle::RenamedData f_radius; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData f_handleTopologyChange; + sofa::core::objectmodel::lifecycle::RenamedData f_handleTopologyChange; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData f_ignoreNotFound; + sofa::core::objectmodel::lifecycle::RenamedData f_ignoreNotFound; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData f_resizeToModel; + sofa::core::objectmodel::lifecycle::RenamedData f_resizeToModel; SetIndex d_indices; 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 75fe2fe440c..d80e95eb0ab 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,7 +29,7 @@ #include #include -#include +#include namespace sofa::component::mapping::linear { @@ -66,7 +66,7 @@ class SubsetMultiMapping : public LinearMultiMapping virtual const type::vector* getJs() override; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData< type::vector > indexPairs; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector > indexPairs; Data< type::vector > d_indexPairs; ///< list of couples (parent index + index in the parent) 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 3802eb53063..a834febedfc 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,7 +29,7 @@ #include #include -#include +#include namespace sofa::component::mapping::linear { @@ -89,13 +89,13 @@ 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::RenamedData m_nbPointsOnEachCircle; + sofa::core::objectmodel::lifecycle::RenamedData m_nbPointsOnEachCircle; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData m_radius; + sofa::core::objectmodel::lifecycle::RenamedData m_radius; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_LINEAR() - sofa::core::objectmodel::RenamedData m_peak; + sofa::core::objectmodel::lifecycle::RenamedData m_peak; Data d_nbPointsOnEachCircle; ///< Discretization of created circles Data d_radius; ///< Radius of created circles 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 3731851cd3a..615537ab7c4 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,7 +30,7 @@ #include #include -#include +#include namespace sofa::component::mapping::nonlinear { @@ -77,13 +77,13 @@ class DistanceFromTargetMapping : public BaseNonLinearMapping, typedef type::Vec Direction; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::RenamedData> f_indices; + sofa::core::objectmodel::lifecycle::RenamedData> f_indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::RenamedData f_targetPositions; + sofa::core::objectmodel::lifecycle::RenamedData f_targetPositions; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::RenamedData> f_restDistances; + 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. 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 df197ab65d9..7f2296efb23 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,7 +29,7 @@ #include #include -#include +#include namespace sofa::component::mapping::nonlinear { @@ -62,10 +62,10 @@ class DistanceMapping : public BaseNonLinearMapping typedef type::Vec Direction; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::RenamedData f_computeDistance; + sofa::core::objectmodel::lifecycle::RenamedData f_computeDistance; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::RenamedData> f_restLengths; + 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 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 fed60bcd234..1f78b1868e2 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,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::mapping::nonlinear { @@ -77,10 +77,10 @@ class DistanceMultiMapping : public core::MultiMapping, public Stabil typedef type::Vec Direction; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::RenamedData f_computeDistance; + sofa::core::objectmodel::lifecycle::RenamedData f_computeDistance; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() - sofa::core::objectmodel::RenamedData> f_restLengths; + 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 diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EdgePressureForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EdgePressureForceField.h index 95b8792aced..e6243016b1e 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EdgePressureForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EdgePressureForceField.h @@ -25,7 +25,7 @@ #include #include -#include +#include namespace sofa::component::mechanicalload { @@ -83,37 +83,37 @@ class EdgePressureForceField : public core::behavior::ForceField sofa::core::topology::BaseMeshTopology* _completeTopology{nullptr}; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData > edgePressureMap; + sofa::core::objectmodel::lifecycle::RenamedData > edgePressureMap; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData pressure; + sofa::core::objectmodel::lifecycle::RenamedData pressure; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData >edgeIndices; + sofa::core::objectmodel::lifecycle::RenamedData >edgeIndices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData > edges; + sofa::core::objectmodel::lifecycle::RenamedData > edges; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData normal; + sofa::core::objectmodel::lifecycle::RenamedData normal; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData dmin; + sofa::core::objectmodel::lifecycle::RenamedData dmin; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData dmax; + sofa::core::objectmodel::lifecycle::RenamedData dmax; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData arrowSizeCoef; + sofa::core::objectmodel::lifecycle::RenamedData arrowSizeCoef; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData< type::vector > p_intensity; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector > p_intensity; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData p_binormal; + sofa::core::objectmodel::lifecycle::RenamedData p_binormal; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData p_showForces; + 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 diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/OscillatingTorsionPressureForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/OscillatingTorsionPressureForceField.h index 79d1d44fbe6..6328bec72d1 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/OscillatingTorsionPressureForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/OscillatingTorsionPressureForceField.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::mechanicalload { @@ -84,34 +84,34 @@ class OscillatingTorsionPressureForceField : public core::behavior::ForceField > trianglePressureMap; + sofa::core::objectmodel::lifecycle::RenamedData > trianglePressureMap; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData moment; + sofa::core::objectmodel::lifecycle::RenamedData moment; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData > triangleList; + sofa::core::objectmodel::lifecycle::RenamedData > triangleList; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData axis; + sofa::core::objectmodel::lifecycle::RenamedData axis; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData center; + sofa::core::objectmodel::lifecycle::RenamedData center; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData penalty; + sofa::core::objectmodel::lifecycle::RenamedData penalty; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData frequency; + sofa::core::objectmodel::lifecycle::RenamedData frequency; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData dmin; + sofa::core::objectmodel::lifecycle::RenamedData dmin; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData dmax; + sofa::core::objectmodel::lifecycle::RenamedData dmax; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData p_showForces; + sofa::core::objectmodel::lifecycle::RenamedData p_showForces; sofa::core::topology::TriangleSubsetData > d_trianglePressureMap; ///< Map between triangle indices and their pressure diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/QuadPressureForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/QuadPressureForceField.h index dbd9bb1acb9..39e42d3c37b 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/QuadPressureForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/QuadPressureForceField.h @@ -25,7 +25,7 @@ #include #include -#include +#include namespace sofa::component::mechanicalload { @@ -55,22 +55,22 @@ class QuadPressureForceField : public core::behavior::ForceField using Index = sofa::Index; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData pressure; + sofa::core::objectmodel::lifecycle::RenamedData pressure; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData> quadList; + sofa::core::objectmodel::lifecycle::RenamedData> quadList; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData normal; + sofa::core::objectmodel::lifecycle::RenamedData normal; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData dmin; + sofa::core::objectmodel::lifecycle::RenamedData dmin; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData dmax; + sofa::core::objectmodel::lifecycle::RenamedData dmax; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData p_showForces; + sofa::core::objectmodel::lifecycle::RenamedData p_showForces; Data d_pressure; ///< Pressure force per unit area @@ -119,7 +119,7 @@ class QuadPressureForceField : public core::behavior::ForceField } }; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData > quadPressureMap; + sofa::core::objectmodel::lifecycle::RenamedData > quadPressureMap; sofa::core::topology::QuadSubsetData > d_quadPressureMap; ///< Map between quad indices and their pressure diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.h index 91ab0c73428..993afb57855 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.h @@ -29,7 +29,7 @@ #include -#include +#include namespace sofa::component::mechanicalload { @@ -84,7 +84,7 @@ class SphereForceField : public core::behavior::ForceField }; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData > contacts; + sofa::core::objectmodel::lifecycle::RenamedData > contacts; Data > d_contacts; ///< Contacts @@ -94,25 +94,25 @@ class SphereForceField : public core::behavior::ForceField SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData sphereCenter; + sofa::core::objectmodel::lifecycle::RenamedData sphereCenter; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData sphereRadius; + sofa::core::objectmodel::lifecycle::RenamedData sphereRadius; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData stiffness; + sofa::core::objectmodel::lifecycle::RenamedData stiffness; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData damping; + sofa::core::objectmodel::lifecycle::RenamedData damping; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData color; + sofa::core::objectmodel::lifecycle::RenamedData color; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData> localRange; + sofa::core::objectmodel::lifecycle::RenamedData> localRange; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData bilateral; + sofa::core::objectmodel::lifecycle::RenamedData bilateral; Data d_sphereCenter; ///< sphere center diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SurfacePressureForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SurfacePressureForceField.h index 5678ad7474d..b8a17afd690 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SurfacePressureForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SurfacePressureForceField.h @@ -25,7 +25,7 @@ #include #include -#include +#include namespace sofa::core::topology { @@ -71,43 +71,43 @@ class SurfacePressureForceField : public core::behavior::ForceField enum State { INCREASE, DECREASE }; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_pressure; + sofa::core::objectmodel::lifecycle::RenamedData m_pressure; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_min; + sofa::core::objectmodel::lifecycle::RenamedData m_min; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_max; + sofa::core::objectmodel::lifecycle::RenamedData m_max; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_triangleIndices; + sofa::core::objectmodel::lifecycle::RenamedData m_triangleIndices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_quadIndices; + sofa::core::objectmodel::lifecycle::RenamedData m_quadIndices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_pulseMode; + sofa::core::objectmodel::lifecycle::RenamedData m_pulseMode; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_pressureLowerBound; + sofa::core::objectmodel::lifecycle::RenamedData m_pressureLowerBound; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_pressureSpeed; + sofa::core::objectmodel::lifecycle::RenamedData m_pressureSpeed; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_volumeConservationMode; + sofa::core::objectmodel::lifecycle::RenamedData m_volumeConservationMode; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_useTangentStiffness; + sofa::core::objectmodel::lifecycle::RenamedData m_useTangentStiffness; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_defaultVolume; + sofa::core::objectmodel::lifecycle::RenamedData m_defaultVolume; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_mainDirection; + sofa::core::objectmodel::lifecycle::RenamedData m_mainDirection; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_drawForceScale; + sofa::core::objectmodel::lifecycle::RenamedData m_drawForceScale; Data d_pressure; ///< Pressure force per unit area Data d_min; ///< Lower bound of the selection box diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.h index dc41b36c794..98b4cb8ed60 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.h @@ -25,7 +25,7 @@ #include #include -#include +#include namespace sofa::component::mechanicalload { @@ -74,58 +74,58 @@ class TaitSurfacePressureForceField : public core::behavior::ForceField m_p0; + sofa::core::objectmodel::lifecycle::RenamedData m_p0; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_B; + sofa::core::objectmodel::lifecycle::RenamedData m_B; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_gamma; + sofa::core::objectmodel::lifecycle::RenamedData m_gamma; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_injectedVolume; + sofa::core::objectmodel::lifecycle::RenamedData m_injectedVolume; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_maxInjectionRate; + sofa::core::objectmodel::lifecycle::RenamedData m_maxInjectionRate; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_initialVolume; + sofa::core::objectmodel::lifecycle::RenamedData m_initialVolume; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_currentInjectedVolume; + sofa::core::objectmodel::lifecycle::RenamedData m_currentInjectedVolume; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_v0; + sofa::core::objectmodel::lifecycle::RenamedData m_v0; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_currentVolume; + sofa::core::objectmodel::lifecycle::RenamedData m_currentVolume; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_currentPressure; + sofa::core::objectmodel::lifecycle::RenamedData m_currentPressure; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_currentStiffness; + sofa::core::objectmodel::lifecycle::RenamedData m_currentStiffness; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_pressureTriangles; + sofa::core::objectmodel::lifecycle::RenamedData m_pressureTriangles; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_initialSurfaceArea; + sofa::core::objectmodel::lifecycle::RenamedData m_initialSurfaceArea; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_currentSurfaceArea; + sofa::core::objectmodel::lifecycle::RenamedData m_currentSurfaceArea; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_drawForceScale; + sofa::core::objectmodel::lifecycle::RenamedData m_drawForceScale; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_drawForceColor; + sofa::core::objectmodel::lifecycle::RenamedData m_drawForceColor; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_volumeAfterTC; + sofa::core::objectmodel::lifecycle::RenamedData m_volumeAfterTC; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_surfaceAreaAfterTC; + sofa::core::objectmodel::lifecycle::RenamedData m_surfaceAreaAfterTC; Data< Real > d_p0; ///< IN: Rest pressure when V = V0 diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TorsionForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TorsionForceField.h index d21708b69eb..d727c51636d 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TorsionForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TorsionForceField.h @@ -30,7 +30,7 @@ #include #include -#include +#include namespace sofa::component::mechanicalload { @@ -86,16 +86,16 @@ class TorsionForceField : public ForceField public : SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_indices; + sofa::core::objectmodel::lifecycle::RenamedData m_indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_torque; + sofa::core::objectmodel::lifecycle::RenamedData m_torque; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_axis; + sofa::core::objectmodel::lifecycle::RenamedData m_axis; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData m_origin; + sofa::core::objectmodel::lifecycle::RenamedData m_origin; Data d_indices; ///< indices of the selected points Data d_torque; ///< torque to apply diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TrianglePressureForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TrianglePressureForceField.h index 15dc6cebe69..348503e847c 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TrianglePressureForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TrianglePressureForceField.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::mechanicalload { @@ -52,19 +52,19 @@ class TrianglePressureForceField : public core::behavior::ForceField using Index = sofa::Index; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData pressure; + sofa::core::objectmodel::lifecycle::RenamedData pressure; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData cauchyStress; + sofa::core::objectmodel::lifecycle::RenamedData cauchyStress; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData > triangleList; + sofa::core::objectmodel::lifecycle::RenamedData > triangleList; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData p_showForces; + sofa::core::objectmodel::lifecycle::RenamedData p_showForces; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData p_useConstantForce; + sofa::core::objectmodel::lifecycle::RenamedData p_useConstantForce; Data d_pressure; ///< Pressure force per unit area diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/UniformVelocityDampingForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/UniformVelocityDampingForceField.h index dc0fdcef2ea..f297f3916c7 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/UniformVelocityDampingForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/UniformVelocityDampingForceField.h @@ -24,7 +24,7 @@ #include -#include +#include namespace sofa::component::mechanicalload { @@ -49,7 +49,7 @@ class UniformVelocityDampingForceField : public core::behavior::ForceField DataVecDeriv; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() - sofa::core::objectmodel::RenamedData< Real > dampingCoefficient; + sofa::core::objectmodel::lifecycle::RenamedData< Real > dampingCoefficient; /// air drag coefficient. Data< Real > d_dampingCoefficient; 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 3dbece65c3b..ccebff28494 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,7 +25,7 @@ #include -#include +#include namespace sofa::component::odesolver::backward { @@ -104,20 +104,20 @@ class SOFA_COMPONENT_ODESOLVER_BACKWARD_API EulerImplicitSolver : SOFA_CLASS2(EulerImplicitSolver, sofa::core::behavior::OdeSolver, sofa::core::behavior::LinearSolverAccessor); SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_rayleighStiffness; + sofa::core::objectmodel::lifecycle::RenamedData f_rayleighStiffness; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_rayleighMass; + sofa::core::objectmodel::lifecycle::RenamedData f_rayleighMass; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_velocityDamping; + sofa::core::objectmodel::lifecycle::RenamedData f_velocityDamping; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_firstOrder; + sofa::core::objectmodel::lifecycle::RenamedData f_firstOrder; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_solveConstraint; + sofa::core::objectmodel::lifecycle::RenamedData f_solveConstraint; 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 8e46bb57664..37e2a66ee6b 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,7 +26,7 @@ #include #include -#include +#include namespace sofa::component::odesolver::backward { @@ -46,34 +46,34 @@ class SOFA_COMPONENT_ODESOLVER_BACKWARD_API VariationalSymplecticSolver SOFA_CLASS2(VariationalSymplecticSolver, sofa::core::behavior::OdeSolver, sofa::core::behavior::LinearSolverAccessor); SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_newtonError; + sofa::core::objectmodel::lifecycle::RenamedData f_newtonError; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_newtonSteps; + sofa::core::objectmodel::lifecycle::RenamedData f_newtonSteps; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_rayleighStiffness; + sofa::core::objectmodel::lifecycle::RenamedData f_rayleighStiffness; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_rayleighMass; + sofa::core::objectmodel::lifecycle::RenamedData f_rayleighMass; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_saveEnergyInFile; + sofa::core::objectmodel::lifecycle::RenamedData f_saveEnergyInFile; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_explicit; + sofa::core::objectmodel::lifecycle::RenamedData f_explicit; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_fileName; + sofa::core::objectmodel::lifecycle::RenamedData f_fileName; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_computeHamiltonian; + sofa::core::objectmodel::lifecycle::RenamedData f_computeHamiltonian; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_hamiltonianEnergy; + sofa::core::objectmodel::lifecycle::RenamedData f_hamiltonianEnergy; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() - sofa::core::objectmodel::RenamedData f_useIncrementalPotentialEnergy; + sofa::core::objectmodel::lifecycle::RenamedData f_useIncrementalPotentialEnergy; Data d_newtonError; ///< Error tolerance for Newton iterations Data d_newtonSteps; ///< Maximum number of Newton steps 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 62416f6a63d..592bbb2c960 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,7 +24,7 @@ #include -#include +#include namespace sofa::component::odesolver::forward { @@ -44,7 +44,7 @@ class SOFA_COMPONENT_ODESOLVER_FORWARD_API CentralDifferenceSolver : public sofa 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::RenamedData f_rayleighMass; + 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.h b/Sofa/Component/ODESolver/Forward/src/sofa/component/odesolver/forward/DampVelocitySolver.h index de737b83789..ddfe643f313 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,7 +25,7 @@ #include -#include +#include namespace sofa::component::odesolver::forward { @@ -37,10 +37,10 @@ class SOFA_COMPONENT_ODESOLVER_FORWARD_API DampVelocitySolver : public sofa::cor { public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_FORWARD() - sofa::core::objectmodel::RenamedData rate; + sofa::core::objectmodel::lifecycle::RenamedData rate; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_FORWARD() - sofa::core::objectmodel::RenamedData threshold; + sofa::core::objectmodel::lifecycle::RenamedData threshold; SOFA_CLASS(DampVelocitySolver, sofa::core::behavior::OdeSolver); diff --git a/Sofa/Component/Playback/src/sofa/component/playback/InputEventReader.h b/Sofa/Component/Playback/src/sofa/component/playback/InputEventReader.h index 6eb0e713c4f..3487ea8ee02 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/InputEventReader.h +++ b/Sofa/Component/Playback/src/sofa/component/playback/InputEventReader.h @@ -32,7 +32,7 @@ #include #endif -#include +#include namespace sofa::component::playback { @@ -78,19 +78,19 @@ class InputEventReader : public core::objectmodel::BaseObject sofa::core::objectmodel::DataFileName filename; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() - sofa::core::objectmodel::RenamedData inverseSense; + sofa::core::objectmodel::lifecycle::RenamedData inverseSense; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() - sofa::core::objectmodel::RenamedData p_printEvent; + sofa::core::objectmodel::lifecycle::RenamedData p_printEvent; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() - sofa::core::objectmodel::RenamedData p_key1; + sofa::core::objectmodel::lifecycle::RenamedData p_key1; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() - sofa::core::objectmodel::RenamedData p_key2; + sofa::core::objectmodel::lifecycle::RenamedData p_key2; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() - sofa::core::objectmodel::RenamedData p_writeEvents; + sofa::core::objectmodel::lifecycle::RenamedData p_writeEvents; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() sofa::core::objectmodel::DataFileName p_outputFilename; diff --git a/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.h b/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.h index abd7f4e23f4..f3ab73eca18 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.h +++ b/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.h @@ -34,7 +34,7 @@ #include #include -#include +#include namespace sofa::component::playback { @@ -50,13 +50,13 @@ class SOFA_COMPONENT_PLAYBACK_API ReadTopology: public core::objectmodel::BaseOb sofa::core::objectmodel::DataFileName f_filename; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() - sofa::core::objectmodel::RenamedData < double > f_interval; + sofa::core::objectmodel::lifecycle::RenamedData < double > f_interval; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() - sofa::core::objectmodel::RenamedData < double > f_shift; + sofa::core::objectmodel::lifecycle::RenamedData < double > f_shift; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() - sofa::core::objectmodel::RenamedData < bool > f_loop; + sofa::core::objectmodel::lifecycle::RenamedData < bool > f_loop; sofa::core::objectmodel::DataFileName d_filename; Data < double > d_interval; ///< time duration between inputs diff --git a/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.h b/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.h index 77706b00a7a..623d33ac0c6 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.h +++ b/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.h @@ -38,7 +38,7 @@ #include -#include +#include namespace sofa::component::playback { @@ -61,19 +61,19 @@ class SOFA_COMPONENT_PLAYBACK_API WriteTopology: public core::objectmodel::BaseO sofa::core::objectmodel::DataFileName f_filename; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() - sofa::core::objectmodel::RenamedData < bool > f_writeContainers; + sofa::core::objectmodel::lifecycle::RenamedData < bool > f_writeContainers; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() - sofa::core::objectmodel::RenamedData < bool > f_writeShellContainers; + sofa::core::objectmodel::lifecycle::RenamedData < bool > f_writeShellContainers; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() - sofa::core::objectmodel::RenamedData < double > f_interval; + sofa::core::objectmodel::lifecycle::RenamedData < double > f_interval; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() - sofa::core::objectmodel::RenamedData < type::vector > f_time; + sofa::core::objectmodel::lifecycle::RenamedData < type::vector > f_time; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK() - sofa::core::objectmodel::RenamedData < double > f_period; + sofa::core::objectmodel::lifecycle::RenamedData < double > f_period; sofa::core::objectmodel::DataFileName d_filename; diff --git a/Sofa/Component/Setting/src/sofa/component/setting/BackgroundSetting.h b/Sofa/Component/Setting/src/sofa/component/setting/BackgroundSetting.h index 7a6e255b84e..f59bbb24dbc 100644 --- a/Sofa/Component/Setting/src/sofa/component/setting/BackgroundSetting.h +++ b/Sofa/Component/Setting/src/sofa/component/setting/BackgroundSetting.h @@ -26,7 +26,7 @@ #include #include -#include +#include namespace sofa::component::setting { @@ -42,7 +42,7 @@ class SOFA_COMPONENT_SETTING_API BackgroundSetting: public core::objectmodel::Co public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SETTING() - sofa::core::objectmodel::RenamedData color; + sofa::core::objectmodel::lifecycle::RenamedData color; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SETTING() sofa::core::objectmodel::DataFileName image; ///< Image to be used as background of the viewer. diff --git a/Sofa/Component/Setting/src/sofa/component/setting/MouseButtonSetting.h b/Sofa/Component/Setting/src/sofa/component/setting/MouseButtonSetting.h index 90c6cafb22b..e7df8c36482 100644 --- a/Sofa/Component/Setting/src/sofa/component/setting/MouseButtonSetting.h +++ b/Sofa/Component/Setting/src/sofa/component/setting/MouseButtonSetting.h @@ -26,7 +26,7 @@ #include #include -#include +#include namespace sofa::component::setting { @@ -41,7 +41,7 @@ class SOFA_COMPONENT_SETTING_API MouseButtonSetting: public core::objectmodel::C virtual std::string getOperationType()=0; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SETTING() - sofa::core::objectmodel::RenamedData button; + sofa::core::objectmodel::lifecycle::RenamedData button; core::objectmodel::Data d_button; ///< Mouse button used diff --git a/Sofa/Component/Setting/src/sofa/component/setting/SofaDefaultPathSetting.h b/Sofa/Component/Setting/src/sofa/component/setting/SofaDefaultPathSetting.h index 363375bd021..83a5e92abaa 100644 --- a/Sofa/Component/Setting/src/sofa/component/setting/SofaDefaultPathSetting.h +++ b/Sofa/Component/Setting/src/sofa/component/setting/SofaDefaultPathSetting.h @@ -26,7 +26,7 @@ #include #include -#include +#include namespace sofa::component::setting { @@ -40,7 +40,7 @@ class SOFA_COMPONENT_SETTING_API SofaDefaultPathSetting: public core::objectmode SofaDefaultPathSetting(); /// gnuplotPath; + sofa::core::objectmodel::lifecycle::RenamedData gnuplotPath; sofa::core::objectmodel::Data d_gnuplotPath; ///< Path where will be saved the gnuplot files }; diff --git a/Sofa/Component/Setting/src/sofa/component/setting/StatsSetting.h b/Sofa/Component/Setting/src/sofa/component/setting/StatsSetting.h index 00eaad3abd3..4be75cf01ac 100644 --- a/Sofa/Component/Setting/src/sofa/component/setting/StatsSetting.h +++ b/Sofa/Component/Setting/src/sofa/component/setting/StatsSetting.h @@ -26,7 +26,7 @@ #include #include -#include +#include namespace sofa::component::setting { @@ -49,13 +49,13 @@ class SOFA_COMPONENT_SETTING_API StatsSetting: public core::objectmodel::Configu public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SETTING() - sofa::core::objectmodel::RenamedData dumpState; + sofa::core::objectmodel::lifecycle::RenamedData dumpState; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SETTING() - sofa::core::objectmodel::RenamedData logTime; + sofa::core::objectmodel::lifecycle::RenamedData logTime; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SETTING() - sofa::core::objectmodel::RenamedData exportState; + sofa::core::objectmodel::lifecycle::RenamedData exportState; Data d_dumpState; ///< Dump state vectors at each time step of the simulation diff --git a/Sofa/Component/Setting/src/sofa/component/setting/ViewerSetting.h b/Sofa/Component/Setting/src/sofa/component/setting/ViewerSetting.h index b98967183e8..28625d1742d 100644 --- a/Sofa/Component/Setting/src/sofa/component/setting/ViewerSetting.h +++ b/Sofa/Component/Setting/src/sofa/component/setting/ViewerSetting.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::setting { @@ -52,16 +52,16 @@ class SOFA_COMPONENT_SETTING_API ViewerSetting: public sofa::core::objectmodel:: public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SETTING() - sofa::core::objectmodel::RenamedData > resolution; + sofa::core::objectmodel::lifecycle::RenamedData > resolution; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SETTING() - sofa::core::objectmodel::RenamedData fullscreen; + sofa::core::objectmodel::lifecycle::RenamedData fullscreen; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SETTING() - sofa::core::objectmodel::RenamedData cameraMode; + sofa::core::objectmodel::lifecycle::RenamedData cameraMode; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SETTING() - sofa::core::objectmodel::RenamedData objectPickingMethod; + sofa::core::objectmodel::lifecycle::RenamedData objectPickingMethod; Data > d_resolution; ///< resolution of the Viewer Data d_fullscreen; ///< Fullscreen mode 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 6eba2d3fc3e..29b3f8144cb 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,7 +25,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::fem::elastic { @@ -132,7 +132,7 @@ class BeamFEMForceField : public BaseLinearElasticityFEMForceField }; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData> m_beamsData; + sofa::core::objectmodel::lifecycle::RenamedData> m_beamsData; EdgeData > d_beamsData; ///< Internal element data 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 cc68dbf18a5..0f5fb51e58f 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,7 +31,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::fem::elastic { @@ -117,37 +117,37 @@ class FastTetrahedralCorotationalForceField : public BaseLinearElasticityFEMForc using VecMat3x3 = type::rebind_to; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData pointInfo; + sofa::core::objectmodel::lifecycle::RenamedData pointInfo; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData edgeInfo; + sofa::core::objectmodel::lifecycle::RenamedData edgeInfo; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData tetrahedronInfo; + sofa::core::objectmodel::lifecycle::RenamedData tetrahedronInfo; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_method; + sofa::core::objectmodel::lifecycle::RenamedData f_method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_poissonRatio; + 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::RenamedData f_drawing; + sofa::core::objectmodel::lifecycle::RenamedData f_drawing; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData drawColor1; + sofa::core::objectmodel::lifecycle::RenamedData drawColor1; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData drawColor2; + sofa::core::objectmodel::lifecycle::RenamedData drawColor2; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData drawColor3; + sofa::core::objectmodel::lifecycle::RenamedData drawColor3; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData drawColor4; + sofa::core::objectmodel::lifecycle::RenamedData drawColor4; core::topology::PointData d_pointInfo; ///< Internal point data 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 8375c646bf4..49ae29b2640 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,7 +30,7 @@ #include -#include +#include namespace sofa::component::solidmechanics::fem::elastic { @@ -186,15 +186,15 @@ class HexahedralFEMForceField : virtual public BaseLinearElasticityFEMForceField int method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_method; + sofa::core::objectmodel::lifecycle::RenamedData f_method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_poissonRatio; + 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::RenamedData > hexahedronInfo; + 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/HexahedralFEMForceFieldAndMass.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedralFEMForceFieldAndMass.h index 012ce1f3433..f436dfd65c0 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,7 +28,7 @@ #include -#include +#include namespace sofa::component::solidmechanics::fem::elastic { @@ -128,22 +128,22 @@ class HexahedralFEMForceFieldAndMass : virtual public sofa::core::behavior::Mass protected: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData _density; + sofa::core::objectmodel::lifecycle::RenamedData _density; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData _useLumpedMass; + sofa::core::objectmodel::lifecycle::RenamedData _useLumpedMass; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData> _elementMasses; + sofa::core::objectmodel::lifecycle::RenamedData> _elementMasses; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData > _elementTotalMass; + sofa::core::objectmodel::lifecycle::RenamedData > _elementTotalMass; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData > _particleMasses; + sofa::core::objectmodel::lifecycle::RenamedData > _particleMasses; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData > _lumpedMasses; + 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/HexahedronFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedronFEMForceField.h index 082f2ee9d76..92b4462cf3c 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,7 +32,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::fem::elastic { @@ -117,27 +117,27 @@ class HexahedronFEMForceField : virtual public BaseLinearElasticityFEMForceField int method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_method; + sofa::core::objectmodel::lifecycle::RenamedData f_method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_poissonRatio; + 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::RenamedData f_updateStiffnessMatrix; + sofa::core::objectmodel::lifecycle::RenamedData f_updateStiffnessMatrix; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData< sofa::helper::OptionsGroup > _gatherPt; + sofa::core::objectmodel::lifecycle::RenamedData< sofa::helper::OptionsGroup > _gatherPt; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData< sofa::helper::OptionsGroup > _gatherBsize; + sofa::core::objectmodel::lifecycle::RenamedData< sofa::helper::OptionsGroup > _gatherBsize; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_drawing; + sofa::core::objectmodel::lifecycle::RenamedData f_drawing; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_drawPercentageOffset; + sofa::core::objectmodel::lifecycle::RenamedData f_drawPercentageOffset; @@ -194,7 +194,7 @@ class HexahedronFEMForceField : virtual public BaseLinearElasticityFEMForceField typedef type::vector VecElementStiffness; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData _elementStiffnesses; + sofa::core::objectmodel::lifecycle::RenamedData _elementStiffnesses; Data d_elementStiffnesses; ///< Stiffness matrices per element (K_i) @@ -207,7 +207,7 @@ class HexahedronFEMForceField : virtual public BaseLinearElasticityFEMForceField topology::container::grid::SparseGridTopology* _sparseGrid; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData _initialPoints; + sofa::core::objectmodel::lifecycle::RenamedData _initialPoints; Data< VecCoord > d_initialPoints; ///< Initial Position 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 0c26029c00d..2e537911626 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,7 +36,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::fem::elastic { @@ -170,13 +170,13 @@ class QuadBendingFEMForceField : public core::behavior::ForceField }; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData > quadInfo; + sofa::core::objectmodel::lifecycle::RenamedData > quadInfo; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData > vertexInfo; + sofa::core::objectmodel::lifecycle::RenamedData > vertexInfo; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData > edgeInfo; + sofa::core::objectmodel::lifecycle::RenamedData > edgeInfo; /// Topology Data core::topology::QuadData > d_quadInfo; core::topology::PointData > d_vertexInfo; ///< Internal point data @@ -233,16 +233,16 @@ protected : int method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_method; + sofa::core::objectmodel::lifecycle::RenamedData f_method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData> f_poisson; + sofa::core::objectmodel::lifecycle::RenamedData> f_poisson; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData> f_young; + sofa::core::objectmodel::lifecycle::RenamedData> f_young; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_thickness; + 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) 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 ff6292fed70..49bbc29ccf0 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,7 +31,7 @@ #include #include -#include +#include // corotational tetrahedron from // @InProceedings{NPF05, @@ -128,7 +128,7 @@ class TetrahedralCorotationalFEMForceField : public BaseLinearElasticityFEMForce }; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData > tetrahedronInfo; + sofa::core::objectmodel::lifecycle::RenamedData > tetrahedronInfo; /// container that stotes all requires information for each tetrahedron core::topology::TetrahedronData > d_tetrahedronInfo; @@ -151,37 +151,37 @@ class TetrahedralCorotationalFEMForceField : public BaseLinearElasticityFEMForce int method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_method; + sofa::core::objectmodel::lifecycle::RenamedData f_method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData _poissonRatio; + 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::RenamedData _localStiffnessFactor; + sofa::core::objectmodel::lifecycle::RenamedData _localStiffnessFactor; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData _updateStiffnessMatrix; + sofa::core::objectmodel::lifecycle::RenamedData _updateStiffnessMatrix; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData _assembling; + sofa::core::objectmodel::lifecycle::RenamedData _assembling; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_drawing; + sofa::core::objectmodel::lifecycle::RenamedData f_drawing; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData drawColor1; + sofa::core::objectmodel::lifecycle::RenamedData drawColor1; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData drawColor2; + sofa::core::objectmodel::lifecycle::RenamedData drawColor2; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData drawColor3; + sofa::core::objectmodel::lifecycle::RenamedData drawColor3; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData drawColor4; + 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] 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 10652e50b37..f5e28dabc83 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,7 @@ #include #include -#include +#include // corotational tetrahedron from // @InProceedings{NPF05, @@ -189,28 +189,28 @@ class TetrahedronFEMForceField : public BaseLinearElasticityFEMForceField& getRotations() override; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData _initialPoints; + core::objectmodel::lifecycle::RenamedData _initialPoints; Data< VecCoord > d_initialPoints; ///< Initial Position int method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData f_method; + 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::RenamedData _youngModulus; + core::objectmodel::lifecycle::RenamedData _youngModulus; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData _localStiffnessFactor; + core::objectmodel::lifecycle::RenamedData _localStiffnessFactor; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData _updateStiffnessMatrix; + core::objectmodel::lifecycle::RenamedData _updateStiffnessMatrix; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData _assembling; + core::objectmodel::lifecycle::RenamedData _assembling; Data d_method; ///< "small", "large" (by QR), "polar" or "svd" displacements @@ -219,13 +219,13 @@ class TetrahedronFEMForceField : public BaseLinearElasticityFEMForceField d_assembling; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData _plasticMaxThreshold; + core::objectmodel::lifecycle::RenamedData _plasticMaxThreshold; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData _plasticYieldThreshold; + core::objectmodel::lifecycle::RenamedData _plasticYieldThreshold; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData _plasticCreep; + core::objectmodel::lifecycle::RenamedData _plasticCreep; /// @name Plasticity such as "Interactive Virtual Materials", Muller & Gross, GI 2004 /// @{ @@ -235,13 +235,13 @@ class TetrahedronFEMForceField : public BaseLinearElasticityFEMForceField _gatherPt; + core::objectmodel::lifecycle::RenamedData _gatherPt; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData _gatherBsize; + core::objectmodel::lifecycle::RenamedData _gatherBsize; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData drawHeterogeneousTetra; + 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) @@ -259,16 +259,16 @@ class TetrahedronFEMForceField : public BaseLinearElasticityFEMForceField _computeVonMisesStress; + core::objectmodel::lifecycle::RenamedData _computeVonMisesStress; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData > _vonMisesPerElement; + core::objectmodel::lifecycle::RenamedData > _vonMisesPerElement; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData > _vonMisesPerNode; + core::objectmodel::lifecycle::RenamedData > _vonMisesPerNode; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData > _vonMisesStressColors; + 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 @@ -279,22 +279,22 @@ class TetrahedronFEMForceField : public BaseLinearElasticityFEMForceField _showStressColorMap; + core::objectmodel::lifecycle::RenamedData _showStressColorMap; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData _showStressAlpha; + core::objectmodel::lifecycle::RenamedData _showStressAlpha; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData _showVonMisesStressPerNode; + core::objectmodel::lifecycle::RenamedData _showVonMisesStressPerNode; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData _showVonMisesStressPerNodeColorMap; + core::objectmodel::lifecycle::RenamedData _showVonMisesStressPerNodeColorMap; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData _showVonMisesStressPerElement; + core::objectmodel::lifecycle::RenamedData _showVonMisesStressPerElement; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - core::objectmodel::RenamedData _updateStiffness; + core::objectmodel::lifecycle::RenamedData _updateStiffness; Data d_showStressColorMap; ///< Color map used to show stress values Data d_showStressAlpha; ///< Alpha for vonMises visualisation 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 725c4158037..4815eec396f 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,7 +28,7 @@ #include #include -#include +#include // corotational triangle from // @InProceedings{NPF05, @@ -92,7 +92,7 @@ class TriangleFEMForceField : public BaseLinearElasticityFEMForceField _initialPoints; + sofa::core::objectmodel::lifecycle::RenamedData _initialPoints; Data< VecCoord > d_initialPoints; ///< Initial Position @@ -120,19 +120,19 @@ class TriangleFEMForceField : public BaseLinearElasticityFEMForceField f_method; + sofa::core::objectmodel::lifecycle::RenamedData f_method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_poisson; + sofa::core::objectmodel::lifecycle::RenamedData f_poisson; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_young; + sofa::core::objectmodel::lifecycle::RenamedData f_young; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_thickness; + sofa::core::objectmodel::lifecycle::RenamedData f_thickness; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_planeStrain; + 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/TriangularAnisotropicFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularAnisotropicFEMForceField.h index 9c13be03ecb..27231b69eba 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,7 +32,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::fem::elastic { @@ -77,19 +77,19 @@ class TriangularAnisotropicFEMForceField : public TriangularFEMForceField> f_young2; + sofa::core::objectmodel::lifecycle::RenamedData> f_young2; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_theta; + sofa::core::objectmodel::lifecycle::RenamedData f_theta; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_fiberCenter; + sofa::core::objectmodel::lifecycle::RenamedData f_fiberCenter; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData showFiber; + sofa::core::objectmodel::lifecycle::RenamedData showFiber; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData > localFiberDirection; + sofa::core::objectmodel::lifecycle::RenamedData > localFiberDirection; Data > f_poisson2; 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 4a178998e1f..67273d2f9e5 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,7 +33,7 @@ #include #endif -#include +#include namespace sofa::helper { @@ -187,10 +187,10 @@ class TriangularFEMForceField : public BaseLinearElasticityFEMForceField> triangleInfo; + sofa::core::objectmodel::lifecycle::RenamedData> triangleInfo; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData > vertexInfo; + sofa::core::objectmodel::lifecycle::RenamedData > vertexInfo; /// Topology Data core::topology::TriangleData > d_triangleInfo; @@ -256,37 +256,37 @@ protected : int method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_method; + sofa::core::objectmodel::lifecycle::RenamedData f_method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData> f_poisson; + sofa::core::objectmodel::lifecycle::RenamedData> f_poisson; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData> f_young; + sofa::core::objectmodel::lifecycle::RenamedData> f_young; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData > > m_rotatedInitialElements; + sofa::core::objectmodel::lifecycle::RenamedData > > m_rotatedInitialElements; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData > m_initialTransformation; + sofa::core::objectmodel::lifecycle::RenamedData > m_initialTransformation; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData hosfordExponant; + sofa::core::objectmodel::lifecycle::RenamedData hosfordExponant; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData criteriaValue; + sofa::core::objectmodel::lifecycle::RenamedData criteriaValue; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData showStressValue; + sofa::core::objectmodel::lifecycle::RenamedData showStressValue; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData showStressVector; + sofa::core::objectmodel::lifecycle::RenamedData showStressVector; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData showFracturableTriangles; + sofa::core::objectmodel::lifecycle::RenamedData showFracturableTriangles; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() - sofa::core::objectmodel::RenamedData f_computePrincipalStress; + sofa::core::objectmodel::lifecycle::RenamedData f_computePrincipalStress; Data d_method; ///< large: large displacements, small: small displacements 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 cd5e969b749..54c20464e36 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,7 +28,7 @@ #include #include -#include +#include namespace sofa::core::behavior @@ -67,19 +67,19 @@ class AngularSpringForceField : public core::behavior::ForceField typedef core::objectmodel::Data DataVecDeriv; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData< type::vector< sofa::Index > > indices; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector< sofa::Index > > indices; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData angularStiffness; + sofa::core::objectmodel::lifecycle::RenamedData angularStiffness; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData angularLimit; + sofa::core::objectmodel::lifecycle::RenamedData angularLimit; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData drawSpring; + sofa::core::objectmodel::lifecycle::RenamedData drawSpring; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData springColor; + 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 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 3677cf59b68..2e29259fc59 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,7 +29,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::spring { @@ -156,13 +156,13 @@ class FrameSpringForceField : public core::behavior::PairInteractionForceField > springs; + sofa::core::objectmodel::lifecycle::RenamedData > springs; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData showLawfulTorsion; + sofa::core::objectmodel::lifecycle::RenamedData showLawfulTorsion; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData showExtraTorsion; + sofa::core::objectmodel::lifecycle::RenamedData showExtraTorsion; SReal m_potentialEnergy; /// the list of the springs 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 de953fedabb..c555fc89d15 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,7 +31,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::spring { @@ -289,19 +289,19 @@ class GearSpringForceField : public core::behavior::PairInteractionForceField > springs; + sofa::core::objectmodel::lifecycle::RenamedData > 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::RenamedData f_period; + sofa::core::objectmodel::lifecycle::RenamedData f_period; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData f_reinit; + sofa::core::objectmodel::lifecycle::RenamedData f_reinit; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData showFactorSize; + sofa::core::objectmodel::lifecycle::RenamedData showFactorSize; /// the list of the springs Data > d_springs; 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 c45e5fb5106..535bc3df98d 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,7 +25,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::spring { @@ -141,10 +141,10 @@ class JointSpringForceField : public core::behavior::PairInteractionForceField f_period; + sofa::core::objectmodel::lifecycle::RenamedData f_period; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData f_reinit; + 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 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 aa121a98879..21059847a7c 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,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::spring { @@ -47,7 +47,7 @@ class QuadBendingSprings : public SpringForceField typedef core::behavior::MechanicalState MechanicalState; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData> localRange; + 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/TriangularBendingSprings.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBendingSprings.h index b57362f1233..9940fd7add4 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,7 +28,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::spring { @@ -98,7 +98,7 @@ class TriangularBendingSprings : public core::behavior::ForceField } }; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData> edgeInfo; + 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/TriangularBiquadraticSpringsForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBiquadraticSpringsForceField.h index b60ef5199cd..28fc16c2501 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,7 +29,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::spring { @@ -124,31 +124,31 @@ class TriangularBiquadraticSpringsForceField : public core::behavior::ForceField }; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData > triangleInfo; + sofa::core::objectmodel::lifecycle::RenamedData > triangleInfo; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData > edgeInfo; + sofa::core::objectmodel::lifecycle::RenamedData > edgeInfo; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData _initialPoints; + sofa::core::objectmodel::lifecycle::RenamedData _initialPoints; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData f_poissonRatio; + sofa::core::objectmodel::lifecycle::RenamedData f_poissonRatio; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData f_youngModulus; + sofa::core::objectmodel::lifecycle::RenamedData f_youngModulus; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData f_dampingRatio; + sofa::core::objectmodel::lifecycle::RenamedData f_dampingRatio; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData f_useAngularSprings; + sofa::core::objectmodel::lifecycle::RenamedData f_useAngularSprings; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData f_compressible; + sofa::core::objectmodel::lifecycle::RenamedData f_compressible; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData f_stiffnessMatrixRegularizationWeight; + sofa::core::objectmodel::lifecycle::RenamedData f_stiffnessMatrixRegularizationWeight; 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 998784e9994..9697d00e39b 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,7 +29,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::spring { @@ -116,19 +116,19 @@ class TriangularQuadraticSpringsForceField : public core::behavior::ForceField _initialPoints; + sofa::core::objectmodel::lifecycle::RenamedData _initialPoints; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData f_poissonRatio; + sofa::core::objectmodel::lifecycle::RenamedData f_poissonRatio; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData f_youngModulus; + sofa::core::objectmodel::lifecycle::RenamedData f_youngModulus; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData f_dampingRatio; + sofa::core::objectmodel::lifecycle::RenamedData f_dampingRatio; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData f_useAngularSprings; + sofa::core::objectmodel::lifecycle::RenamedData f_useAngularSprings; Data< VecCoord > d_initialPoints; ///< Initial Position @@ -205,10 +205,10 @@ class TriangularQuadraticSpringsForceField : public core::behavior::ForceField> triangleInfo; + sofa::core::objectmodel::lifecycle::RenamedData> triangleInfo; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData > edgeInfo; + sofa::core::objectmodel::lifecycle::RenamedData > edgeInfo; 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/VectorSpringForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.h index c8f7660ca1e..03680f095eb 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,7 +31,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::spring { @@ -96,19 +96,19 @@ class VectorSpringForceField: public core::behavior::PairInteractionForceField > springArray; + sofa::core::objectmodel::lifecycle::RenamedData > 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::RenamedData m_stiffness; + sofa::core::objectmodel::lifecycle::RenamedData m_stiffness; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData m_viscosity; + sofa::core::objectmodel::lifecycle::RenamedData m_viscosity; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() - sofa::core::objectmodel::RenamedData m_useTopology; + sofa::core::objectmodel::lifecycle::RenamedData m_useTopology; /// where the springs information are stored 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 4734b3db415..32b23bff853 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,7 +33,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::tensormass { @@ -89,10 +89,10 @@ class TetrahedralTensorMassForceField : public core::behavior::ForceField f_poissonRatio; + sofa::core::objectmodel::lifecycle::RenamedData f_poissonRatio; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_TENSORMASS() - sofa::core::objectmodel::RenamedData f_youngModulus; + 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 @@ -166,7 +166,7 @@ class TetrahedralTensorMassForceField : public core::behavior::ForceField edgeInfo; + sofa::core::objectmodel::lifecycle::RenamedData edgeInfo; core::topology::EdgeData < edgeRestInfoVector > d_edgeInfo; ///< Internal edge data 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 8593d337670..7612409982e 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,7 +29,7 @@ #include #include -#include +#include namespace sofa::component::solidmechanics::tensormass { @@ -91,7 +91,7 @@ class TriangularTensorMassForceField : public core::behavior::ForceField> edgeInfo; + sofa::core::objectmodel::lifecycle::RenamedData > edgeInfo; sofa::core::topology::EdgeData > d_edgeInfo; ///< Internal edge data @@ -124,10 +124,10 @@ class TriangularTensorMassForceField : public core::behavior::ForceField f_poissonRatio; + sofa::core::objectmodel::lifecycle::RenamedData f_poissonRatio; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_TENSORMASS() - sofa::core::objectmodel::RenamedData f_youngModulus; + 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/StateContainer/src/sofa/component/statecontainer/MappedObject.h b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.h index 1d96f21d115..c9de6e7431e 100644 --- a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.h +++ b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.h @@ -26,7 +26,7 @@ #include #include -#include +#include namespace sofa::component::statecontainer { @@ -65,10 +65,10 @@ class MappedObject : public core::State void init() override; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_STATECONTAINER() - sofa::core::objectmodel::RenamedData f_X; + sofa::core::objectmodel::lifecycle::RenamedData f_X; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_STATECONTAINER() - sofa::core::objectmodel::RenamedData f_V; + sofa::core::objectmodel::lifecycle::RenamedData f_V; Data d_X; ///< position vector Data d_V; ///< velocity vector 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 ebfc4f3b25c..8a9d87bf9eb 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,7 +24,7 @@ #include -#include +#include namespace sofa::component::topology::container::constant { @@ -97,25 +97,25 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_CONSTANT_API CubeTopology : public MeshT protected: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData nx; + sofa::core::objectmodel::lifecycle::RenamedData nx; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData ny; + sofa::core::objectmodel::lifecycle::RenamedData ny; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData nz; + sofa::core::objectmodel::lifecycle::RenamedData nz; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData internalPoints; + sofa::core::objectmodel::lifecycle::RenamedData internalPoints; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData splitNormals; + sofa::core::objectmodel::lifecycle::RenamedData splitNormals; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData min; + sofa::core::objectmodel::lifecycle::RenamedData min; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData max; + sofa::core::objectmodel::lifecycle::RenamedData max; Data d_nx; ///< x grid resolution 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 4d79f8cff17..ffab38c37f3 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,7 +27,7 @@ #include #include -#include +#include namespace sofa::component::topology::container::constant { @@ -309,40 +309,40 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_CONSTANT_API MeshTopology : public core: typedef type::vector SeqPoints; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData< SeqPoints > seqPoints; + sofa::core::objectmodel::lifecycle::RenamedData< SeqPoints > seqPoints; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData seqEdges; + sofa::core::objectmodel::lifecycle::RenamedData seqEdges; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData seqTriangles; + sofa::core::objectmodel::lifecycle::RenamedData seqTriangles; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData seqQuads; + sofa::core::objectmodel::lifecycle::RenamedData seqQuads; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData seqTetrahedra; + sofa::core::objectmodel::lifecycle::RenamedData seqTetrahedra; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData seqHexahedra; + sofa::core::objectmodel::lifecycle::RenamedData seqHexahedra; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData seqUVs; + sofa::core::objectmodel::lifecycle::RenamedData seqUVs; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData _drawEdges; + sofa::core::objectmodel::lifecycle::RenamedData _drawEdges; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData _drawTriangles; + sofa::core::objectmodel::lifecycle::RenamedData _drawTriangles; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData _drawQuads; + sofa::core::objectmodel::lifecycle::RenamedData _drawQuads; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData _drawTetra; + sofa::core::objectmodel::lifecycle::RenamedData _drawTetra; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData _drawHexa; + sofa::core::objectmodel::lifecycle::RenamedData _drawHexa; Data< SeqPoints > d_seqPoints; ///< List of point positions Data d_seqEdges; ///< List of edge indices 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 d8521b50088..aef14d72cb9 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,7 +22,7 @@ #pragma once #include -#include +#include namespace sofa::component::topology::container::constant { @@ -42,10 +42,10 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_CONSTANT_API SphereQuadTopology : public protected: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData< Vec3 > center; + sofa::core::objectmodel::lifecycle::RenamedData< Vec3 > center; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_CONSTANT() - sofa::core::objectmodel::RenamedData< SReal > radius; + sofa::core::objectmodel::lifecycle::RenamedData< SReal > radius; Data< Vec3 > d_center; ///< Center of the sphere diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/DynamicSparseGridTopologyContainer.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/DynamicSparseGridTopologyContainer.h index 6c3fdd28a7f..2c8ad019160 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/DynamicSparseGridTopologyContainer.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/DynamicSparseGridTopologyContainer.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace sofa::component::topology::container::dynamic { @@ -46,22 +46,22 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API DynamicSparseGridTopologyCon typedef QuadsInHexahedron QuadsInHexahedron; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_DYNAMIC() - sofa::core::objectmodel::RenamedData resolution; + sofa::core::objectmodel::lifecycle::RenamedData resolution; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_DYNAMIC() - sofa::core::objectmodel::RenamedData< sofa::type::vector > valuesIndexedInRegularGrid; + sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector > valuesIndexedInRegularGrid; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_DYNAMIC() - sofa::core::objectmodel::RenamedData< sofa::type::vector > valuesIndexedInTopology; ///< values indexed in the topology + sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector > valuesIndexedInTopology; ///< values indexed in the topology SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_DYNAMIC() - sofa::core::objectmodel::RenamedData< sofa::type::vector > idxInRegularGrid; + sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::vector > idxInRegularGrid; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_DYNAMIC() - sofa::core::objectmodel::RenamedData< std::map< unsigned int, BaseMeshTopology::HexaID> > idInRegularGrid2IndexInTopo; + sofa::core::objectmodel::lifecycle::RenamedData< std::map< unsigned int, BaseMeshTopology::HexaID> > idInRegularGrid2IndexInTopo; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_DYNAMIC() - sofa::core::objectmodel::RenamedData< type::Vec3 > voxelSize; + sofa::core::objectmodel::lifecycle::RenamedData< type::Vec3 > voxelSize; Data d_resolution; ///< voxel grid resolution diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.h index ee9d4404c18..7749c66f00d 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.h @@ -24,7 +24,7 @@ #include -#include +#include namespace sofa::component::topology::container::dynamic { @@ -228,7 +228,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API EdgeSetTopologyContainer : p public: /** The array that stores the set of edges in the edge set */ SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_DYNAMIC() - sofa::core::objectmodel::RenamedData m_checkConnexity; + sofa::core::objectmodel::lifecycle::RenamedData m_checkConnexity; Data< sofa::type::vector > d_edge; ///< List of edge indices diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/PointSetTopologyContainer.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/PointSetTopologyContainer.h index 6ffe3fa0952..f5c28d9b37c 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/PointSetTopologyContainer.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/PointSetTopologyContainer.h @@ -26,7 +26,7 @@ #include #include -#include +#include namespace sofa::component::topology::container::dynamic { @@ -160,7 +160,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API PointSetTopologyContainer : private: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_DYNAMIC() - sofa::core::objectmodel::RenamedData nbPoints; + sofa::core::objectmodel::lifecycle::RenamedData nbPoints; Data d_nbPoints; ///< Number of points }; 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 2f3e6c75206..c9c2d204123 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,7 +26,7 @@ #include -#include +#include namespace sofa::component::topology::container::grid { @@ -82,19 +82,19 @@ public : protected : SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData> _fileTopologies; + sofa::core::objectmodel::lifecycle::RenamedData> _fileTopologies; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData> _dataStiffnessCoefs; + sofa::core::objectmodel::lifecycle::RenamedData> _dataStiffnessCoefs; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData> _dataMassCoefs; + sofa::core::objectmodel::lifecycle::RenamedData> _dataMassCoefs; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData _computeRamifications; + sofa::core::objectmodel::lifecycle::RenamedData _computeRamifications; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData _erasePreviousCoef; + sofa::core::objectmodel::lifecycle::RenamedData _erasePreviousCoef; Data< type::vector< std::string > > d_fileTopologies; ///< All topology filenames 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 560cd3867f6..923960b7bca 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,7 +25,7 @@ #include -#include +#include namespace sofa::component::topology::container::grid { @@ -78,7 +78,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridRamificationTopology enum {UP,DOWN,RIGHT,LEFT,BEFORE,BEHIND,NUM_CONNECTED_NODES}; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData _finestConnectivity; + sofa::core::objectmodel::lifecycle::RenamedData _finestConnectivity; // Does the connectivity test have to be done at the finest level? (more precise but slow) 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 52f204d08ad..7ec17f8c093 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,7 +32,7 @@ #include #include -#include +#include namespace sofa::core::loader { @@ -192,13 +192,13 @@ 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::RenamedData _fillWeighted; + sofa::core::objectmodel::lifecycle::RenamedData _fillWeighted; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData bOnlyInsideCells; + sofa::core::objectmodel::lifecycle::RenamedData bOnlyInsideCells; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData< type::vector< unsigned char > > dataVoxels; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector< unsigned char > > dataVoxels; Data< type::vector< unsigned char > > d_dataVoxels; @@ -212,19 +212,19 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridTopology : public con SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData< sofa::type::Vec< 3, int > > n; + sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::Vec< 3, int > > n; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData _min; + sofa::core::objectmodel::lifecycle::RenamedData _min; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData _max; + sofa::core::objectmodel::lifecycle::RenamedData _max; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData _cellWidth; + sofa::core::objectmodel::lifecycle::RenamedData _cellWidth; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData _nbVirtualFinerLevels; + sofa::core::objectmodel::lifecycle::RenamedData _nbVirtualFinerLevels; bool isVirtual; @@ -238,19 +238,19 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridTopology : public con public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData dataResolution; + sofa::core::objectmodel::lifecycle::RenamedData dataResolution; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData voxelSize; + sofa::core::objectmodel::lifecycle::RenamedData voxelSize; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData marchingCubeStep; + sofa::core::objectmodel::lifecycle::RenamedData marchingCubeStep; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_GRID() - sofa::core::objectmodel::RenamedData convolutionSize; + 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::RenamedData< type::vector< type::vector > > facets; + 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 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 5d2d6d70e5e..234ba72670a 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,7 +29,7 @@ #include -#include +#include namespace sofa::component::topology::mapping { @@ -78,7 +78,7 @@ class SOFA_COMPONENT_TOPOLOGY_MAPPING_API Hexa2QuadTopologicalMapping : public s protected: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData flipNormals; + sofa::core::objectmodel::lifecycle::RenamedData flipNormals; Data d_flipNormals; ///< Flip Normal ? (Inverse point order when creating triangle) 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 f13d26e77ea..53e04c13fb8 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,7 +29,7 @@ #include -#include +#include namespace sofa::component::topology::mapping @@ -77,7 +77,7 @@ class SOFA_COMPONENT_TOPOLOGY_MAPPING_API Hexa2TetraTopologicalMapping : public Index getFromIndex(Index ind) override; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData swapping; + sofa::core::objectmodel::lifecycle::RenamedData swapping; sofa::core::objectmodel::Data d_swapping; ///< Boolean enabling to swapp hexa-edges in order to avoid bias effect 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 12c080e3d8e..b083a5442cd 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,7 +29,7 @@ #include -#include +#include namespace sofa::component::topology::mapping { @@ -53,58 +53,58 @@ class SOFA_COMPONENT_TOPOLOGY_MAPPING_API SubsetTopologicalMapping : public sofa public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData samePoints; + sofa::core::objectmodel::lifecycle::RenamedData samePoints; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData handleEdges; + sofa::core::objectmodel::lifecycle::RenamedData handleEdges; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData handleTriangles; + sofa::core::objectmodel::lifecycle::RenamedData handleTriangles; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData handleQuads; + sofa::core::objectmodel::lifecycle::RenamedData handleQuads; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData handleTetrahedra; + sofa::core::objectmodel::lifecycle::RenamedData handleTetrahedra; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData handleHexahedra; + sofa::core::objectmodel::lifecycle::RenamedData handleHexahedra; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData pointS2D; + sofa::core::objectmodel::lifecycle::RenamedData pointS2D; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData pointD2S; + sofa::core::objectmodel::lifecycle::RenamedData pointD2S; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData edgeS2D; + sofa::core::objectmodel::lifecycle::RenamedData edgeS2D; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData edgeD2S; + sofa::core::objectmodel::lifecycle::RenamedData edgeD2S; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData triangleS2D; + sofa::core::objectmodel::lifecycle::RenamedData triangleS2D; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData triangleD2S; + sofa::core::objectmodel::lifecycle::RenamedData triangleD2S; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData quadS2D; + sofa::core::objectmodel::lifecycle::RenamedData quadS2D; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData quadD2S; + sofa::core::objectmodel::lifecycle::RenamedData quadD2S; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData tetrahedronS2D; + sofa::core::objectmodel::lifecycle::RenamedData tetrahedronS2D; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData tetrahedronD2S; + sofa::core::objectmodel::lifecycle::RenamedData tetrahedronD2S; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData hexahedronS2D; + sofa::core::objectmodel::lifecycle::RenamedData hexahedronS2D; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData hexahedronD2S; + 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 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 d6c599932dd..c38d8c0858b 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,7 +29,7 @@ #include -#include +#include namespace sofa::component::topology::container::dynamic { @@ -84,13 +84,13 @@ class SOFA_COMPONENT_TOPOLOGY_MAPPING_API Tetra2TriangleTopologicalMapping : pub protected: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData flipNormals; + sofa::core::objectmodel::lifecycle::RenamedData flipNormals; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData noNewTriangles; + sofa::core::objectmodel::lifecycle::RenamedData noNewTriangles; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA() - sofa::core::objectmodel::RenamedData noInitialTriangles; + sofa::core::objectmodel::lifecycle::RenamedData noInitialTriangles; Data d_flipNormals; ///< Flip Normal ? (Inverse point order when creating triangle) 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 8b9d51ed1c5..9fa48c8277d 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,7 +29,7 @@ #include -#include +#include #if SOFAMISCTOPOLOGY_HAVE_ZLIB @@ -58,52 +58,52 @@ class SOFA_COMPONENT_TOPOLOGY_UTILITY_API TopologicalChangeProcessor: public cor sofa::core::objectmodel::DataFileName m_filename; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData < type::vector< type::vector > > m_listChanges; + sofa::core::objectmodel::lifecycle::RenamedData < type::vector< type::vector > > m_listChanges; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData m_interval; + sofa::core::objectmodel::lifecycle::RenamedData m_interval; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData m_shift; + sofa::core::objectmodel::lifecycle::RenamedData m_shift; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData m_loop; + sofa::core::objectmodel::lifecycle::RenamedData m_loop; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData m_useDataInputs; + sofa::core::objectmodel::lifecycle::RenamedData m_useDataInputs; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData m_timeToRemove; + sofa::core::objectmodel::lifecycle::RenamedData m_timeToRemove; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData >m_pointsToRemove; + sofa::core::objectmodel::lifecycle::RenamedData >m_pointsToRemove; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData > m_edgesToRemove; + sofa::core::objectmodel::lifecycle::RenamedData > m_edgesToRemove; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData > m_trianglesToRemove; + sofa::core::objectmodel::lifecycle::RenamedData > m_trianglesToRemove; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData > m_quadsToRemove; + sofa::core::objectmodel::lifecycle::RenamedData > m_quadsToRemove; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData > m_tetrahedraToRemove; + sofa::core::objectmodel::lifecycle::RenamedData > m_tetrahedraToRemove; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData > m_hexahedraToRemove; + sofa::core::objectmodel::lifecycle::RenamedData > m_hexahedraToRemove; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData m_saveIndicesAtInit; + sofa::core::objectmodel::lifecycle::RenamedData m_saveIndicesAtInit; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData m_epsilonSnapPath; + sofa::core::objectmodel::lifecycle::RenamedData m_epsilonSnapPath; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData m_epsilonSnapBorder; + sofa::core::objectmodel::lifecycle::RenamedData m_epsilonSnapBorder; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_UTILITY() - sofa::core::objectmodel::RenamedData m_draw; + 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/Visual/src/sofa/component/visual/BaseCamera.h b/Sofa/Component/Visual/src/sofa/component/visual/BaseCamera.h index 5512f37e7ed..0e9e82b9d99 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/BaseCamera.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/BaseCamera.h @@ -30,7 +30,7 @@ #include #include -#include +#include namespace sofa::component::visual { @@ -68,55 +68,55 @@ class SOFA_COMPONENT_VISUAL_API BaseCamera : public core::objectmodel::BaseObjec }; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_position; + sofa::core::objectmodel::lifecycle::RenamedData p_position; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_orientation; + sofa::core::objectmodel::lifecycle::RenamedData p_orientation; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_lookAt; + sofa::core::objectmodel::lifecycle::RenamedData p_lookAt; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_distance; + sofa::core::objectmodel::lifecycle::RenamedData p_distance; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_fieldOfView; + sofa::core::objectmodel::lifecycle::RenamedData p_fieldOfView; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_zNear; + sofa::core::objectmodel::lifecycle::RenamedData p_zNear; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_zFar; + sofa::core::objectmodel::lifecycle::RenamedData p_zFar; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_computeZClip; + sofa::core::objectmodel::lifecycle::RenamedData p_computeZClip; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_minBBox; + sofa::core::objectmodel::lifecycle::RenamedData p_minBBox; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_maxBBox; + sofa::core::objectmodel::lifecycle::RenamedData p_maxBBox; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_widthViewport; + sofa::core::objectmodel::lifecycle::RenamedData p_widthViewport; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_heightViewport; + sofa::core::objectmodel::lifecycle::RenamedData p_heightViewport; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_type; + sofa::core::objectmodel::lifecycle::RenamedData p_type; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_activated; + sofa::core::objectmodel::lifecycle::RenamedData p_activated; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_fixedLookAtPoint; + sofa::core::objectmodel::lifecycle::RenamedData p_fixedLookAtPoint; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData > p_modelViewMatrix; + sofa::core::objectmodel::lifecycle::RenamedData > p_modelViewMatrix; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData > p_projectionMatrix; + sofa::core::objectmodel::lifecycle::RenamedData > p_projectionMatrix; Data d_position; ///< Camera's position diff --git a/Sofa/Component/Visual/src/sofa/component/visual/InteractiveCamera.h b/Sofa/Component/Visual/src/sofa/component/visual/InteractiveCamera.h index b8fc38d4913..35cf08acd05 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/InteractiveCamera.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/InteractiveCamera.h @@ -25,7 +25,7 @@ #include #include -#include +#include namespace sofa::core::objectmodel { @@ -46,13 +46,13 @@ class SOFA_COMPONENT_VISUAL_API InteractiveCamera : public BaseCamera enum { CAMERA_LOOKAT_PIVOT = 0, CAMERA_POSITION_PIVOT = 1, SCENE_CENTER_PIVOT = 2, WORLD_CENTER_PIVOT = 3}; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_zoomSpeed; + sofa::core::objectmodel::lifecycle::RenamedData p_zoomSpeed; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_panSpeed; + sofa::core::objectmodel::lifecycle::RenamedData p_panSpeed; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_pivot; + sofa::core::objectmodel::lifecycle::RenamedData p_pivot; Data d_zoomSpeed; ///< Zoom Speed Data d_panSpeed; ///< Pan Speed diff --git a/Sofa/Component/Visual/src/sofa/component/visual/RecordedCamera.h b/Sofa/Component/Visual/src/sofa/component/visual/RecordedCamera.h index 6c1f6f9591f..4675f3a40f0 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/RecordedCamera.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/RecordedCamera.h @@ -26,7 +26,7 @@ #include #include -#include +#include namespace sofa::component::visual { @@ -81,58 +81,58 @@ class SOFA_COMPONENT_VISUAL_API RecordedCamera : public BaseCamera public: SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_zoomSpeed; + sofa::core::objectmodel::lifecycle::RenamedData p_zoomSpeed; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_panSpeed; + sofa::core::objectmodel::lifecycle::RenamedData p_panSpeed; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_pivot; + sofa::core::objectmodel::lifecycle::RenamedData p_pivot; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_startTime; + sofa::core::objectmodel::lifecycle::RenamedData m_startTime; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_endTime; + sofa::core::objectmodel::lifecycle::RenamedData m_endTime; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_rotationMode; + sofa::core::objectmodel::lifecycle::RenamedData m_rotationMode; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_translationMode; + sofa::core::objectmodel::lifecycle::RenamedData m_translationMode; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_navigationMode; + sofa::core::objectmodel::lifecycle::RenamedData m_navigationMode; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_rotationSpeed; + sofa::core::objectmodel::lifecycle::RenamedData m_rotationSpeed; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_rotationCenter; + sofa::core::objectmodel::lifecycle::RenamedData m_rotationCenter; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_rotationStartPoint; + sofa::core::objectmodel::lifecycle::RenamedData m_rotationStartPoint; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_rotationLookAt; + sofa::core::objectmodel::lifecycle::RenamedData m_rotationLookAt; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_rotationAxis; + sofa::core::objectmodel::lifecycle::RenamedData m_rotationAxis; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_cameraUp; + sofa::core::objectmodel::lifecycle::RenamedData m_cameraUp; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_drawRotation; + sofa::core::objectmodel::lifecycle::RenamedData p_drawRotation; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData p_drawTranslation; + sofa::core::objectmodel::lifecycle::RenamedData p_drawTranslation; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData> m_translationPositions; + sofa::core::objectmodel::lifecycle::RenamedData> m_translationPositions; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData > m_translationOrientations; + sofa::core::objectmodel::lifecycle::RenamedData > m_translationOrientations; Data d_startTime; ///< Time when the camera moves will start Data d_endTime; ///< Time when the camera moves will end (or loop) diff --git a/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h b/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h index a225821b27d..2760ecc16ef 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h @@ -32,7 +32,7 @@ #include -#include +#include namespace sofa::component::visual { @@ -85,55 +85,55 @@ class SOFA_COMPONENT_VISUAL_API VisualModelImpl : public core::visual::VisualMod sofa::core::topology::BaseMeshTopology* m_topology; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_initRestPositions; + sofa::core::objectmodel::lifecycle::RenamedData m_initRestPositions; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_useNormals; + sofa::core::objectmodel::lifecycle::RenamedData m_useNormals; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_updateNormals; + sofa::core::objectmodel::lifecycle::RenamedData m_updateNormals; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_computeTangents; + sofa::core::objectmodel::lifecycle::RenamedData m_computeTangents; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_updateTangents; + sofa::core::objectmodel::lifecycle::RenamedData m_updateTangents; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_handleDynamicTopology; + sofa::core::objectmodel::lifecycle::RenamedData m_handleDynamicTopology; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_fixMergedUVSeams; + sofa::core::objectmodel::lifecycle::RenamedData m_fixMergedUVSeams; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_keepLines; + sofa::core::objectmodel::lifecycle::RenamedData m_keepLines; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData m_vertices2; + sofa::core::objectmodel::lifecycle::RenamedData m_vertices2; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< VecTexCoord > m_vtexcoords; + sofa::core::objectmodel::lifecycle::RenamedData< VecTexCoord > m_vtexcoords; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< VecCoord > m_vtangents; + sofa::core::objectmodel::lifecycle::RenamedData< VecCoord > m_vtangents; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< VecCoord > m_vbitangents; + sofa::core::objectmodel::lifecycle::RenamedData< VecCoord > m_vbitangents; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< VecVisualEdge > m_edges; + sofa::core::objectmodel::lifecycle::RenamedData< VecVisualEdge > m_edges; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< VecVisualTriangle > m_triangles; + sofa::core::objectmodel::lifecycle::RenamedData< VecVisualTriangle > m_triangles; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< VecVisualQuad > m_quads; + sofa::core::objectmodel::lifecycle::RenamedData< VecVisualQuad > m_quads; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< type::vector > m_vertPosIdx; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector > m_vertPosIdx; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< type::vector > m_vertNormIdx; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector > m_vertNormIdx; Data d_initRestPositions; ///< True if rest positions must be initialized with initial positions @@ -182,19 +182,19 @@ class SOFA_COMPONENT_VISUAL_API VisualModelImpl : public core::visual::VisualMod typedef sofa::type::Vec<3,Real> Vec3Real; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< Vec3Real >m_translation; + sofa::core::objectmodel::lifecycle::RenamedData< Vec3Real >m_translation; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< Vec3Real > m_rotation; + sofa::core::objectmodel::lifecycle::RenamedData< Vec3Real > m_rotation; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< Vec3Real >m_scale; + sofa::core::objectmodel::lifecycle::RenamedData< Vec3Real >m_scale; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< TexCoord > m_scaleTex; + sofa::core::objectmodel::lifecycle::RenamedData< TexCoord > m_scaleTex; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< TexCoord > m_translationTex; + sofa::core::objectmodel::lifecycle::RenamedData< TexCoord > m_translationTex; Data< Vec3Real > d_translation; ///< Initial Translation of the object Data< Vec3Real > d_rotation; ///< Initial Rotation of the object @@ -237,13 +237,13 @@ class SOFA_COMPONENT_VISUAL_API VisualModelImpl : public core::visual::VisualMod sofa::type::Vec3f bbox[2]; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< sofa::type::Material >material; + sofa::core::objectmodel::lifecycle::RenamedData< sofa::type::Material >material; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData putOnlyTexCoords; + sofa::core::objectmodel::lifecycle::RenamedData putOnlyTexCoords; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData srgbTexturing; + sofa::core::objectmodel::lifecycle::RenamedData srgbTexturing; Data< sofa::type::Material > d_material; Data< bool > d_putOnlyTexCoords; @@ -283,10 +283,10 @@ class SOFA_COMPONENT_VISUAL_API VisualModelImpl : public core::visual::VisualMod } }; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< type::vector > materials; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector > materials; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData< type::vector > groups; + sofa::core::objectmodel::lifecycle::RenamedData< type::vector > groups; Data< type::vector > d_materials; Data< type::vector > d_groups; diff --git a/Sofa/Component/Visual/src/sofa/component/visual/VisualStyle.h b/Sofa/Component/Visual/src/sofa/component/visual/VisualStyle.h index e566118cdab..3b8fdef9203 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/VisualStyle.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/VisualStyle.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace sofa::component::visual { @@ -75,7 +75,7 @@ class SOFA_COMPONENT_VISUAL_API VisualStyle : public sofa::core::visual::BaseVis bool removeInNode( sofa::core::objectmodel::BaseNode* node ); SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData displayFlags; + sofa::core::objectmodel::lifecycle::RenamedData displayFlags; Data d_displayFlags; ///< Display Flags diff --git a/Sofa/Component/Visual/src/sofa/component/visual/VisualTransform.h b/Sofa/Component/Visual/src/sofa/component/visual/VisualTransform.h index 9fe684a9f5a..ae9d6842d1f 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/VisualTransform.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/VisualTransform.h @@ -25,7 +25,7 @@ #include #include -#include +#include namespace sofa::component::visual { @@ -53,10 +53,10 @@ class SOFA_COMPONENT_VISUAL_API VisualTransform : public sofa::core::visual::Vis void drawTransparent(const sofa::core::visual::VisualParams* vparams) override; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData transform; + sofa::core::objectmodel::lifecycle::RenamedData transform; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() - sofa::core::objectmodel::RenamedData recursive; + sofa::core::objectmodel::lifecycle::RenamedData recursive; Data d_transform; ///< Transformation to apply Data d_recursive; ///< True to apply transform to all nodes below diff --git a/Sofa/framework/Core/CMakeLists.txt b/Sofa/framework/Core/CMakeLists.txt index f7a751ed632..35669bcbb87 100644 --- a/Sofa/framework/Core/CMakeLists.txt +++ b/Sofa/framework/Core/CMakeLists.txt @@ -151,8 +151,6 @@ set(HEADER_FILES ${SRC_ROOT}/objectmodel/DataFileName.h ${SRC_ROOT}/objectmodel/DataFileNameVector.h ${SRC_ROOT}/objectmodel/DataLink.h - ${SRC_ROOT}/objectmodel/DeprecatedData.h - ${SRC_ROOT}/objectmodel/RemovedData.h ${SRC_ROOT}/objectmodel/DetachNodeEvent.h ${SRC_ROOT}/objectmodel/Event.h ${SRC_ROOT}/objectmodel/GUIEvent.h @@ -161,9 +159,11 @@ set(HEADER_FILES ${SRC_ROOT}/objectmodel/JoystickEvent.h ${SRC_ROOT}/objectmodel/KeypressedEvent.h ${SRC_ROOT}/objectmodel/KeyreleasedEvent.h + ${SRC_ROOT}/objectmodel/lifecycle/DeprecatedData.h + ${SRC_ROOT}/objectmodel/lifecycle/RemovedData.h + ${SRC_ROOT}/objectmodel/lifecycle/RenamedData.h ${SRC_ROOT}/objectmodel/Link.h ${SRC_ROOT}/objectmodel/MouseEvent.h - ${SRC_ROOT}/objectmodel/RenamedData.h ${SRC_ROOT}/objectmodel/SPtr.h ${SRC_ROOT}/objectmodel/ScriptEvent.h ${SRC_ROOT}/objectmodel/TypeOfInsertion.h @@ -299,7 +299,6 @@ set(SOURCE_FILES ${SRC_ROOT}/objectmodel/DataFileNameVector.cpp ${SRC_ROOT}/objectmodel/DataLink.cpp ${SRC_ROOT}/objectmodel/DetachNodeEvent.cpp - ${SRC_ROOT}/objectmodel/DeprecatedData.cpp ${SRC_ROOT}/objectmodel/Event.cpp ${SRC_ROOT}/objectmodel/GUIEvent.cpp ${SRC_ROOT}/objectmodel/HapticDeviceEvent.cpp @@ -307,6 +306,7 @@ set(SOURCE_FILES ${SRC_ROOT}/objectmodel/JoystickEvent.cpp ${SRC_ROOT}/objectmodel/KeypressedEvent.cpp ${SRC_ROOT}/objectmodel/KeyreleasedEvent.cpp + ${SRC_ROOT}/objectmodel/lifecycle/DeprecatedData.cpp ${SRC_ROOT}/objectmodel/MouseEvent.cpp ${SRC_ROOT}/objectmodel/ScriptEvent.cpp ${SRC_ROOT}/objectmodel/Tag.cpp diff --git a/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraintSet.h b/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraintSet.h index 8e0d839fcba..896e7641675 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraintSet.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraintSet.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace sofa::core::behavior { @@ -94,7 +94,7 @@ class SOFA_CORE_API BaseConstraintSet : public virtual objectmodel::BaseObject 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::RenamedData< unsigned int > m_constraintIndex; + sofa::core::objectmodel::lifecycle::RenamedData< unsigned int > m_constraintIndex; bool insertInNode( objectmodel::BaseNode* node ) override; bool removeInNode( objectmodel::BaseNode* node ) override; diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/Base.h b/Sofa/framework/Core/src/sofa/core/objectmodel/Base.h index f1a71498c83..81202a77fc3 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/Base.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/Base.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/DeprecatedData.cpp b/Sofa/framework/Core/src/sofa/core/objectmodel/lifecycle/DeprecatedData.cpp similarity index 97% rename from Sofa/framework/Core/src/sofa/core/objectmodel/DeprecatedData.cpp rename to Sofa/framework/Core/src/sofa/core/objectmodel/lifecycle/DeprecatedData.cpp index 5b1f42517be..b31e699fa5a 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/DeprecatedData.cpp +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/lifecycle/DeprecatedData.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace sofa::core::objectmodel::lifecycle { diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/DeprecatedData.h b/Sofa/framework/Core/src/sofa/core/objectmodel/lifecycle/DeprecatedData.h similarity index 100% rename from Sofa/framework/Core/src/sofa/core/objectmodel/DeprecatedData.h rename to Sofa/framework/Core/src/sofa/core/objectmodel/lifecycle/DeprecatedData.h diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/RemovedData.h b/Sofa/framework/Core/src/sofa/core/objectmodel/lifecycle/RemovedData.h similarity index 97% rename from Sofa/framework/Core/src/sofa/core/objectmodel/RemovedData.h rename to Sofa/framework/Core/src/sofa/core/objectmodel/lifecycle/RemovedData.h index 43e501af011..78c6fffcf1e 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/RemovedData.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/lifecycle/RemovedData.h @@ -23,7 +23,7 @@ #include #include -#include +#include namespace sofa::core::objectmodel::lifecycle { diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/RenamedData.h b/Sofa/framework/Core/src/sofa/core/objectmodel/lifecycle/RenamedData.h similarity index 99% rename from Sofa/framework/Core/src/sofa/core/objectmodel/RenamedData.h rename to Sofa/framework/Core/src/sofa/core/objectmodel/lifecycle/RenamedData.h index 47b4933a87c..f22e7149b7e 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/RenamedData.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/lifecycle/RenamedData.h @@ -6,7 +6,7 @@ namespace sofa { -namespace core::objectmodel +namespace core::objectmodel::lifecycle { diff --git a/Sofa/framework/Core/test/objectmodel/RemovedData_test.cpp b/Sofa/framework/Core/test/objectmodel/RemovedData_test.cpp index e06de833344..9ee53e0530b 100644 --- a/Sofa/framework/Core/test/objectmodel/RemovedData_test.cpp +++ b/Sofa/framework/Core/test/objectmodel/RemovedData_test.cpp @@ -25,7 +25,7 @@ using sofa::core::objectmodel::BaseObject ; #include using sofa::testing::BaseTest; -#include +#include using sofa::core::objectmodel::lifecycle::DeprecatedData; using sofa::core::objectmodel::lifecycle::RemovedData;