diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAPNarrowPhase.h b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAPNarrowPhase.h index ae4fe92de14..cdfe4e642b5 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAPNarrowPhase.h +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAPNarrowPhase.h @@ -63,9 +63,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API DirectSAPNarrowPhase : pu */ void updateBoxes(); - SOFA_ATTRIBUTE_DISABLED__DRAWNARROWPHASE() - sofa::core::objectmodel::lifecycle::RemovedData d_draw{this, "v23.12", "v24.06", "draw", "Use display flag 'showDetectionOutputs' instead"}; ///< enable/disable display of results - Data d_showOnlyInvestigatedBoxes; ///< Show only boxes which will be sent to narrow phase Data d_nbPairs; ///< number of pairs of elements sent to narrow phase diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.h b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.h index 4208f6570c0..1686e74a5bc 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.h +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.h @@ -44,10 +44,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API RayTraceNarrowPhase : pub public: SOFA_CLASS(RayTraceNarrowPhase, core::collision::NarrowPhaseDetection); -private: - SOFA_ATTRIBUTE_DISABLED__DRAWNARROWPHASE() - sofa::core::objectmodel::lifecycle::RemovedData bDraw{this, "v23.12", "v24.06", "draw", "Use display flag 'showDetectionOutputs' instead"}; ///< enable/disable display of results - protected: RayTraceNarrowPhase() = default; diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/config.h.in b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/config.h.in index 64fa0a436a9..e2d916b8e87 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/config.h.in +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/config.h.in @@ -31,23 +31,6 @@ # define SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API SOFA_IMPORT_DYNAMIC_LIBRARY #endif -#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM -#define SOFA_ATTRIBUTE_DISABLED__RENAME_COLLISIONPIPELINE() -#else -#define SOFA_ATTRIBUTE_DISABLED__RENAME_COLLISIONPIPELINE() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.06", "v23.12", \ - "DefaultPipeline renamed as CollisionPipeline in #3590: sofa/component/collision/detection/algorithm/CollisionPipeline.h") -#endif - -#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION -# define SOFA_ATTRIBUTE_DISABLED__DRAWNARROWPHASE() -#else -# define SOFA_ATTRIBUTE_DISABLED__DRAWNARROWPHASE() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.12", "v24.06", "This data is not used anymore: the drawing is now controlled by a draw flag") -#endif - #ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM #define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM() #else 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 3d86715d815..9e211e90ebd 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 @@ -67,28 +67,6 @@ public : if (arg) obj->parse(arg); - //SOFA_ATTRIBUTE_DISABLED("v21.12 (PR#2522)", "v24.06","This attribute was only added to build a compatibility layer on the response name.") - { - static const std::map renamingResponseMethod = { - {"ray", "RayContact"}, - {"default", "PenalityContactForceField"}, - {"FrictionContact", "FrictionContactConstraint"}, - {"registration", "RegistrationContactForceField"}, - {"stick", "StickContactForceField"}, - }; - - const std::string responseDesired = arg->getAttribute("response",""); - const auto it = renamingResponseMethod.find(responseDesired); - - if(it != renamingResponseMethod.end()) - { - msg_error("CollisionResponse") - << "Option \"" << it->first << "\" " - << "for data \"response\" has been renamed since v21.12 (PR#2522). " - << "Use \"" << it->second << "\" instead."; - } - } - return obj; } diff --git a/Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/BarycentricContactMapper.h b/Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/BarycentricContactMapper.h index 89907e5cf8b..8bbda24883c 100644 --- a/Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/BarycentricContactMapper.h +++ b/Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/BarycentricContactMapper.h @@ -53,9 +53,6 @@ class BarycentricContactMapper : public BaseContactMapper typename MMapping::SPtr mapping; typename MMapper::SPtr mapper; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Size, sofa::Size); - BarycentricContactMapper() : model(nullptr), mapping(nullptr), mapper(nullptr) { diff --git a/Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/TetrahedronBarycentricContactMapper.h b/Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/TetrahedronBarycentricContactMapper.h index c3f0e5987cd..48bb5d4e5ca 100644 --- a/Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/TetrahedronBarycentricContactMapper.h +++ b/Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/TetrahedronBarycentricContactMapper.h @@ -34,7 +34,6 @@ template class ContactMapper : public BarycentricContactMapper { public: - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index); typedef typename DataTypes::Real Real; typedef typename DataTypes::Coord Coord; sofa::Index addPoint(const Coord& P, sofa::Index index, Real&) 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 522388dddbd..55243ae5c5f 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 @@ -149,7 +149,6 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER_API GenericConstraintSolver : sofa::type::fixed_array m_cpBuffer; sofa::type::fixed_array m_cpIsLocked; GenericConstraintProblem *current_cp, *last_cp; - SOFA_ATTRIBUTE_DISABLED__GENERICCONSTRAINTSOLVER_CONSTRAINTCORRECTIONS() DeprecatedAndRemoved constraintCorrections; //use ConstraintSolverImpl::l_constraintCorrections instead sofa::core::MultiVecDerivId m_lambdaId; sofa::core::MultiVecDerivId m_dxId; 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 80b367b13ae..82d342c245b 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 @@ -167,7 +167,6 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER_API LCPConstraintSolver : publ void keepContactForcesValue(); unsigned int _numConstraints; - SOFA_ATTRIBUTE_DEPRECATED__LCPCONSTRAINTSOLVERMUMEMBER() DeprecatedAndRemoved _mu; /// Multigrid hierarchy is resized and cleared void buildHierarchy(); diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/config.h.in b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/config.h.in index 36732ebfcea..8751f520312 100644 --- a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/config.h.in +++ b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/config.h.in @@ -38,23 +38,6 @@ namespace sofa::component::constraint::lagrangian::solver } // namespace sofa::component::constraint::lagrangian::solver -// deprecate _mu as member -#ifdef SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER -#define SOFA_ATTRIBUTE_DEPRECATED__LCPCONSTRAINTSOLVERMUMEMBER() -#else -#define SOFA_ATTRIBUTE_DEPRECATED__LCPCONSTRAINTSOLVERMUMEMBER() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.12", "v24.06", "_mu is not a member anymore. Use the Data \"mu\" to get the friction value.") -#endif // SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER - -#ifdef SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER -#define SOFA_ATTRIBUTE_DISABLED__GENERICCONSTRAINTSOLVER_CONSTRAINTCORRECTIONS() -#else -#define SOFA_ATTRIBUTE_DISABLED__GENERICCONSTRAINTSOLVER_CONSTRAINTCORRECTIONS() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.12", "v23.12", "Use ConstraintSolverImpl::l_constraintCorrections instead") -#endif // SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER - #ifdef SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER #define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER() #else 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 a4d357e85ae..c23903fe532 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 @@ -69,7 +69,6 @@ class DirectionProjectiveConstraint : public core::behavior::ProjectiveConstrain typedef Data DataVecDeriv; typedef Data DataMatrixDeriv; typedef type::vector Indices; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); typedef sofa::core::topology::TopologySubsetIndices IndexSubsetData; typedef linearalgebra::EigenBaseSparseMatrix BaseSparseMatrix; typedef linearalgebra::EigenSparseMatrix SparseMatrix; diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedProjectiveConstraint.h index f10acb6c553..5e72b7d5217 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedProjectiveConstraint.h @@ -70,7 +70,6 @@ class FixedProjectiveConstraint : public core::behavior::ProjectiveConstraintSet typedef sofa::core::topology::TopologySubsetIndices SetIndex; typedef sofa::core::topology::Point Point; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec3, sofa::type::Vec3); protected: FixedProjectiveConstraint(); 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 3cdcedd43f0..2d16f87673e 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 @@ -69,7 +69,6 @@ class LineProjectiveConstraint : public core::behavior::ProjectiveConstraintSet< typedef Data DataVecCoord; typedef Data DataVecDeriv; typedef Data DataMatrixDeriv; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); typedef type::vector Indices; typedef sofa::core::topology::TopologySubsetIndices IndexSubsetData; typedef linearalgebra::EigenBaseSparseMatrix BaseSparseMatrix; 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 740ef0e65c5..fa5b4824ca5 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 @@ -76,8 +76,6 @@ class PlaneProjectiveConstraint : public core::behavior::ProjectiveConstraintSet typedef typename SparseMatrix::Block Block; ///< projection matrix of a particle displacement to the plane enum {bsize=SparseMatrix::Nin}; ///< size of a block - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - protected: PlaneProjectiveConstraint(); 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 3289f2a4762..66f4620fc8a 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 @@ -69,8 +69,6 @@ class PointProjectiveConstraint : public core::behavior::ProjectiveConstraintSet typedef type::vector SetIndexArray; typedef sofa::core::topology::TopologySubsetIndices SetIndex; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - protected: PointProjectiveConstraint(); diff --git a/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/GenerateRigidMass.h b/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/GenerateRigidMass.h index db479ad9437..8c0e7bd1450 100644 --- a/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/GenerateRigidMass.h +++ b/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/GenerateRigidMass.h @@ -48,7 +48,6 @@ class GenerateRigidMass : public core::DataEngine void doUpdate() override; protected: - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); typedef type::fixed_array MTriangle; typedef type::fixed_array MQuad; typedef type::vector MPolygon; diff --git a/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/MeshBarycentricMapperEngine.h b/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/MeshBarycentricMapperEngine.h index 7f881033421..ee21a715cfa 100644 --- a/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/MeshBarycentricMapperEngine.h +++ b/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/MeshBarycentricMapperEngine.h @@ -45,7 +45,6 @@ class MeshBarycentricMapperEngine : public core::DataEngine typedef typename DataTypes::Real Real; typedef type::Vec<3,Real> Vec3; typedef type::Mat<3,3,Real> Mat3x3; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index); typedef typename sofa::type::vector VecIndices; protected: diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ComplementaryROI.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ComplementaryROI.h index 6388c4652b4..3a0b3d39a16 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ComplementaryROI.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ComplementaryROI.h @@ -44,11 +44,8 @@ class ComplementaryROI : public core::DataEngine SOFA_CLASS(SOFA_TEMPLATE(ComplementaryROI, DataTypes), core::DataEngine); typedef typename DataTypes::VecCoord VecCoord; - - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index); typedef core::topology::BaseMeshTopology::SetIndex SetIndex; - ComplementaryROI(); ~ComplementaryROI() override; diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/IndicesFromValues.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/IndicesFromValues.h index 28ea9777b48..d933f908a81 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/IndicesFromValues.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/IndicesFromValues.h @@ -43,7 +43,6 @@ class IndicesFromValues : public core::DataEngine typedef T Value; typedef sofa::type::vector VecValue; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index); typedef sofa::type::vector VecIndex; protected: diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MergeROIs.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MergeROIs.h index 4098287c09a..1b1e49511a8 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MergeROIs.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MergeROIs.h @@ -42,9 +42,6 @@ class SOFA_COMPONENT_ENGINE_SELECT_API MergeROIs : public sofa::core::DataEngine public: SOFA_CLASS(MergeROIs, DataEngine); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Inherited, Inherit1); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index); - //Input Data d_nbROIs; ///< size of indices/value vector core::objectmodel::vectorData > f_indices; diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshBoundaryROI.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshBoundaryROI.h index 83f6c40ef05..90543496ccf 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshBoundaryROI.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshBoundaryROI.h @@ -40,7 +40,6 @@ class MeshBoundaryROI : public core::DataEngine { public: SOFA_CLASS(MeshBoundaryROI, DataEngine); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Inherited, Inherit1); typedef core::topology::BaseMeshTopology::Triangle Triangle; typedef core::topology::BaseMeshTopology::SeqTriangles SeqTriangles; diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SelectConnectedLabelsROI.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SelectConnectedLabelsROI.h index 80cf6e6391a..b39623c137b 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SelectConnectedLabelsROI.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SelectConnectedLabelsROI.h @@ -42,9 +42,6 @@ class SelectConnectedLabelsROI : public sofa::core::DataEngine typedef _T T; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Inherited, Inherit1); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index); - //Input Data d_nbLabels; ///< number of label lists typedef type::vector > VecVLabels; diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SelectLabelROI.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SelectLabelROI.h index 2202660d8de..fae9307bb55 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SelectLabelROI.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SelectLabelROI.h @@ -43,8 +43,6 @@ class SelectLabelROI : public sofa::core::DataEngine SOFA_CLASS(SOFA_TEMPLATE(SelectLabelROI,_T), DataEngine); typedef _T T; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Inherited, Inherit1); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index); //Input Data > > d_labels; ///< lists of labels associated to each point/cell diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ValuesFromIndices.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ValuesFromIndices.h index 4c17af008a0..859d7ef5887 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ValuesFromIndices.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ValuesFromIndices.h @@ -44,8 +44,6 @@ class ValuesFromIndices : public core::DataEngine SOFA_CLASS(SOFA_TEMPLATE(ValuesFromIndices,T),core::DataEngine); typedef T Value; typedef sofa::type::vector VecValue; - - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index); typedef sofa::type::vector VecIndex; protected: diff --git a/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/MapIndices.h b/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/MapIndices.h index cfa73d0aef6..664a63faa4f 100644 --- a/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/MapIndices.h +++ b/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/MapIndices.h @@ -42,7 +42,6 @@ class MapIndices : public core::DataEngine SOFA_CLASS(SOFA_TEMPLATE(MapIndices,T),core::DataEngine); typedef T Value; typedef sofa::type::vector VecValue; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index); typedef sofa::type::vector VecIndex; typedef std::map MapIndex; protected: diff --git a/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/ROIValueMapper.h b/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/ROIValueMapper.h index 89572fda9e2..9553e7e641c 100644 --- a/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/ROIValueMapper.h +++ b/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/ROIValueMapper.h @@ -42,8 +42,6 @@ class ROIValueMapper : public sofa::core::DataEngine typedef core::DataEngine Inherited; SOFA_CLASS(ROIValueMapper,Inherited); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Real, SReal); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index); //Input Data nbROIs; ///< size of indices/value vector diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/BTDLinearSolver.h b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/BTDLinearSolver.h index b84246a5ad5..6c66bd9b86e 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/BTDLinearSolver.h +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/BTDLinearSolver.h @@ -54,9 +54,6 @@ class BTDLinearSolver : public sofa::component::linearsolver::MatrixLinearSolver Data d_subpartSolve; ///< Allows for the computation of a subpart of the system Data d_verification; ///< verification of the subpartSolve - SOFA_ATTRIBUTE_DISABLED__BTDLINEARSOLVER_DATABLOCKSIZE("d_blockSize has been deleted, as it was never actually used.") - DeprecatedAndRemoved d_blockSize; - typedef typename Vector::SubVectorType SubVector; typedef typename Matrix::SubMatrixType SubMatrix; typedef typename Vector::Real Real; diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/CholeskySolver.h b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/CholeskySolver.h index 20bc2ee873c..94543160893 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/CholeskySolver.h +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/CholeskySolver.h @@ -46,9 +46,6 @@ class CholeskySolver : public sofa::component::linearsolver::MatrixLinearSolver< typedef typename Vector::Real Real; typedef sofa::component::linearsolver::MatrixLinearSolver Inherit; - SOFA_ATTRIBUTE_DISABLED__SOLVER_DIRECT_VERBOSEDATA() - sofa::core::objectmodel::lifecycle::RemovedData f_verbose{this, "v23.12", "v24.06", "verbose", "This Data is no longer used"}; - CholeskySolver(); /// Compute x such as Mx=b. M is not used, it must have been factored before using method invert(Matrix& M) 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 118f170edc3..bb5cb55e283 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 @@ -93,9 +93,6 @@ class PrecomputedLinearSolver : public sofa::component::linearsolver::MatrixLine Data d_use_file; ///< Dump system matrix in a file Data init_Tolerance; - SOFA_ATTRIBUTE_DISABLED__SOLVER_DIRECT_VERBOSEDATA() - sofa::core::objectmodel::lifecycle::RemovedData f_verbose{this, "v23.12", "v24.06", "verbose", "This Data is no longer used"}; - PrecomputedLinearSolver(); void solve (TMatrix& M, TVector& x, TVector& b) override; void invert(TMatrix& M) override; diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseCommon.h b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseCommon.h index 93357bfd946..8c8f8914fe9 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseCommon.h +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseCommon.h @@ -41,11 +41,6 @@ SOFA_ATTRIBUTE_DEPRECATED__SPARSECOMMON() SOFA_COMPONENT_LINEARSOLVER_DIRECT_API void csrToAdj(int n, int * M_colptr, int * M_rowind, type::vector& adj, type::vector& xadj, type::vector& t_adj, type::vector& t_xadj, type::vector& tran_countvec ); -// compute the fill reducing permutation via METIS -SOFA_ATTRIBUTE_DISABLED("v24.06", "v24.06", "This function depends on Metis which has been removed as a dependency.") -void fillReducingPermutation(int nbColumns, int *columns, int* rowIndices, - int * perm,int * invperm) = delete; - // compare the shape of two matrix given in CSR format, return false if the matrices have the same shape and return true if their shapes are different inline bool compareMatrixShape(int s_M, int * M_colptr,int * M_rowind, int s_P, int * P_colptr,int * P_rowind) { if (s_M != s_P) return true; diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/config.h.in b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/config.h.in index 206f32f9fbd..7034cc3535c 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/config.h.in +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/config.h.in @@ -37,21 +37,6 @@ namespace sofa::component::linearsolver::direct constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::linearsolver::direct -#ifdef SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_DIRECT -#define SOFA_ATTRIBUTE_DISABLED__BTDLINEARSOLVER_DATABLOCKSIZE(msg) -#else -#define SOFA_ATTRIBUTE_DISABLED__BTDLINEARSOLVER_DATABLOCKSIZE(msg) \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.06", "v23.12", msg) -#endif // SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_DIRECT - -#ifdef SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_DIRECT -#define SOFA_ATTRIBUTE_DISABLED__SOLVER_DIRECT_VERBOSEDATA() -#else -#define SOFA_ATTRIBUTE_DISABLED__SOLVER_DIRECT_VERBOSEDATA() \ - SOFA_ATTRIBUTE_DISABLED("v23.12", "v24.06", "This Data is no longer used") -#endif // SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_DIRECT - #ifdef SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_DIRECT #define SOFA_ATTRIBUTE_DEPRECATED__SPARSECOMMON() #else diff --git a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/MinResLinearSolver.h b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/MinResLinearSolver.h index 961d8cb501d..2f072621a82 100644 --- a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/MinResLinearSolver.h +++ b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/MinResLinearSolver.h @@ -46,9 +46,6 @@ class MinResLinearSolver : public sofa::component::linearsolver::MatrixLinearSol Data f_maxIter; ///< maximum number of iterations of the Conjugate Gradient solution Data f_tolerance; ///< desired precision of the Conjugate Gradient Solution (ratio of current residual norm over initial residual norm) - SOFA_ATTRIBUTE_DISABLED__SOLVER_ITERATIVE_VERBOSEDATA() - sofa::core::objectmodel::lifecycle::RemovedData f_verbose{this, "v23.12", "v24.06", "verbose", "This Data is no longer used"}; - Data > > f_graph; ///< Graph of residuals at each iteration protected: diff --git a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/config.h.in b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/config.h.in index 2589d068509..21208154d08 100644 --- a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/config.h.in +++ b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/config.h.in @@ -38,13 +38,6 @@ namespace sofa::component::linearsolver::iterative } // namespace sofa::component::linearsolver::iterative -#ifdef SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_ITERATIVE -#define SOFA_ATTRIBUTE_DISABLED__SOLVER_ITERATIVE_VERBOSEDATA() -#else -#define SOFA_ATTRIBUTE_DISABLED__SOLVER_ITERATIVE_VERBOSEDATA() \ - SOFA_ATTRIBUTE_DISABLED("v23.12", "v24.06", "This Data is no longer used") -#endif // SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_ITERATIVE - #ifdef SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_ITERATIVE #define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_ITERATIVE() #else diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/BlockJacobiPreconditioner.h b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/BlockJacobiPreconditioner.h index d0ca34ebf3e..2b257265dd2 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/BlockJacobiPreconditioner.h +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/BlockJacobiPreconditioner.h @@ -52,9 +52,6 @@ class BlockJacobiPreconditioner : public sofa::component::linearsolver::MatrixLi typedef sofa::component::linearsolver::MatrixLinearSolver Inherit; typedef typename TMatrix::Block SubMatrix; - SOFA_ATTRIBUTE_DISABLED__PRECONDITIONER_VERBOSEDATA() - sofa::core::objectmodel::lifecycle::RemovedData f_verbose{this, "v23.12", "v24.06", "verbose", "This Data is no longer used"}; - protected: BlockJacobiPreconditioner(); public: diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/JacobiPreconditioner.h b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/JacobiPreconditioner.h index 8e0e90fe374..f3b21e2d882 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/JacobiPreconditioner.h +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/JacobiPreconditioner.h @@ -43,9 +43,6 @@ class JacobiPreconditioner : public sofa::component::linearsolver::MatrixLinearS typedef TVector Vector; typedef sofa::component::linearsolver::MatrixLinearSolver Inherit; - SOFA_ATTRIBUTE_DISABLED__PRECONDITIONER_VERBOSEDATA() - sofa::core::objectmodel::lifecycle::RemovedData f_verbose{this, "v23.12", "v24.06", "verbose", "This Data is no longer used"}; - protected: JacobiPreconditioner(); public: 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 f3b2bfa187b..b980993c7fd 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 @@ -109,9 +109,6 @@ class PrecomputedWarpPreconditioner : public sofa::component::linearsolver::Matr Data d_jmjt_twostep; ///< Use two step algorithm to compute JMinvJt - SOFA_ATTRIBUTE_DISABLED__PRECONDITIONER_VERBOSEDATA() - 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::lifecycle::RenamedData jmjt_twostep; 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 2dfceedf0e0..2dd0e13fef7 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 @@ -53,9 +53,6 @@ class SSORPreconditioner : public sofa::component::linearsolver::MatrixLinearSol typedef SReal Real; typedef sofa::component::linearsolver::MatrixLinearSolver Inherit; - SOFA_ATTRIBUTE_DISABLED__PRECONDITIONER_VERBOSEDATA() - 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::lifecycle::RenamedData f_omega; diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/config.h.in b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/config.h.in index 494e30be16f..7af4fca384b 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/config.h.in +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/config.h.in @@ -38,13 +38,6 @@ namespace sofa::component::linearsolver::preconditioner } // namespace sofa::component::linearsolver::preconditioner -#ifdef SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_PRECONDITIONER -#define SOFA_ATTRIBUTE_DISABLED__PRECONDITIONER_VERBOSEDATA() -#else -#define SOFA_ATTRIBUTE_DISABLED__PRECONDITIONER_VERBOSEDATA() \ - SOFA_ATTRIBUTE_DISABLED("v23.12", "v24.06", "This Data is no longer used") -#endif // SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_PRECONDITIONER - #ifdef SOFA_BUILD_SOFA_COMPONENT_LINEARSOLVER_PRECONDITIONER #define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_LINEARSOLVER_PRECONDITIONER() #else diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidMapping.h b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidMapping.h index 5f61362a380..9b5ee9e78e3 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidMapping.h +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidMapping.h @@ -90,31 +90,14 @@ class RigidMapping : public core::Mapping, public NonLinearMappingDat typedef sofa::linearalgebra::CompressedRowSparseMatrix MatrixType; Data d_points; ///< Local Coordinates of the points - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use d_points instead") DeprecatedAndRemoved points; - OutVecCoord m_rotatedPoints; ///< vectors from frame origin to mapped points, projected to world coordinates - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use m_rotatedPoints instead") DeprecatedAndRemoved rotatedPoints; - RigidMappingInternalData m_data; - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use m_data instead") DeprecatedAndRemoved data; - Data d_index; ///< input DOF index - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use d_index instead") DeprecatedAndRemoved index; - sofa::core::objectmodel::DataFileName d_fileRigidMapping; ///< Filename - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use d_fileRigidMapping instead") DeprecatedAndRemoved fileRigidMapping; - Data d_useX0; ///< Use x0 instead of local copy of initial positions (to support topo changes) - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use d_useX0 instead") DeprecatedAndRemoved useX0; - Data d_indexFromEnd; ///< input DOF index starts from the end of input DOFs vector - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use d_indexFromEnd instead") DeprecatedAndRemoved indexFromEnd; - Data< type::vector > d_rigidIndexPerPoint; ///< For each mapped point, the index of the Rigid it is mapped from - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use d_rigidIndexPerPoint instead") DeprecatedAndRemoved rigidIndexPerPoint; - Data d_globalToLocalCoords; ///< are the output DOFs initially expressed in global coordinates - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use d_globalToLocalCoords instead") DeprecatedAndRemoved globalToLocalCoords; protected: RigidMapping(); @@ -173,19 +156,14 @@ class RigidMapping : public core::Mapping, public NonLinearMappingDat void setJMatrixBlock(sofa::Index outIdx, sofa::Index inIdx); std::unique_ptr m_matrixJ; - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use m_matrixJ instead") DeprecatedAndRemoved matrixJ; bool m_updateJ; - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use m_updateJ instead") DeprecatedAndRemoved updateJ; typedef linearalgebra::EigenSparseMatrix SparseMatrixEigen; SparseMatrixEigen m_eigenJacobian; ///< Jacobian of the mapping used by getJs - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use m_eigenJacobian instead") DeprecatedAndRemoved eigenJacobian; type::vector m_eigenJacobians; /// used by getJs - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use m_eigenJacobians instead") DeprecatedAndRemoved eigenJacobians; typedef linearalgebra::EigenSparseMatrix StiffnessSparseMatrixEigen; StiffnessSparseMatrixEigen m_geometricStiffnessMatrix; - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "Use m_geometricStiffnessMatrix instead") DeprecatedAndRemoved geometricStiffnessMatrix; }; template diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/ConstantForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/ConstantForceField.h index cfa115b27c4..d50ec09b740 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/ConstantForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/ConstantForceField.h @@ -58,10 +58,6 @@ class ConstantForceField : public core::behavior::ForceField /// Per-point forces. Data< VecDeriv > d_forces; - /// Force applied at each point, if per-point forces are not specified - SOFA_ATTRIBUTE_DISABLED__CONSTANTFF_FORCE_DATA() - sofa::core::objectmodel::lifecycle::RemovedData d_force{this, "v23.12", "v24.06", "force", "Replace \"force\" by using the \"forces\" data (providing only one force value) (PR #4019)}"}; - /// Sum of the forces applied at each point, if per-point forces are not specified Data< Deriv > d_totalForce; diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/DiagonalVelocityDampingForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/DiagonalVelocityDampingForceField.h index c39b41bcb8b..997a8330f9b 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/DiagonalVelocityDampingForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/DiagonalVelocityDampingForceField.h @@ -47,9 +47,6 @@ class DiagonalVelocityDampingForceField : public core::behavior::ForceField d_dampingCoefficients; - SOFA_ATTRIBUTE_DISABLED("v23.12", "v24.06", "This Data is now replaced by d_dampingCoefficients") - DeprecatedAndRemoved dampingCoefficients; - protected: DiagonalVelocityDampingForceField(); diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EllipsoidForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EllipsoidForceField.h index 5a6ca2b55db..3f8fffe9e93 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EllipsoidForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EllipsoidForceField.h @@ -83,26 +83,15 @@ class EllipsoidForceField : public core::behavior::ForceField }; Data > d_contacts; ///< Vector of contacts - SOFA_ELLIPSOIDFORCEFIELD_RENAMEDDATA_DISABLED() DeprecatedAndRemoved contacts; ///< Contacts - EllipsoidForceFieldInternalData data; public: Data d_center; ///< ellipsoid center - SOFA_ELLIPSOIDFORCEFIELD_RENAMEDDATA_DISABLED() DeprecatedAndRemoved center; ///< ellipsoid center - Data d_vradius; ///< ellipsoid radius - SOFA_ELLIPSOIDFORCEFIELD_RENAMEDDATA_DISABLED() DeprecatedAndRemoved vradius; ///< ellipsoid radius - Data d_stiffness; ///< force stiffness (positive to repulse outward, negative inward) - SOFA_ELLIPSOIDFORCEFIELD_RENAMEDDATA_DISABLED() DeprecatedAndRemoved stiffness; ///< force stiffness (positive to repulse outward, negative inward) - Data d_damping; ///< force damping - SOFA_ELLIPSOIDFORCEFIELD_RENAMEDDATA_DISABLED() DeprecatedAndRemoved damping; ///< force damping - Data d_color; ///< ellipsoid color. (default=0,0.5,1.0,1.0) - SOFA_ELLIPSOIDFORCEFIELD_RENAMEDDATA_DISABLED() DeprecatedAndRemoved color; ///< ellipsoid color. (default=0,0.5,1.0,1.0) protected: EllipsoidForceField(); diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/config.h.in b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/config.h.in index 23749c09ce1..d3380925eb4 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/config.h.in +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/config.h.in @@ -31,14 +31,6 @@ # define SOFA_COMPONENT_MECHANICALLOAD_API SOFA_IMPORT_DYNAMIC_LIBRARY #endif -#ifdef SOFA_BUILD_SOFA_COMPONENT_MECHANICALLOAD -#define SOFA_ELLIPSOIDFORCEFIELD_RENAMEDDATA_DISABLED() -#else -#define SOFA_ELLIPSOIDFORCEFIELD_RENAMEDDATA_DISABLED() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.12", "v24.06", "This Data has been renamed to match convention with d_ prefix.") -#endif // SOFA_BUILD_SOFA_COMPONENT_MECHANICALLOAD - namespace sofa::component::mechanicalload { constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; @@ -46,16 +38,6 @@ namespace sofa::component::mechanicalload } // namespace sofa::component::mechanicalload -#ifdef SOFA_BUILD_SOFA_COMPONENT_MECHANICALLOAD -#define SOFA_ATTRIBUTE_DISABLED__CONSTANTFF_FORCE_DATA() -#else -#define SOFA_ATTRIBUTE_DISABLED__CONSTANTFF_FORCE_DATA() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.12 (PR#4019)", "v24.06",\ - "The \'force\' data is no longer used, please use the \'forces\' vector instead (with size = 1).") -#endif - - #ifdef SOFA_BUILD_SOFA_COMPONENT_MECHANICALLOAD #define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MECHANICALLOAD() #else 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 37e2a66ee6b..2b6067df466 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 @@ -87,9 +87,6 @@ class SOFA_COMPONENT_ODESOLVER_BACKWARD_API VariationalSymplecticSolver Data d_useIncrementalPotentialEnergy; ///< use real potential energy, if false use approximate potential energy Data d_threadSafeVisitor; ///< If true, do not use realloc and free visitors in fwdInteractionForceField. - SOFA_ATTRIBUTE_DISABLED__ODESOLVER_BACKWARD_VERBOSEDATA() - sofa::core::objectmodel::lifecycle::RemovedData f_verbose{this, "v23.12", "v24.06", "verbose", "This Data is no longer used"}; - VariationalSymplecticSolver(); std::ofstream energies; diff --git a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/config.h.in b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/config.h.in index 3d294565925..e462f9668b7 100644 --- a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/config.h.in +++ b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/config.h.in @@ -37,12 +37,6 @@ namespace sofa::component::odesolver::backward constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::odesolver::backward -#ifdef SOFA_BUILD_SOFA_COMPONENT_ODESOLVER_BACKWARD -#define SOFA_ATTRIBUTE_DISABLED__ODESOLVER_BACKWARD_VERBOSEDATA() -#else -#define SOFA_ATTRIBUTE_DISABLED__ODESOLVER_BACKWARD_VERBOSEDATA() \ - SOFA_ATTRIBUTE_DISABLED("v23.12", "v24.06", "This Data is no longer used") -#endif // SOFA_BUILD_SOFA_COMPONENT_ODESOLVER_BACKWARD #ifdef SOFA_BUILD_SOFA_COMPONENT_ODESOLVER_BACKWARD #define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ODESOLVER_BACKWARD() diff --git a/Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/material/PlasticMaterial.h b/Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/material/PlasticMaterial.h index a4b11d4a4bd..6158095ea3d 100644 --- a/Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/material/PlasticMaterial.h +++ b/Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/material/PlasticMaterial.h @@ -43,8 +43,6 @@ class PlasticMaterial : public BaseMaterial public: SOFA_CLASS(PlasticMaterial, BaseMaterial); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - typedef sofa::type::vector VecDouble; typedef sofa::type::vector VecStress; diff --git a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.h b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.h index 3c90f0dd40b..bc1b0339b61 100644 --- a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.h +++ b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.h @@ -70,12 +70,8 @@ class MechanicalObject : public sofa::core::behavior::MechanicalState typedef typename DataTypes::MatrixDeriv::ColConstIterator MatrixDerivColConstIterator; typedef typename DataTypes::MatrixDeriv::RowIterator MatrixDerivRowIterator; typedef typename DataTypes::MatrixDeriv::ColIterator MatrixDerivColIterator; - typedef typename core::behavior::BaseMechanicalState::ConstraintBlock ConstraintBlock; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index); - protected: MechanicalObject(); public: 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 8a9d87bf9eb..ba8bf8d6f4c 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 @@ -39,8 +39,6 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_CONSTANT_API CubeTopology : public MeshT public: SOFA_CLASS(CubeTopology,MeshTopology); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - protected: CubeTopology(int nx, int ny, int nz); CubeTopology(); 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 aef14d72cb9..bf184421b11 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 @@ -31,7 +31,6 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_CONSTANT_API SphereQuadTopology : public { public: SOFA_CLASS(SphereQuadTopology,CubeTopology); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); protected: SphereQuadTopology(int nx, int ny, int nz); diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/CylinderGridTopology.h b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/CylinderGridTopology.h index 6c5175d97cb..6d3795271f0 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/CylinderGridTopology.h +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/CylinderGridTopology.h @@ -41,7 +41,6 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API CylinderGridTopology : public G { public: SOFA_CLASS(CylinderGridTopology,GridTopology); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); protected: /// Default constructor diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/GridTopology.h b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/GridTopology.h index d50f7c8f247..3873134d709 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/GridTopology.h +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/GridTopology.h @@ -55,9 +55,6 @@ using MeshTopology::getQuad; using MeshTopology::getHexahedron; SOFA_CLASS(GridTopology,MeshTopology); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec3i, sofa::type::Vec3i); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector2, sofa::type::Vec2); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); typedef Vec2 TextCoords2D; friend class GridUpdate; diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/RegularGridTopology.h b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/RegularGridTopology.h index 1675db4ff64..f5dfdf614b8 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/RegularGridTopology.h +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/RegularGridTopology.h @@ -38,11 +38,6 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API RegularGridTopology : public Gr public: SOFA_CLASS(RegularGridTopology,GridTopology); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec3i, sofa::type::Vec3i); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec3ui, sofa::type::Vec3u); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(BoundingBox, sofa::type::BoundingBox); - protected: /// Delegated constructor RegularGridTopology(const type::Vec3i &dimXYZ); 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 7ec17f8c093..b6d0f027bb5 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 @@ -52,14 +52,9 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridTopology : public con { public: SOFA_CLASS(SparseGridTopology,MeshTopology); - - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec3i, sofa::type::Vec3i); typedef sofa::type::fixed_array CubeCorners; - - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(BoundingBox, sofa::type::BoundingBox); - typedef enum {OUTSIDE,INSIDE,BOUNDARY} Type; ///< each cube has a type depending on its filling ratio + protected: SparseGridTopology(bool _isVirtual=false); diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SphereGridTopology.h b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SphereGridTopology.h index db2921627c2..716385b8b05 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SphereGridTopology.h +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SphereGridTopology.h @@ -37,7 +37,6 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SphereGridTopology : public Gri public: SOFA_CLASS(SphereGridTopology,GridTopology); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); protected: /// Default constructor SphereGridTopology(); diff --git a/Sofa/Component/Visual/src/sofa/component/visual/BaseCamera.h b/Sofa/Component/Visual/src/sofa/component/visual/BaseCamera.h index 0e9e82b9d99..32b6b67b640 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/BaseCamera.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/BaseCamera.h @@ -40,10 +40,6 @@ class SOFA_COMPONENT_VISUAL_API BaseCamera : public core::objectmodel::BaseObjec public: SOFA_CLASS(BaseCamera, core::objectmodel::BaseObject); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Ray, sofa::type::Ray); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec2, sofa::type::Vec2); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec3, sofa::type::Vec3); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec4, sofa::type::Vec4); typedef type::Quat Quat; enum Side {LEFT, RIGHT, MONO}; diff --git a/Sofa/Component/Visual/src/sofa/component/visual/RecordedCamera.h b/Sofa/Component/Visual/src/sofa/component/visual/RecordedCamera.h index 4675f3a40f0..68b02847012 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/RecordedCamera.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/RecordedCamera.h @@ -36,8 +36,6 @@ class SOFA_COMPONENT_VISUAL_API RecordedCamera : public BaseCamera public: SOFA_CLASS(RecordedCamera, BaseCamera); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec3, sofa::type::Vec3); - typedef BaseCamera::Quat Quat; protected: RecordedCamera(); diff --git a/Sofa/Component/Visual/src/sofa/component/visual/VisualGrid.h b/Sofa/Component/Visual/src/sofa/component/visual/VisualGrid.h index 91b8ee50321..d6c00faf1e3 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/VisualGrid.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/VisualGrid.h @@ -38,8 +38,6 @@ class SOFA_COMPONENT_VISUAL_API VisualGrid : public core::visual::VisualModel public: SOFA_CLASS(VisualGrid, VisualModel); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - MAKE_SELECTABLE_ITEMS(PlaneType, sofa::helper::Item{"x", "The grid is oriented in the plane defined by the equation x=0"}, sofa::helper::Item{"y", "The grid is oriented in the plane defined by the equation y=0"}, diff --git a/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h b/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h index 2760ecc16ef..7c388bdd610 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h @@ -37,10 +37,6 @@ namespace sofa::component::visual { -SOFA_ATTRIBUTE_DISABLED__VEC3STATE_AS_VISUALSTATE() -typedef sofa::core::visual::VisualState Vec3State; - - /** * \brief Abstract class which implements partially VisualModel. * @@ -58,8 +54,6 @@ class SOFA_COMPONENT_VISUAL_API VisualModelImpl : public core::visual::VisualMod typedef sofa::type::Vec<2, float> TexCoord; typedef type::vector VecTexCoord; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index); - //Indices must be unsigned int for drawing using visual_index_type = unsigned int; diff --git a/Sofa/Component/Visual/src/sofa/component/visual/config.h.in b/Sofa/Component/Visual/src/sofa/component/visual/config.h.in index a22a7717efe..7bc8db13e79 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/config.h.in +++ b/Sofa/Component/Visual/src/sofa/component/visual/config.h.in @@ -37,14 +37,6 @@ namespace sofa::component::visual constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace sofa::component::visual -#ifdef SOFA_BUILD__COMPONENT__VISUAL -#define SOFA_ATTRIBUTE_DISABLED__VEC3STATE_AS_VISUALSTATE() -#else -#define SOFA_ATTRIBUTE_DISABLED__VEC3STATE_AS_VISUALSTATE() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.06", "v23.12", \ - "Vec3State is now an alias of sofa::core::visual::VisualState.") -#endif #ifdef SOFA_BUILD_SOFA_COMPONENT_VISUAL #define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL() diff --git a/Sofa/GL/src/sofa/gl/Axis.h b/Sofa/GL/src/sofa/gl/Axis.h index f5d83e21729..297e68db104 100644 --- a/Sofa/GL/src/sofa/gl/Axis.h +++ b/Sofa/GL/src/sofa/gl/Axis.h @@ -38,9 +38,6 @@ namespace sofa::gl class SOFA_GL_API Axis { public: - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec4f, sofa::type::Vec4f); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec3d, sofa::type::Vec3d); typedef sofa::type::Quat Quaternion; Axis(SReal len=1.0_sreal); @@ -66,22 +63,6 @@ class SOFA_GL_API Axis static void draw(const type::Vec3& center, const double orient[4][4], SReal length = 1.0_sreal, const type::RGBAColor& colorX = type::RGBAColor::red(), const type::RGBAColor& colorY = type::RGBAColor::green(), const type::RGBAColor& colorZ = type::RGBAColor::red()); static void draw(const double* mat, SReal length = 1.0_sreal, const type::RGBAColor& colorX = type::RGBAColor::red(), const type::RGBAColor& colorY = type::RGBAColor::green(), const type::RGBAColor& colorZ = type::RGBAColor::red()); - SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() - void draw(const type::Vec4f& colorX = type::Vec4f(1, 0, 0, 1), const type::Vec4f& colorY = type::Vec4f(0, 1, 0, 1), const type::Vec4f& colorZ = type::Vec4f(0, 0, 1, 1)) = delete; - SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() - static void draw(const type::Vec3& center, const Quaternion& orient, const type::Vec3& length, const type::Vec4f& colorX = type::Vec4f(1, 0, 0, 1), const type::Vec4f& colorY = type::Vec4f(0, 1, 0, 1), const type::Vec4f& colorZ = type::Vec4f(0, 0, 1, 1)) = delete; - SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() - static void draw(const type::Vec3& center, const double orient[4][4], const type::Vec3& length, const type::Vec4f& colorX = type::Vec4f(1, 0, 0, 1), const type::Vec4f& colorY = type::Vec4f(0, 1, 0, 1), const type::Vec4f& colorZ = type::Vec4f(0, 0, 1, 1)) = delete; - SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() - void draw(const double* mat, const type::Vec3& length, const type::Vec4f& colorX = type::Vec4f(1, 0, 0, 1), const type::Vec4f& colorY = type::Vec4f(0, 1, 0, 1), const type::Vec4f& colorZ = type::Vec4f(0, 0, 1, 1)) = delete; - SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() - static void draw(const type::Vec3& center, const Quaternion& orient, SReal length = 1.0_sreal, const type::Vec4f& colorX = type::Vec4f(1, 0, 0, 1), const type::Vec4f& colorY = type::Vec4f(0, 1, 0, 1), const type::Vec4f& colorZ = type::Vec4f(0, 0, 1, 1)) = delete; - SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() - static void draw(const type::Vec3& center, const double orient[4][4], SReal length = 1.0_sreal, const type::Vec4f& colorX = type::Vec4f(1, 0, 0, 1), const type::Vec4f& colorY = type::Vec4f(0, 1, 0, 1), const type::Vec4f& colorZ = type::Vec4f(0, 0, 1, 1)) = delete; - SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() - static void draw(const double* mat, SReal length = 1.0_sreal, const type::Vec4f& colorX = type::Vec4f(1, 0, 0, 1), const type::Vec4f& colorY = type::Vec4f(0, 1, 0, 1), const type::Vec4f& colorZ = type::Vec4f(0, 0, 1, 1)) = delete; - - //Draw a nice vector (cylinder + cone) given 2 points and a radius (used to draw the cylinder) static void draw(const type::Vec3& center, const type::Vec3& ext, const double& radius ); //Draw a cylinder given two points and the radius of the extremities (to have a cone, simply set one radius to zero) diff --git a/Sofa/GL/src/sofa/gl/Cylinder.h b/Sofa/GL/src/sofa/gl/Cylinder.h index 4dc03941334..3a1fe80b89e 100644 --- a/Sofa/GL/src/sofa/gl/Cylinder.h +++ b/Sofa/GL/src/sofa/gl/Cylinder.h @@ -43,8 +43,6 @@ class SOFA_GL_API Cylinder public: typedef sofa::type::Quat Quaternion; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - Cylinder(SReal len=1.0_sreal); Cylinder(const Vec3& len); Cylinder(const Vec3& center, const Quaternion &orient, const Vec3& length); diff --git a/Sofa/GL/src/sofa/gl/DrawToolGL.h b/Sofa/GL/src/sofa/gl/DrawToolGL.h index cea1eb0cd18..b0830adfbc4 100644 --- a/Sofa/GL/src/sofa/gl/DrawToolGL.h +++ b/Sofa/GL/src/sofa/gl/DrawToolGL.h @@ -33,11 +33,6 @@ class SOFA_GL_API DrawToolGL : public helper::visual::DrawTool { public: - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(RGBAColor, sofa::type::RGBAColor); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec3f, sofa::type::Vec3f); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec3i, sofa::type::Vec3i); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec2i, sofa::type::Vec2i); typedef sofa::type::Quat Quaternion; DrawToolGL(); diff --git a/Sofa/GUI/Common/src/sofa/gui/common/ColourPickingVisitor.h b/Sofa/GUI/Common/src/sofa/gui/common/ColourPickingVisitor.h index 7327bbec0d7..dfc48eccf43 100644 --- a/Sofa/GUI/Common/src/sofa/gui/common/ColourPickingVisitor.h +++ b/Sofa/GUI/Common/src/sofa/gui/common/ColourPickingVisitor.h @@ -35,16 +35,6 @@ void SOFA_GUI_COMMON_API decodePosition( sofa::gui::component::performer::BodyPi void SOFA_GUI_COMMON_API decodePosition( sofa::gui::component::performer::BodyPicked& body, const type::RGBAColor& colour, const sofa::component::collision::geometry::SphereCollisionModel* model, const unsigned int index); -// compat -SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() -void decodeCollisionElement( const sofa::type::Vec4f& colour, sofa::gui::component::performer::BodyPicked& body ) = delete; -SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() -void decodePosition( sofa::gui::component::performer::BodyPicked& body, const sofa::type::Vec4f& colour, const sofa::component::collision::geometry::TriangleCollisionModel* model, - const unsigned int index) = delete; -SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() -void decodePosition( sofa::gui::component::performer::BodyPicked& body, const sofa::type::Vec4f& colour, const sofa::component::collision::geometry::SphereCollisionModel* model, - const unsigned int index) = delete; - /* Launches the drawColourPicking() method of each CollisionModel */ class SOFA_GUI_COMMON_API ColourPickingVisitor : public simulation::Visitor diff --git a/Sofa/GUI/Component/src/sofa/gui/component/AttachBodyButtonSetting.h b/Sofa/GUI/Component/src/sofa/gui/component/AttachBodyButtonSetting.h index 36073afc13e..6b6484c1cd6 100644 --- a/Sofa/GUI/Component/src/sofa/gui/component/AttachBodyButtonSetting.h +++ b/Sofa/GUI/Component/src/sofa/gui/component/AttachBodyButtonSetting.h @@ -33,17 +33,15 @@ class SOFA_GUI_COMPONENT_API AttachBodyButtonSetting: public sofa::component::se { public: SOFA_CLASS(AttachBodyButtonSetting, sofa::component::setting::MouseButtonSetting); + protected: AttachBodyButtonSetting(); + public: std::string getOperationType() override {return "Attach";} Data d_stiffness; ///< Stiffness of the spring to attach a particule Data d_arrowSize; ///< Size of the drawn spring: if >0 an arrow will be drawn Data d_showFactorSize; ///< Show factor size of the JointSpringForcefield when interacting with rigids - - SOFA_ATTRIBUTE_DISABLED__NAMING("v24.06", "v24.06", stiffness, d_stiffness); - SOFA_ATTRIBUTE_DISABLED__NAMING("v24.06", "v24.06", arrowSize, d_arrowSize); - SOFA_ATTRIBUTE_DISABLED__NAMING("v24.06", "v24.06", showFactorSize, d_showFactorSize); }; } // namespace sofa::gui::component diff --git a/Sofa/GUI/Component/src/sofa/gui/component/config.h.in b/Sofa/GUI/Component/src/sofa/gui/component/config.h.in index 9f1dd31108c..191deeb92a0 100644 --- a/Sofa/GUI/Component/src/sofa/gui/component/config.h.in +++ b/Sofa/GUI/Component/src/sofa/gui/component/config.h.in @@ -31,13 +31,6 @@ # define SOFA_GUI_COMPONENT_API SOFA_IMPORT_DYNAMIC_LIBRARY #endif -#define SOFA_ATTRIBUTE_DISABLED__NAMING( deprecationDate, disableDate, oldName, newName) \ - SOFA_ATTRIBUTE_DISABLED( \ - deprecationDate, disableDate, \ - "The attribute " sofa_tostring(oldName) " has been renamed to \'" sofa_tostring(newName) "\' to fit naming policy ") \ - DeprecatedAndRemoved oldName - - namespace sofa::gui::component { constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; diff --git a/Sofa/GUI/Component/src/sofa/gui/component/performer/InteractionPerformer.h b/Sofa/GUI/Component/src/sofa/gui/component/performer/InteractionPerformer.h index c8bbad3f700..7d368ce10e0 100644 --- a/Sofa/GUI/Component/src/sofa/gui/component/performer/InteractionPerformer.h +++ b/Sofa/GUI/Component/src/sofa/gui/component/performer/InteractionPerformer.h @@ -59,10 +59,6 @@ class SOFA_GUI_COMPONENT_API InteractionPerformer } BaseMouseInteractor *m_interactor; bool m_freezePerformer; - - SOFA_ATTRIBUTE_DISABLED__NAMING("v24.06", "v24.06", interactor,m_interactor); - SOFA_ATTRIBUTE_DISABLED__NAMING("v24.06", "v24.06", freezePerformer,m_freezePerformer); - }; diff --git a/Sofa/framework/Config/src/sofa/config.h.in b/Sofa/framework/Config/src/sofa/config.h.in index ccd35844237..a5e01a9ac18 100644 --- a/Sofa/framework/Config/src/sofa/config.h.in +++ b/Sofa/framework/Config/src/sofa/config.h.in @@ -197,22 +197,6 @@ class DeprecatedAndRemoved {}; // for every disabled attribute. #define SOFA_ATTRIBUTE_DISABLED(deprecateDate, disableDate, toFixMsg) -#define SOFA_ATTRIBUTE_DISABLED__BASECLASS_FEATURES_IN_NAMEDECODER() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v22.12 (PR#1808)", "v23.12", \ - "The feature has been move to BaseClassNameHelper. To update your code, replace sofa::helper::NameDecoder with sofa::core::objectmodel::BaseClassNameDecoder") - -#define SOFA_ATTRIBUTE_DISABLED__TYPEMEMBER(type) \ - SOFA_ATTRIBUTE_DISABLED( \ - "v22.12 (PR#3357)", "v23.12", \ - "Class's member type alias " sofa_tostring(type) " was not needed.") \ - DeprecatedAndRemoved type - -#define SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(type, newtype) \ - SOFA_ATTRIBUTE_DISABLED( \ - "v22.12 (PR#3357)", "v23.12", \ - "This type member " sofa_tostring(type) " is now deprecated. To update your code please replace it with " sofa_tostring(newtype)) \ - typedef newtype type /**********************************************/ diff --git a/Sofa/framework/Core/src/sofa/core/ConstraintParams.h b/Sofa/framework/Core/src/sofa/core/ConstraintParams.h index 4b5fcc6c72c..14f3ac07409 100644 --- a/Sofa/framework/Core/src/sofa/core/ConstraintParams.h +++ b/Sofa/framework/Core/src/sofa/core/ConstraintParams.h @@ -34,12 +34,6 @@ namespace sofa::core class SOFA_CORE_API ConstraintParams : public sofa::core::ExecParams { public: - - SOFA_ATTRIBUTE_DISABLED__CONSTORDER() static constexpr auto POS = sofa::core::ConstraintOrder::POS; - SOFA_ATTRIBUTE_DISABLED__CONSTORDER() static constexpr auto VEL = sofa::core::ConstraintOrder::VEL; - SOFA_ATTRIBUTE_DISABLED__CONSTORDER() static constexpr auto ACC = sofa::core::ConstraintOrder::ACC; - SOFA_ATTRIBUTE_DISABLED__CONSTORDER() static constexpr auto POS_AND_VEL = sofa::core::ConstraintOrder::POS_AND_VEL; - /// @name Flags and parameters getters /// @{ diff --git a/Sofa/framework/Core/src/sofa/core/MechanicalParams.h b/Sofa/framework/Core/src/sofa/core/MechanicalParams.h index 19bc6dbc685..708dd23cecf 100644 --- a/Sofa/framework/Core/src/sofa/core/MechanicalParams.h +++ b/Sofa/framework/Core/src/sofa/core/MechanicalParams.h @@ -65,9 +65,6 @@ class SOFA_CORE_API MechanicalParams : public sofa::core::ExecParams /// @} - SOFA_ATTRIBUTE_DISABLED__SYMMETRICMATRIX("Use supportOnlySymmetricMatrix instead.") - bool symmetricMatrix() const = delete; - /// Symmetric matrix flag, for solvers specialized on symmetric matrices bool supportOnlySymmetricMatrix() const { return m_supportOnlySymmetricMatrix; } @@ -128,9 +125,6 @@ class SOFA_CORE_API MechanicalParams : public sofa::core::ExecParams /// Set Stiffness matrix contributions factor (for implicit schemes) MechanicalParams& setKFactor(SReal v) { m_kFactor = v; return *this; } - SOFA_ATTRIBUTE_DISABLED__SYMMETRICMATRIX("Use setSupportOnlySymmetricMatrix instead.") - MechanicalParams& setSymmetricMatrix(bool b) = delete; - /// Set the flag (for implicit schemes) specifying if solvers are only specialized for symmetric matrices MechanicalParams& setSupportOnlySymmetricMatrix(bool b) { m_supportOnlySymmetricMatrix = b; return *this; } diff --git a/Sofa/framework/Core/src/sofa/core/collision/DetectionOutput.h b/Sofa/framework/Core/src/sofa/core/collision/DetectionOutput.h index 203c5872ca2..5d77f219ba4 100644 --- a/Sofa/framework/Core/src/sofa/core/collision/DetectionOutput.h +++ b/Sofa/framework/Core/src/sofa/core/collision/DetectionOutput.h @@ -53,8 +53,6 @@ namespace sofa::core::collision class DetectionOutput { public: - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - /// Pair of colliding elements. std::pair elem; typedef int64_t ContactId; diff --git a/Sofa/framework/Core/src/sofa/core/config.h.in b/Sofa/framework/Core/src/sofa/core/config.h.in index a30bd9f6493..3f88923790e 100644 --- a/Sofa/framework/Core/src/sofa/core/config.h.in +++ b/Sofa/framework/Core/src/sofa/core/config.h.in @@ -45,21 +45,6 @@ #endif // SOFA_CORE_TOPOLOGY_ENABLE_DEPRECATION_MESSAGE -#ifdef SOFA_BUILD_SOFA_CORE -#define SOFA_ATTRIBUTE_DISABLED__SYMMETRICMATRIX(msg) -#else - -#define SOFA_ATTRIBUTE_DISABLED__SYMMETRICMATRIX(msg) \ - SOFA_ATTRIBUTE_DISABLED("v23.12 (PR#3861)", "v24.06", msg) - -#endif - -#ifdef SOFA_BUILD_SOFA_CORE -#define SOFA_ATTRIBUTE_DISABLED__CONSTORDER() -#else -#define SOFA_ATTRIBUTE_DISABLED__CONSTORDER() \ - SOFA_ATTRIBUTE_DISABLED("v23.12", "v24.06", "ConstOrder is now a scoped enumeration. It must be used to access the values.") -#endif #ifdef SOFA_BUILD_SOFA_CORE #define SOFA_ATTRIBUTE_DISABLED__CORE_INTERSECTION_AS_PARAMETER() diff --git a/Sofa/framework/Helper/src/sofa/helper/LCPcalc.h b/Sofa/framework/Helper/src/sofa/helper/LCPcalc.h index 529feaf6163..94541d62db1 100644 --- a/Sofa/framework/Helper/src/sofa/helper/LCPcalc.h +++ b/Sofa/framework/Helper/src/sofa/helper/LCPcalc.h @@ -96,11 +96,6 @@ inline SOFA_HELPER_API SReal absError(SReal f1x, SReal f1y, SReal f1z, SReal f2x {return sqrt ((f2x-f1x)*(f2x-f1x) + (f2y-f1y)*(f2y-f1y) + (f2z-f1z)*(f2z-f1z));} -SOFA_LCPCALC_RESOUDRELCP_DISABLED() int resoudreLCP(int, SReal *, SReal **, SReal *) = delete; -SOFA_LCPCALC_AFFICHESYST_DISABLED() void afficheSyst(SReal *q,SReal **M, int *base, SReal **mat, int dim) = delete; -SOFA_LCPCALC_AFFICHELCP_DISABLED() void afficheLCP(SReal *q, SReal **M, int dim) = delete; -SOFA_LCPCALC_AFFICHELCP_DISABLED() void afficheLCP(SReal *q, SReal **M, SReal *f, int dim) = delete; - SOFA_HELPER_API int solveLCP(int, SReal *, SReal **, SReal *); SOFA_HELPER_API void printSyst(SReal* q, SReal** M, int* base, SReal** mat, int dim); SOFA_HELPER_API void printLCP(SReal* q, SReal** M, int dim); diff --git a/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.h b/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.h index 12d20351216..2088598b675 100644 --- a/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.h +++ b/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.h @@ -38,13 +38,8 @@ class SOFA_HELPER_API MarchingCubeUtility { public: typedef sofa::Index PointID; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec3i, sofa::type::Vec3i); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vec6i, sofa::type::Vec6i); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Real, SReal); MarchingCubeUtility(); - ~MarchingCubeUtility() {}; void setDataResolution ( const type::Vec3i &resolution ) diff --git a/Sofa/framework/Helper/src/sofa/helper/NameDecoder.h b/Sofa/framework/Helper/src/sofa/helper/NameDecoder.h index 2a7dc91b04d..11562a143e9 100644 --- a/Sofa/framework/Helper/src/sofa/helper/NameDecoder.h +++ b/Sofa/framework/Helper/src/sofa/helper/NameDecoder.h @@ -31,26 +31,6 @@ namespace sofa::helper class SOFA_HELPER_API NameDecoder { public: - SOFA_ATTRIBUTE_DISABLED__BASECLASS_FEATURES_IN_NAMEDECODER() - template - std::string getClassName() - { - return decodeNamespaceName(typeid(T)); - } - - SOFA_ATTRIBUTE_DISABLED__BASECLASS_FEATURES_IN_NAMEDECODER() - template - std::string getTemplateName() - { - return decodeTemplateName(typeid(T)); - } - - SOFA_ATTRIBUTE_DISABLED__BASECLASS_FEATURES_IN_NAMEDECODER() - template - static std::string getShortName() - { - return shortName(decodeTypeName(typeid(T))); - } /// Helper method to get the type name template @@ -83,11 +63,6 @@ class SOFA_HELPER_API NameDecoder /// Helper method to extract the template name (removing namespaces and class name) static std::string decodeTemplateName(const std::type_info& t); - -private: - SOFA_ATTRIBUTE_DISABLED__BASECLASS_FEATURES_IN_NAMEDECODER() - template - struct DefaultTypeTemplateName{}; }; } /// namespace sofa::helper diff --git a/Sofa/framework/Helper/src/sofa/helper/OptionsGroup.cpp b/Sofa/framework/Helper/src/sofa/helper/OptionsGroup.cpp index 1c7a1803bac..daf5e8afda8 100644 --- a/Sofa/framework/Helper/src/sofa/helper/OptionsGroup.cpp +++ b/Sofa/framework/Helper/src/sofa/helper/OptionsGroup.cpp @@ -34,22 +34,6 @@ OptionsGroup::OptionsGroup() : textItems() selectedItem=0; } /////////////////////////////////////// -OptionsGroup::OptionsGroup(int nbofRadioButton,...) -{ - textItems.resize(nbofRadioButton); - va_list vl; - va_start(vl,nbofRadioButton); - for (auto& item : textItems) - { - const char * tempochar=va_arg(vl,char *); - assert( strcmp( tempochar, "") ); - const std::string tempostring(tempochar); - item = tempostring; - } - va_end(vl); - selectedItem=0; -} -/////////////////////////////////////// OptionsGroup::OptionsGroup(const OptionsGroup & m_radiotrick) : textItems(m_radiotrick.textItems) { selectedItem = m_radiotrick.getSelectedId(); @@ -66,22 +50,6 @@ void OptionsGroup::setItemName(const unsigned int id_item, const std::string& na textItems[id_item] = name; } /////////////////////////////////////// -void OptionsGroup::setNames(int nbofRadioButton,...) -{ - textItems.resize(nbofRadioButton); - va_list vl; - va_start(vl,nbofRadioButton); - for (auto& item : textItems) - { - const char * tempochar=va_arg(vl,char *); - const std::string tempostring(tempochar); - assert( strcmp( tempochar, "") ); - item=tempostring; - } - va_end(vl); - selectedItem=0; -} -/////////////////////////////////////// int OptionsGroup::isInOptionsList(const std::string & tempostring) const { for(std::size_t i=0; i, set, vector template explicit OptionsGroup(const T& list); @@ -76,11 +71,6 @@ public : ///Set the name of the id-th item void setItemName( unsigned int id_item, const std::string& name ); - ///Reinitializing options by a pre-constructed optionsgroup objected - ///Example m_options.setNames(4,"button0","button1","button2","button3"); - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "This method is error-prone. Use another setNames method.") - void setNames(int nbofRadioButton,...); - template void setNames(const std::initializer_list& list); diff --git a/Sofa/framework/Helper/src/sofa/helper/config.h.in b/Sofa/framework/Helper/src/sofa/helper/config.h.in index 0d38bd68fa3..25d7674a081 100644 --- a/Sofa/framework/Helper/src/sofa/helper/config.h.in +++ b/Sofa/framework/Helper/src/sofa/helper/config.h.in @@ -40,45 +40,7 @@ # define SOFA_HELPER_API SOFA_IMPORT_DYNAMIC_LIBRARY #endif -#ifdef SOFA_BUILD_SOFA_HELPER -#define SOFA_PROXIMITY_CLASSES_DISABLED() -#else -#define SOFA_PROXIMITY_CLASSES_DISABLED() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.06", "v23.12", "Use free functions in sofa::geometry::proximity instead") -#endif // SOFA_BUILD_SOFA_HELPER - -#ifdef SOFA_BUILD_SOFA_HELPER -#define SOFA_MESHTOPOLOGYLOADER_LOADMESHFUNCTION_DISABLED() -#else -#define SOFA_MESHTOPOLOGYLOADER_LOADMESHFUNCTION_DISABLED() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.12", "v24.06", "This function is not replaced.") -#endif // SOFA_BUILD_SOFA_HELPER - -#ifdef SOFA_BUILD_SOFA_HELPER -#define SOFA_LCPCALC_AFFICHELCP_DISABLED() -#else -#define SOFA_LCPCALC_AFFICHELCP_DISABLED() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "This function is replaced by printLCP.") -#endif // SOFA_BUILD_SOFA_HELPER -#ifdef SOFA_BUILD_SOFA_HELPER -#define SOFA_LCPCALC_AFFICHESYST_DISABLED() -#else -#define SOFA_LCPCALC_AFFICHESYST_DISABLED() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "This function is replaced by printSyst.") -#endif // SOFA_BUILD_SOFA_HELPER - -#ifdef SOFA_BUILD_SOFA_HELPER -#define SOFA_LCPCALC_RESOUDRELCP_DISABLED() -#else -#define SOFA_LCPCALC_RESOUDRELCP_DISABLED() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "This function is replaced by solveLCP.") -#endif // SOFA_BUILD_SOFA_HELPER #define SOFA_ATTRIBUTE_DEPRECATED__PLUGIN_GETCOMPONENTLIST() \ SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.06", \ diff --git a/Sofa/framework/Helper/src/sofa/helper/io/Mesh.h b/Sofa/framework/Helper/src/sofa/helper/io/Mesh.h index 21cf6ec5b24..31667574b6e 100644 --- a/Sofa/framework/Helper/src/sofa/helper/io/Mesh.h +++ b/Sofa/framework/Helper/src/sofa/helper/io/Mesh.h @@ -41,8 +41,6 @@ class SOFA_HELPER_API Mesh std::string loaderType; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - typedef sofa::type::PrimitiveGroup PrimitiveGroup; typedef sofa::type::Material Material; typedef sofa::Index PointID; diff --git a/Sofa/framework/Helper/src/sofa/helper/io/MeshTopologyLoader.h b/Sofa/framework/Helper/src/sofa/helper/io/MeshTopologyLoader.h index 4790cbdf85e..e3557ddbf70 100644 --- a/Sofa/framework/Helper/src/sofa/helper/io/MeshTopologyLoader.h +++ b/Sofa/framework/Helper/src/sofa/helper/io/MeshTopologyLoader.h @@ -56,13 +56,9 @@ class SOFA_HELPER_API MeshTopologyLoader /// method will create a MeshGmsh which will parse the file. Then will call @see addMeshtoTopology() to add mesh data into topology bool loadGmsh(const char *filename); - bool loadVtk(const char *filename); - SOFA_MESHTOPOLOGYLOADER_LOADMESHFUNCTION_DISABLED() - bool loadMesh(std::ifstream &file) = delete; - // will take all data from loaded into @see m_mesh and add it to the current topology using methods api. bool addMeshtoTopology(); diff --git a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/BTDMatrix.h b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/BTDMatrix.h index 35910298f30..441b1dd0217 100644 --- a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/BTDMatrix.h +++ b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/BTDMatrix.h @@ -122,12 +122,6 @@ class BTDMatrix : public linearalgebra::BaseMatrix return BSIZE; } - SOFA_ATTRIBUTE_DISABLED__GETSUBMATRIXSIZE("Use directly getSubMatrixDim(), without any parameter") - static Index getSubMatrixDim(Index) - { - return getSubMatrixDim(); - } - protected: Block* data; Index nTRow,nTCol; diff --git a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/BlockFullMatrix.h b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/BlockFullMatrix.h index d9c698dab43..ff11401b1dc 100644 --- a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/BlockFullMatrix.h +++ b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/BlockFullMatrix.h @@ -104,12 +104,6 @@ class BlockFullMatrix : public linearalgebra::BaseMatrix return BSIZE; } - SOFA_ATTRIBUTE_DISABLED__GETSUBMATRIXSIZE("Use directly getSubMatrixDim(), without any parameter") - constexpr static Index getSubMatrixDim(Index) - { - return getSubMatrixDim(); - } - protected: Block* data; Index nTRow,nTCol; diff --git a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/CompressedRowSparseMatrixGeneric.h b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/CompressedRowSparseMatrixGeneric.h index c4ab41990e4..1618293c5a6 100644 --- a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/CompressedRowSparseMatrixGeneric.h +++ b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/CompressedRowSparseMatrixGeneric.h @@ -299,12 +299,6 @@ public : } } - SOFA_ATTRIBUTE_DISABLED__CRS_BLOCK_RENAMING() - void resizeBloc(Index nbBRow, Index nbBCol) - { - resizeBlock(nbBRow, nbBCol); - } - protected: /** @@ -781,12 +775,6 @@ public : return colsValue[colId]; } - SOFA_ATTRIBUTE_DISABLED__CRS_BLOCK_RENAMING() - const Block& bloc(Index i, Index j) const - { - return block(i, j); - } - /** * \brief Write block method * @param Line index i and column index j @@ -890,12 +878,6 @@ public : } } - SOFA_ATTRIBUTE_DISABLED__CRS_BLOCK_RENAMING() - Block* wbloc(Index i, Index j, bool create = false) - { - return wblock(i, j, create); - } - /** * \brief Write block method when rowId and colId are known, this is an optimized wblock specification * @param Line index i and column index j diff --git a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in index 34e06b81345..99377355cc0 100644 --- a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in +++ b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in @@ -41,24 +41,6 @@ # define SOFA_LINEARALGEBRA_API SOFA_IMPORT_DYNAMIC_LIBRARY #endif -// DEPRECATION MACROS - -#ifdef SOFA_BUILD_SOFA_LINEARALGEBRA -#define SOFA_ATTRIBUTE_DISABLED__GETSUBMATRIXSIZE(msg) -#else -#define SOFA_ATTRIBUTE_DISABLED__GETSUBMATRIXSIZE(msg) \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.06", "v23.12", "") -#endif // SOFA_BUILD_SOFA_LINEARALGEBRA - -#ifdef SOFA_BUILD_SOFA_LINEARALGEBRA -#define SOFA_ATTRIBUTE_DISABLED__CRS_BLOCK_RENAMING() -#else -#define SOFA_ATTRIBUTE_DISABLED__CRS_BLOCK_RENAMING() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.06", "v23.12", \ - "block has been renamed to block. ") -#endif // SOFA_BUILD_SOFA_LINEARALGEBRA #ifdef SOFA_BUILD_SOFA_LINEARALGEBRA diff --git a/Sofa/framework/Simulation/Common/src/sofa/simulation/common/TransformationVisitor.h b/Sofa/framework/Simulation/Common/src/sofa/simulation/common/TransformationVisitor.h index 4270da3ca6a..6571be96084 100644 --- a/Sofa/framework/Simulation/Common/src/sofa/simulation/common/TransformationVisitor.h +++ b/Sofa/framework/Simulation/Common/src/sofa/simulation/common/TransformationVisitor.h @@ -37,8 +37,6 @@ namespace class SOFA_SIMULATION_COMMON_API TransformationVisitor : public Visitor { public: - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - TransformationVisitor(const sofa::core::ExecParams* params); void setTranslation(SReal dx, SReal dy, SReal dz) { translation = Vec3(dx,dy,dz);} diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.cpp index f5d36848ed4..b20d1234b2b 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.cpp +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.cpp @@ -48,7 +48,7 @@ const std::string BaseMechanicalVisitor::fwdVisitorType = "fwd"; const std::string BaseMechanicalVisitor::bwdVisitorType = "bwd"; BaseMechanicalVisitor::BaseMechanicalVisitor(const sofa::core::ExecParams *params) - : Visitor(params), root(nullptr), rootData(nullptr) + : Visitor(params), root(nullptr) { // mechanical visitors shouldn't be able to access a sleeping node, only visual visitor should canAccessSleepingNode = false; @@ -171,7 +171,6 @@ Visitor::Result BaseMechanicalVisitor::processNodeTopDown(simulation::Node* node VisitorContext ctx; ctx.root = root; ctx.node = node; - ctx.nodeData = rootData; return processNodeTopDown(node, &ctx); } @@ -181,7 +180,6 @@ void BaseMechanicalVisitor::processNodeBottomUp(simulation::Node* node) VisitorContext ctx; ctx.root = root; ctx.node = node; - ctx.nodeData = rootData; processNodeBottomUp(node, &ctx); } diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.h index 3da6463d6dd..ee1fc92a26f 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.h @@ -46,27 +46,12 @@ class SOFA_SIMULATION_CORE_API BaseMechanicalVisitor : public Visitor protected: simulation::Node* root; ///< root node from which the visitor was executed - SOFA_ATTRIBUTE_DISABLED_NODEDATA() - SReal* rootData { nullptr }; ///< data for root node - virtual Result processNodeTopDown(simulation::Node* node, VisitorContext* ctx); virtual void processNodeBottomUp(simulation::Node* node, VisitorContext* ctx); public: BaseMechanicalVisitor(const sofa::core::ExecParams* params); - SOFA_ATTRIBUTE_DISABLED_NODEDATA() - virtual bool readNodeData() const = delete; - - SOFA_ATTRIBUTE_DISABLED_NODEDATA() - virtual bool writeNodeData() const = delete; - - SOFA_ATTRIBUTE_DISABLED_NODEDATA() - virtual void setNodeData(simulation::Node* /*node*/, SReal* /*nodeData*/, const SReal* /*parentData*/) = delete; - - SOFA_ATTRIBUTE_DISABLED_NODEDATA() - virtual void addNodeData(simulation::Node* /*node*/, SReal* /*parentData*/, const SReal* /*nodeData*/) = delete; - /// Return a class name for this visitor /// Only used for debugging / profiling purposes const char* getClassName() const override; @@ -82,11 +67,6 @@ class SOFA_SIMULATION_CORE_API BaseMechanicalVisitor : public Visitor /// This method calls the fwd* methods during the forward traversal. You typically do not overload it. Result processNodeTopDown(simulation::Node* node) override; - /// Parallel version of processNodeTopDown. - /// This method calls the fwd* methods during the forward traversal. You typically do not overload it. - SOFA_ATTRIBUTE_DISABLED_LOCALSTORAGE() - virtual Result processNodeTopDown(simulation::Node * node, LocalStorage * stack) override = delete; - /// Process the OdeSolver virtual Result fwdOdeSolver(simulation::Node* /*node*/, sofa::core::behavior::OdeSolver* /*solver*/); @@ -173,11 +153,6 @@ class SOFA_SIMULATION_CORE_API BaseMechanicalVisitor : public Visitor /// This method calls the bwd* methods during the backward traversal. You typically do not overload it. void processNodeBottomUp(simulation::Node* node) override; - /// Parallel version of processNodeBottomUp. - /// This method calls the bwd* methods during the backward traversal. You typically do not overload it. - SOFA_ATTRIBUTE_DISABLED_LOCALSTORAGE() - virtual void processNodeBottomUp(simulation::Node* node, LocalStorage * stack) override = delete; - /// Process the BaseMechanicalState when it is not mapped from parent level virtual void bwdMechanicalState(simulation::Node* /*node*/,sofa::core::behavior::BaseMechanicalState* /*mm*/); diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.cpp index 99e6484986b..025e2f5c549 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.cpp +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.cpp @@ -1006,15 +1006,6 @@ void Node::printComponents() msg_info() << sstream.str(); } -Node::SPtr Node::create( const std::string& name ) -{ - if (Simulation* simulation = getSimulation()) - { - return simulation->createNewNode(name); - } - return nullptr; -} - void Node::setSleeping(bool val) { if (val != d_isSleeping.getValue()) diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.h index 2318c243d9f..4b07b4713ff 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.h @@ -517,9 +517,6 @@ class SOFA_SIMULATION_CORE_API Node : public sofa::core::objectmodel::BaseNode, template static Node::SPtr create(RealObject*, sofa::core::objectmodel::BaseObjectDescription* arg); - SOFA_ATTRIBUTE_DISABLED_NODECREATENODE() - static Node::SPtr create( const std::string& name ); - /// return the smallest common parent between this and node2 (returns nullptr if separated sub-graphes) virtual Node* findCommonParent( simulation::Node* node2 ) = 0; diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/Simulation.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/Simulation.h index 21289b2eda9..a6befd116e5 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/Simulation.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/Simulation.h @@ -102,86 +102,6 @@ class SOFA_SIMULATION_CORE_API Simulation Simulation(const Simulation& n) = delete; Simulation& operator=(const Simulation& n) = delete; - /// Print all object in the graph - SOFA_ATTRIBUTE_DISABLED_SIMULATION_PRINT() - virtual void print(Node* root) = delete; - - /// Initialize the objects - SOFA_ATTRIBUTE_DISABLED_SIMULATION_INIT() - virtual void init(Node* root) = delete; - - ///Init a node without changing the context of the simulation. - SOFA_ATTRIBUTE_DISABLED_SIMULATION_INITNODE() - virtual void initNode(Node* node) = delete; - - /// Execute one timestep. If dt is 0, the dt parameter in the graph will be used - SOFA_ATTRIBUTE_DISABLED_SIMULATION_ANIMATE() - virtual void animate(Node* root, SReal dt=0.0) = delete; - - /// Update the Visual Models: triggers the Mappings - SOFA_ATTRIBUTE_DISABLED_SIMULATION_UPDATEVISUAL() - virtual void updateVisual(Node* root) = delete; - - /// Reset to initial state - SOFA_ATTRIBUTE_DISABLED_SIMULATION_RESET() - virtual void reset(Node* root) = delete; - - /// Initialize the textures - SOFA_ATTRIBUTE_DISABLED_SIMULATION_INITTEXTURE() - virtual void initTextures(Node* root) = delete; - - /// Update contexts. Required before drawing the scene if root flags are modified. - SOFA_ATTRIBUTE_DISABLED_SIMULATION_UPDATECONTEXT() - virtual void updateContext(Node* root) = delete; - - /// Update contexts. Required before drawing the scene if root flags are modified. - SOFA_ATTRIBUTE_DISABLED_SIMULATION_UPDATEVISUALCONTEXT() - virtual void updateVisualContext(Node* root) = delete; - - /** Compute the bounding box of the scene. - * If init is set to "true", then minBBox and maxBBox will be initialised to a default value - * @warning MechanicalObjects with showObject member set to false are ignored - * @sa computeTotalBBox(Node* root, SReal* minBBox, SReal* maxBBox) - */ - SOFA_ATTRIBUTE_DISABLED_SIMULATION_COMPUTEBBOX() - virtual void computeBBox(Node* root, SReal* minBBox, SReal* maxBBox, bool init=true) = delete; - - /** Compute the bounding box of the scene. - * Includes all objects, may they be displayed or not. - * @sa computeBBox(Node* root, SReal* minBBox, SReal* maxBBox, bool init=true) - * @deprecated - */ - SOFA_ATTRIBUTE_DISABLED_SIMULATION_COMPUTETOTALBBOX() - virtual void computeTotalBBox(Node* root, SReal* minBBox, SReal* maxBBox) = delete; - - /// Render the scene - SOFA_ATTRIBUTE_DISABLED_SIMULATION_DRAW() - virtual void draw(sofa::core::visual::VisualParams* vparams, Node* root) = delete; - - /// Export a scene to an OBJ 3D Scene - SOFA_ATTRIBUTE_DISABLED_SIMULATION_EXPORTOBJ() - virtual void exportOBJ(Node* root, const char* filename, bool exportMTL = true) = delete; - - /// Print all object in the graph in XML format - SOFA_ATTRIBUTE_DISABLED_SIMULATION_EXPORTXML() - virtual void exportXML(Node* root, const char* fileName=nullptr) = delete; - - /// Print all objects in the graph in the given file (format is given by the filename extension) - SOFA_ATTRIBUTE_DISABLED_SIMULATION_EXPORTGRAPH() - virtual void exportGraph(Node* root, const char* filename=nullptr) = delete; - - /// Dump the current state in the given stream - SOFA_ATTRIBUTE_DISABLED_SIMULATION_DUMPSTATE() - virtual void dumpState( Node* root, std::ofstream& out ) = delete; - - /// Load a scene from a file - SOFA_ATTRIBUTE_DISABLED_SIMULATION_LOAD() - virtual NodeSPtr load(const std::string& /* filename */, bool reload = false, const std::vector& sceneArgs = std::vector(0)) = delete; - - /// Unload a scene from a Node. - SOFA_ATTRIBUTE_DISABLED_SIMULATION_UNLOAD() - virtual void unload(NodeSPtr root) = delete; - /// create a new graph(or tree) and return its root node. virtual NodeSPtr createNewGraph(const std::string& name)=0;//Todo replace newNode method diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/Visitor.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/Visitor.h index a9815fd6f19..f64eb8e801f 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/Visitor.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/Visitor.h @@ -49,7 +49,6 @@ class SOFA_SIMULATION_CORE_API Visitor public: simulation::Node* root; ///< root node from which the visitor was executed simulation::Node* node; ///< current node - SReal* nodeData; ///< SReal value associated with this subtree. Set to nullptr if node-specific data is not in use }; typedef helper::system::thread::ctime_t ctime_t; #ifdef SOFA_DUMP_VISITOR_INFO @@ -158,16 +157,6 @@ class SOFA_SIMULATION_CORE_API Visitor /// Specify whether this visitor can be parallelized. virtual bool isThreadSafe() const { return false; } - /// Callback method called when descending to a new node. Recursion will stop if this method returns RESULT_PRUNE - /// This version is offered a LocalStorage to store temporary data - SOFA_ATTRIBUTE_DISABLED_LOCALSTORAGE() - virtual Result processNodeTopDown(simulation::Node* node, LocalStorage*) = delete; - - /// Callback method called after child node have been processed and before going back to the parent node. - /// This version is offered a LocalStorage to store temporary data - SOFA_ATTRIBUTE_DISABLED_LOCALSTORAGE() - virtual void processNodeBottomUp(simulation::Node* node, LocalStorage*) = delete; - typedef sofa::core::objectmodel::Tag Tag; typedef sofa::core::objectmodel::TagSet TagSet; /// list of the subsets diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in b/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in index 53ed3e67af5..cd2b0bc43f3 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/config.h.in @@ -32,173 +32,7 @@ # define SOFA_SIMULATION_CORE_API SOFA_IMPORT_DYNAMIC_LIBRARY #endif -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_NODECREATENODE() -#else -#define SOFA_ATTRIBUTE_DISABLED_NODECREATENODE() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.12", "v24.06", "") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_PRINT() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_PRINT() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.12", "v24.06", "Use sofa::simulation::node::printNode") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_INIT() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_INIT() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::initRoot") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_INITNODE() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_INITNODE() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::init") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_EXPORTXML() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_EXPORTXML() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::exportInXML") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_UPDATEVISUALCONTEXT() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_UPDATEVISUALCONTEXT() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::updateVisualContext") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_ANIMATE() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_ANIMATE() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::animate") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_UPDATEVISUAL() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_UPDATEVISUAL() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::updateVisual") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_RESET() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_RESET() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::reset") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_INITTEXTURE() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_INITTEXTURE() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::initTextures") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_UPDATECONTEXT() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_UPDATECONTEXT() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::updateContext") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_COMPUTEBBOX() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_COMPUTEBBOX() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::computeBBox") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_COMPUTETOTALBBOX() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_COMPUTETOTALBBOX() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::computeTotalBBox") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_DRAW() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_DRAW() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::draw") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_EXPORTOBJ() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_EXPORTOBJ() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::exportOBJ") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_EXPORTGRAPH() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_EXPORTGRAPH() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::exportGraph") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_DUMPSTATE() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_DUMPSTATE() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::dumpState") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_LOAD() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_LOAD() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::load") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_UNLOAD() -#else -#define SOFA_ATTRIBUTE_DISABLED_SIMULATION_UNLOAD() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "Use sofa::simulation::node::unload") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_SETSIMULATIONRAWPOINTER() -#else -#define SOFA_ATTRIBUTE_DISABLED_SETSIMULATIONRAWPOINTER() \ -SOFA_ATTRIBUTE_DISABLED( \ -"v23.12", "v24.06", "This function is no longer useful if Sofa.Simulation.Graph is loaded. Calling this function may result in a memory leak.") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_VISITORSCHEDULER() -#else -#define SOFA_ATTRIBUTE_DISABLED_VISITORSCHEDULER() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.12", "v24.06", "This class is no longer used") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE #ifdef SOFA_BUILD_SOFA_SIMULATION_CORE #define SOFA_HEADER_DISABLED_VISITORSCHEDULER() @@ -216,19 +50,9 @@ SOFA_ATTRIBUTE_DISABLED( \ #ifdef SOFA_BUILD_SOFA_SIMULATION_CORE #define SOFA_HEADER_DISABLED_LOCALSTORAGE() -#define SOFA_ATTRIBUTE_DISABLED_LOCALSTORAGE() #else #define SOFA_HEADER_DISABLED_LOCALSTORAGE() \ SOFA_HEADER_DISABLED_NOT_REPLACED("v23.12", "v24.06") -#define SOFA_ATTRIBUTE_DISABLED_LOCALSTORAGE() \ - SOFA_ATTRIBUTE_DISABLED("v23.12", "v24.06", "LocalStorage feature was seemingly not used so it has been removed.") -#endif // SOFA_BUILD_SOFA_SIMULATION_CORE - -#ifdef SOFA_BUILD_SOFA_SIMULATION_CORE -#define SOFA_ATTRIBUTE_DISABLED_NODEDATA() -#else -#define SOFA_ATTRIBUTE_DISABLED_NODEDATA() \ -SOFA_ATTRIBUTE_DISABLED("v23.12", "v24.06", "rootdata/nodedata feature was never really used so it has been removed. All the related functions/members/variables won't do anything.") #endif // SOFA_BUILD_SOFA_SIMULATION_CORE #ifdef SOFA_BUILD_SOFA_SIMULATION_CORE diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/fwd.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/fwd.h index 76b84b89446..f8ab1cf945e 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/fwd.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/fwd.h @@ -36,10 +36,6 @@ namespace sofa::simulation class Simulation; typedef sofa::core::sptr SimulationSPtr; - /// Set the (unique) simulation which controls the scene - SOFA_ATTRIBUTE_DISABLED_SETSIMULATIONRAWPOINTER() - void setSimulation(Simulation* s) = delete; - /** Get the (unique) simulation which controls the scene. Automatically creates one if no Simulation has been set. */ diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalVMultiOpVisitor.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalVMultiOpVisitor.cpp index a232fc561b6..afc2c61e573 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalVMultiOpVisitor.cpp +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalVMultiOpVisitor.cpp @@ -36,19 +36,7 @@ Visitor::Result MechanicalVMultiOpVisitor::fwdMappedMechanicalState(VisitorConte { if (mapped) { - if (ctx->nodeData && *ctx->nodeData != 1.0) - { - VMultiOp ops2 = ops; - const SReal fact = *ctx->nodeData; - for (VMultiOp::iterator it = ops2.begin(), itend = ops2.end(); it != itend; ++it) - for (unsigned int i = 1; i < it->second.size(); ++i) - it->second[i].second *= fact; - mm->vMultiOp(this->params, ops2 ); - } - else - { - mm->vMultiOp(this->params, ops ); - } + mm->vMultiOp(this->params, ops ); } return RESULT_CONTINUE; } @@ -106,4 +94,4 @@ std::string MechanicalVMultiOpVisitor::getInfos() const return out.str(); } -} \ No newline at end of file +} diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalVOpVisitor.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalVOpVisitor.cpp index d428f643e39..d9013bd157b 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalVOpVisitor.cpp +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalVOpVisitor.cpp @@ -37,17 +37,25 @@ bool MechanicalVOpVisitor::stopAtMechanicalMapping(simulation::Node *, sofa::cor Visitor::Result MechanicalVOpVisitor::fwdMechanicalState(VisitorContext* ctx, core::behavior::BaseMechanicalState* mm) { + SOFA_UNUSED(ctx); + if (!only_mapped) - mm->vOp(this->params, v.getId(mm) ,a.getId(mm),b.getId(mm),((ctx->nodeData && *ctx->nodeData != 1.0) ? *ctx->nodeData * f : f) ); + { + mm->vOp(this->params, v.getId(mm) ,a.getId(mm),b.getId(mm), f); + } + return RESULT_CONTINUE; } Visitor::Result MechanicalVOpVisitor::fwdMappedMechanicalState(VisitorContext* ctx, core::behavior::BaseMechanicalState* mm) { + SOFA_UNUSED(ctx); + if (mapped || only_mapped) { - mm->vOp(this->params, v.getId(mm) ,a.getId(mm),b.getId(mm),((ctx->nodeData && *ctx->nodeData != 1.0) ? *ctx->nodeData * f : f) ); + mm->vOp(this->params, v.getId(mm) ,a.getId(mm),b.getId(mm), f); } + return RESULT_CONTINUE; } @@ -88,4 +96,4 @@ std::string MechanicalVOpVisitor::getInfos() const return info; } -} \ No newline at end of file +} diff --git a/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGSimulation.h b/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGSimulation.h index 60acb4c2a6c..00f00178a23 100644 --- a/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGSimulation.h +++ b/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGSimulation.h @@ -50,9 +50,4 @@ class SOFA_SIMULATION_GRAPH_API DAGSimulation: public Simulation bool isDirectedAcyclicGraph() override { return true; } }; -/** Get the (unique) simulation which controls the scene. -Automatically creates one if no Simulation has been set. - */ -SOFA_ATTRIBUTE_DISABLED_DAGSIMULATION_GETSIMULATION() -Simulation* getSimulation() = delete; } // namespace sofa::simulation::graph diff --git a/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/config.h.in b/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/config.h.in index ae6d345e27e..b3d1bf84be3 100644 --- a/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/config.h.in +++ b/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/config.h.in @@ -32,11 +32,3 @@ #else # define SOFA_SIMULATION_GRAPH_API SOFA_IMPORT_DYNAMIC_LIBRARY #endif - -#ifdef SOFA_BUILD_SOFA_SIMULATION_GRAPH -#define SOFA_ATTRIBUTE_DISABLED_DAGSIMULATION_GETSIMULATION() -#else -#define SOFA_ATTRIBUTE_DISABLED_DAGSIMULATION_GETSIMULATION() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.12", "v24.06", "") -#endif // SOFA_BUILD_SOFA_SIMULATION_GRAPH diff --git a/Sofa/framework/Type/src/sofa/type/RGBAColor.h b/Sofa/framework/Type/src/sofa/type/RGBAColor.h index 0d4af4739a8..af9aac7c0a0 100644 --- a/Sofa/framework/Type/src/sofa/type/RGBAColor.h +++ b/Sofa/framework/Type/src/sofa/type/RGBAColor.h @@ -60,21 +60,6 @@ class SOFA_TYPE_API RGBAColor constexpr RGBAColor(float r, float g, float b, float a) : m_components{ r, g, b, a } {} - // compat - SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() - RGBAColor(const type::fixed_array& c) = delete; - SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() - RGBAColor(const type::Vec4f& c) = delete; - - SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() - static RGBAColor fromVec4(const type::fixed_array& color) = delete; - SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() - static RGBAColor fromVec4(const type::fixed_array& color) = delete; - SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() - static RGBAColor fromVec4(const Vec4f& color) = delete; - SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() - static RGBAColor fromVec4(const Vec4d& color) = delete; - static RGBAColor fromString(const std::string& str); static RGBAColor fromFloat(float r, float g, float b, float a); static RGBAColor fromStdArray(const std::array& color); diff --git a/Sofa/framework/Type/src/sofa/type/config.h.in b/Sofa/framework/Type/src/sofa/type/config.h.in index 2bb528f7e5f..2fead35bd1b 100644 --- a/Sofa/framework/Type/src/sofa/type/config.h.in +++ b/Sofa/framework/Type/src/sofa/type/config.h.in @@ -33,15 +33,6 @@ #endif -#ifdef SOFA_BUILD_SOFA_TYPE -#define SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() -#else -#define SOFA_ATTRIBUTE_DISABLED__RGBACOLOR_AS_FIXEDARRAY() \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.12", "v24.06", \ - "RGBAColor does not inherit anymore from sofa::type::fixed_array. Use respective functions accordingly.") -#endif - #ifdef SOFA_BUILD_SOFA_TYPE #define SOFA_ATTRIBUTE_DISABLED__BOUNDINGBOX_TYPO() #else diff --git a/applications/plugins/MultiThreading/src/MultiThreading/component/animationloop/AnimationLoopParallelScheduler.h b/applications/plugins/MultiThreading/src/MultiThreading/component/animationloop/AnimationLoopParallelScheduler.h index ecffebb8269..7734992e770 100644 --- a/applications/plugins/MultiThreading/src/MultiThreading/component/animationloop/AnimationLoopParallelScheduler.h +++ b/applications/plugins/MultiThreading/src/MultiThreading/component/animationloop/AnimationLoopParallelScheduler.h @@ -48,16 +48,6 @@ class SOFA_MULTITHREADING_PLUGIN_API AnimationLoopParallelScheduler : typedef sofa::core::behavior::BaseAnimationLoop Inherit; SOFA_CLASS(AnimationLoopParallelScheduler,sofa::core::behavior::BaseAnimationLoop); - SOFA_ATTRIBUTE_DISABLED__TASKSCHEDULERUSER_DATANAME("Use TaskSchedulerUser::d_taskSchedulerType instead.") - sofa::core::objectmodel::lifecycle::RemovedData schedulerName {this, "v23.06", "v23.12", - "scheduler", - "To fix you scene you can rename 'scheduler' with 'taskSchedulerType'."}; - - SOFA_ATTRIBUTE_DISABLED__TASKSCHEDULERUSER_DATANAME("Use TaskSchedulerUser::d_nbThreads instead.") - sofa::core::objectmodel::lifecycle::RemovedData threadNumber {this, "v23.06", "v23.12", - "threadNumber", - "To fix you scene you can rename 'threadNumber' with 'nbThreads'."}; - protected: AnimationLoopParallelScheduler(sofa::simulation::Node* gnode = NULL); diff --git a/applications/plugins/MultiThreading/src/MultiThreading/config.h.in b/applications/plugins/MultiThreading/src/MultiThreading/config.h.in index 8b2f185328b..dd3b253141a 100644 --- a/applications/plugins/MultiThreading/src/MultiThreading/config.h.in +++ b/applications/plugins/MultiThreading/src/MultiThreading/config.h.in @@ -35,11 +35,3 @@ namespace multithreading constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace multithreading - -#ifdef SOFA_BUILD_MULTITHREADING -#define SOFA_ATTRIBUTE_DISABLED__TASKSCHEDULERUSER_DATANAME(msg) -#else -#define SOFA_ATTRIBUTE_DISABLED__TASKSCHEDULERUSER_DATANAME(msg) \ - SOFA_ATTRIBUTE_DISABLED( \ - "v23.06", "v23.12", msg) -#endif diff --git a/applications/plugins/image/CollisionToCarvingEngine.h b/applications/plugins/image/CollisionToCarvingEngine.h index 365b1d84424..bef440af419 100644 --- a/applications/plugins/image/CollisionToCarvingEngine.h +++ b/applications/plugins/image/CollisionToCarvingEngine.h @@ -80,8 +80,6 @@ class CollisionToCarvingEngine : public core::DataEngine typedef type::vector ParamTypes; typedef helper::ReadAccessor > raParam; - SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3); - // -------- Datas ---------------------------- Data< InImageTypes > inputImage; Data< TransformType > inputTransform; diff --git a/examples/Benchmark/Performance/benchmark_cubes.pscn b/examples/Benchmark/Performance/benchmark_cubes.pscn index 007f796a7d8..74ae6720772 100644 --- a/examples/Benchmark/Performance/benchmark_cubes.pscn +++ b/examples/Benchmark/Performance/benchmark_cubes.pscn @@ -25,7 +25,7 @@ - +