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 3f4b0bbaf72..4fff7a8b8fc 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/config.h.in +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/config.h.in @@ -31,15 +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 - namespace sofa::component::collision::detection::algorithm { constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; 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 43a3328ba3d..4e1069db2fa 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 @@ -102,7 +102,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/config.h.in b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/config.h.in index 771dfbe211c..0dec2064449 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 @@ -36,12 +36,3 @@ namespace sofa::component::constraint::lagrangian::solver constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; } // namespace 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 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 a95fea46b98..316bed5d8af 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 8a65b85105c..8129c43480a 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 024282a1ede..2254837dd75 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 71aad6d52fe..43733b0cf3d 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 38946640166..b56b39369f4 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..31866523e39 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,8 +44,6 @@ 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; 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 af5ed9e5804..8c604f0605e 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 8dada4be948..129d44c2ba1 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/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/ODESolver/Backward/tests/EulerImplicitSolverStatic_test.cpp b/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolverStatic_test.cpp index 30c8c945c9d..12c5fdd82a3 100644 --- a/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolverStatic_test.cpp +++ b/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolverStatic_test.cpp @@ -144,8 +144,8 @@ struct EulerImplicit_test_2_particles_to_equilibrium : public BaseSimulationTest // run simulation Eigen::VectorXd x0, x1, v0, v1; - x0 = component::odesolver::testing::getVector( root, core::VecId::position() ); //cerr<<"EulerImplicit_test, initial positions : " << x0.transpose() << endl; - v0 = component::odesolver::testing::getVector( root, core::VecId::velocity() ); + x0 = component::odesolver::testing::getVector( root, sofa::core::vec_id::read_access::position ); //cerr<<"EulerImplicit_test, initial positions : " << x0.transpose() << endl; + v0 = component::odesolver::testing::getVector( root, sofa::core::vec_id::read_access::velocity ); Eigen::VectorXd::RealScalar dx, dv; unsigned n=0; @@ -154,8 +154,8 @@ struct EulerImplicit_test_2_particles_to_equilibrium : public BaseSimulationTest do { sofa::simulation::node::animate(root.get(), 1_sreal); - x1 = component::odesolver::testing::getVector( root, core::VecId::position() ); //cerr<<"EulerImplicit_test, new positions : " << x1.transpose() << endl; - v1 = component::odesolver::testing::getVector( root, core::VecId::velocity() ); + x1 = component::odesolver::testing::getVector( root, sofa::core::vec_id::read_access::position ); //cerr<<"EulerImplicit_test, new positions : " << x1.transpose() << endl; + v1 = component::odesolver::testing::getVector( root, sofa::core::vec_id::read_access::velocity ); dx = (x0-x1).lpNorm(); dv = (v0-v1).lpNorm(); @@ -260,8 +260,8 @@ struct EulerImplicit_test_2_particles_in_different_nodes_to_equilibrium : publi // run simulation Eigen::VectorXd x0, x1, v0, v1; - x0 = component::odesolver::testing::getVector(root, core::VecId::position() ); //cerr<<"EulerImplicit_test, initial positions : " << x0.transpose() << endl; - v0 = component::odesolver::testing::getVector(root, core::VecId::velocity() ); + x0 = component::odesolver::testing::getVector(root, sofa::core::vec_id::read_access::position ); //cerr<<"EulerImplicit_test, initial positions : " << x0.transpose() << endl; + v0 = component::odesolver::testing::getVector(root, sofa::core::vec_id::read_access::velocity ); SReal dx, dv; unsigned n=0; @@ -270,8 +270,8 @@ struct EulerImplicit_test_2_particles_in_different_nodes_to_equilibrium : publi do { sofa::simulation::node::animate(root.get(), 1_sreal); - x1 = component::odesolver::testing::getVector(root, core::VecId::position() ); //cerr<<"EulerImplicit_test, new positions : " << x1.transpose() << endl; - v1 = component::odesolver::testing::getVector(root, core::VecId::velocity() ); + x1 = component::odesolver::testing::getVector(root, sofa::core::vec_id::read_access::position ); //cerr<<"EulerImplicit_test, new positions : " << x1.transpose() << endl; + v1 = component::odesolver::testing::getVector(root, sofa::core::vec_id::read_access::velocity ); dx = (x0-x1).lpNorm(); dv = (v0-v1).lpNorm(); 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..f980600d254 100644 --- a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.h +++ b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.h @@ -73,9 +73,6 @@ class MechanicalObject : public sofa::core::behavior::MechanicalState 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 9760848a6e7..d1a748c4de8 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 92dde7f38e1..f23534f2848 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/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetGeometryAlgorithms.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetGeometryAlgorithms.h index a611af2d89c..d1fb2a8733e 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetGeometryAlgorithms.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetGeometryAlgorithms.h @@ -147,9 +147,6 @@ class HexahedronSetGeometryAlgorithms : public QuadSetGeometryAlgorithms d_showHexaIndices; ///< Debug : view Hexa indices Data d_drawHexahedra; ///< if true, draw the Hexahedron in the topology diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetGeometryAlgorithms.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetGeometryAlgorithms.h index ea962fb6ff5..287dc7f85ac 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetGeometryAlgorithms.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetGeometryAlgorithms.h @@ -101,9 +101,6 @@ class QuadSetGeometryAlgorithms : public EdgeSetGeometryAlgorithms void draw(const core::visual::VisualParams* vparams) override; - SOFA_ATTRIBUTE_DISABLED("v23.12", "v23.12", "Method writeMSHfile has been disabled. To export the topology as .gmsh file, use the sofa::component::io::mesh::MeshExporter.") - void writeMSHfile(const char *filename) const {msg_deprecated() << "Method writeMSHfile has been disabled. To export the topology as " << filename << " file, use the sofa::component::io::mesh::MeshExporter."; } - protected: Data showQuadIndices; ///< Debug : view Quad indices Data _drawQuads; ///< if true, draw the quads in the topology diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TetrahedronSetGeometryAlgorithms.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TetrahedronSetGeometryAlgorithms.h index f4d1a401f6b..1e4046d9ea5 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TetrahedronSetGeometryAlgorithms.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TetrahedronSetGeometryAlgorithms.h @@ -164,9 +164,6 @@ class TetrahedronSetGeometryAlgorithms : public TriangleSetGeometryAlgorithms& intersectedPoints, sofa::type::vector& intersectedEdgeID, Coord planePos, Coord planeNormal); int subDivideRestTetrahedronWithPlane(TetraID tetraIdx, sofa::type::vector& intersectedEdgeID, sofa::type::vector& intersectedPointID, Coord planeNormal, sofa::type::vector& toBeAddedTetra); - SOFA_ATTRIBUTE_DISABLED("v23.12", "v23.12", "Method writeMSHfile has been disabled. To export the topology as .gmsh file, use the sofa::component::io::mesh::MeshExporter.") - void writeMSHfile(const char *filename) const {msg_deprecated() << "Method writeMSHfile has been disabled. To export the topology as " << filename << " file, use the sofa::component::io::mesh::MeshExporter."; } - protected: Data d_showTetrahedraIndices; ///< Debug : view Tetrahedrons indices Data d_drawTetrahedra; ///< if true, draw the tetrahedra in the topology diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h index b4f0541a94c..fe9fe62e8f7 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h @@ -352,10 +352,6 @@ class TriangleSetGeometryAlgorithms : public EdgeSetGeometryAlgorithms& edges, sofa::type::vector& new_points, sofa::type::vector& end_points, bool& reachBorder); - - SOFA_ATTRIBUTE_DISABLED("v23.12", "v23.12", "Method writeMSHfile has been disabled. To export the topology as .gmsh file, use the sofa::component::io::mesh::MeshExporter.") - void writeMSHfile(const char *filename) const {msg_deprecated() << "Method writeMSHfile has been disabled. To export the topology as " << filename << " file, use the sofa::component::io::mesh::MeshExporter."; } - protected: Data showTriangleIndices; ///< Debug : view Triangle indices Data _draw; ///< if true, draw the triangles in the topology 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 918130f6954..9bdf79288cc 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 @@ -53,12 +53,8 @@ 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 b09362eeb06..034222c679b 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 b50a63a451b..4f592043037 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 025dee32a40..92f623d3f0c 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); - enum PLANE { PLANE_X = 0, diff --git a/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h b/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h index 67de4430f77..1cc8b8e3c04 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h @@ -53,8 +53,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/GL/src/sofa/gl/Axis.h b/Sofa/GL/src/sofa/gl/Axis.h index 171aa68ab48..a35606ef5a4 100644 --- a/Sofa/GL/src/sofa/gl/Axis.h +++ b/Sofa/GL/src/sofa/gl/Axis.h @@ -38,10 +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); Axis(const type::Vec3& len); 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 5f7c18dee34..839c338ac3d 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/framework/Config/src/sofa/config.h.in b/Sofa/framework/Config/src/sofa/config.h.in index ccd35844237..9d12425070a 100644 --- a/Sofa/framework/Config/src/sofa/config.h.in +++ b/Sofa/framework/Config/src/sofa/config.h.in @@ -197,23 +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/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/visual/VisualModel.cpp b/Sofa/framework/Core/src/sofa/core/visual/VisualModel.cpp index 149c9fed397..919c5975ec8 100644 --- a/Sofa/framework/Core/src/sofa/core/visual/VisualModel.cpp +++ b/Sofa/framework/Core/src/sofa/core/visual/VisualModel.cpp @@ -71,11 +71,6 @@ void VisualModel::updateVisual(const VisualParams* vparams) doUpdateVisual(vparams); } -void VisualModel::updateVisual() -{ - updateVisual(sofa::core::visual::visualparams::defaultInstance()); -} - void VisualModel::initVisual(const VisualParams* vparams) { // don't init visual things if the component is not in valid state @@ -85,11 +80,6 @@ void VisualModel::initVisual(const VisualParams* vparams) doInitVisual(vparams); } -void VisualModel::initVisual() -{ - initVisual(sofa::core::visual::visualparams::defaultInstance()); -} - bool VisualModel::insertInNode( objectmodel::BaseNode* node ) { node->addVisualModel(this); diff --git a/Sofa/framework/Core/src/sofa/core/visual/VisualModel.h b/Sofa/framework/Core/src/sofa/core/visual/VisualModel.h index 761cad0e877..3aa85eb09e8 100644 --- a/Sofa/framework/Core/src/sofa/core/visual/VisualModel.h +++ b/Sofa/framework/Core/src/sofa/core/visual/VisualModel.h @@ -69,17 +69,18 @@ class SOFA_CORE_API VisualModel : public virtual objectmodel::BaseObject // Deprecate the usage of initVisual() // But the final keyword will break the compilation if one does override initVisual anyway. SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use initVisual(const VisualParams*) instead") - virtual void initVisual() final; + virtual void initVisual() final = delete; /** * \brief used to update the model if necessary. * */ void updateVisual(const VisualParams* /*vparams*/); + // Deprecate the usage of updateVisual() // But the final keyword will break the compilation if one does override updateVisual() anyway. SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", "Use updateVisual(const VisualParams*) instead") - virtual void updateVisual() final; + virtual void updateVisual() final = delete; protected: VisualModel(); diff --git a/Sofa/framework/Core/test/VecId_test.cpp b/Sofa/framework/Core/test/VecId_test.cpp index ed15bbb961f..b509a81e12f 100644 --- a/Sofa/framework/Core/test/VecId_test.cpp +++ b/Sofa/framework/Core/test/VecId_test.cpp @@ -38,63 +38,63 @@ TEST(BaseVecId, constructor) TEST(VecId, name) { - static constexpr auto position = sofa::core::VecCoordId::position(); + static constexpr auto position = sofa::core::vec_id::read_access::position; EXPECT_EQ(position.getName(), "position(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::read_access::position.getName(), "position(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::write_access::position.getName(), "position(V_COORD)"); - static constexpr auto restPosition = sofa::core::VecCoordId::restPosition(); + static constexpr auto restPosition = sofa::core::vec_id::read_access::restPosition; EXPECT_EQ(restPosition.getName(), "restPosition(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::read_access::restPosition.getName(), "restPosition(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::write_access::restPosition.getName(), "restPosition(V_COORD)"); - static constexpr auto freePosition = sofa::core::VecCoordId::freePosition(); + static constexpr auto freePosition = sofa::core::vec_id::read_access::freePosition; EXPECT_EQ(freePosition.getName(), "freePosition(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::read_access::freePosition.getName(), "freePosition(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::write_access::freePosition.getName(), "freePosition(V_COORD)"); - static constexpr auto resetPosition = sofa::core::VecCoordId::resetPosition(); + static constexpr auto resetPosition = sofa::core::vec_id::read_access::resetPosition; EXPECT_EQ(resetPosition.getName(), "resetPosition(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::read_access::resetPosition.getName(), "resetPosition(V_COORD)"); EXPECT_EQ(sofa::core::vec_id::write_access::resetPosition.getName(), "resetPosition(V_COORD)"); - static constexpr auto velocity = sofa::core::VecDerivId::velocity(); + static constexpr auto velocity = sofa::core::vec_id::read_access::velocity; EXPECT_EQ(velocity.getName(), "velocity(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::velocity.getName(), "velocity(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::velocity.getName(), "velocity(V_DERIV)"); - static constexpr auto resetVelocity = sofa::core::VecDerivId::resetVelocity(); + static constexpr auto resetVelocity = sofa::core::vec_id::read_access::resetVelocity; EXPECT_EQ(resetVelocity.getName(), "resetVelocity(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::resetVelocity.getName(), "resetVelocity(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::resetVelocity.getName(), "resetVelocity(V_DERIV)"); - static constexpr auto freeVelocity = sofa::core::VecDerivId::freeVelocity(); + static constexpr auto freeVelocity = sofa::core::vec_id::read_access::freeVelocity; EXPECT_EQ(freeVelocity.getName(), "freeVelocity(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::freeVelocity.getName(), "freeVelocity(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::freeVelocity.getName(), "freeVelocity(V_DERIV)"); - static constexpr auto normal = sofa::core::VecDerivId::normal(); + static constexpr auto normal = sofa::core::vec_id::read_access::normal; EXPECT_EQ(normal.getName(), "normal(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::normal.getName(), "normal(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::normal.getName(), "normal(V_DERIV)"); - static constexpr auto force = sofa::core::VecDerivId::force(); + static constexpr auto force = sofa::core::vec_id::read_access::force; EXPECT_EQ(force.getName(), "force(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::force.getName(), "force(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::force.getName(), "force(V_DERIV)"); - static constexpr auto externalForce = sofa::core::VecDerivId::externalForce(); + static constexpr auto externalForce = sofa::core::vec_id::read_access::externalForce; EXPECT_EQ(externalForce.getName(), "externalForce(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::externalForce.getName(), "externalForce(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::externalForce.getName(), "externalForce(V_DERIV)"); - static constexpr auto dx = sofa::core::VecDerivId::dx(); + static constexpr auto dx = sofa::core::vec_id::read_access::dx; EXPECT_EQ(dx.getName(), "dx(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::dx.getName(), "dx(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::dx.getName(), "dx(V_DERIV)"); - static constexpr auto dforce = sofa::core::VecDerivId::dforce(); + static constexpr auto dforce = sofa::core::vec_id::read_access::dforce; EXPECT_EQ(dforce.getName(), "dforce(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::read_access::dforce.getName(), "dforce(V_DERIV)"); EXPECT_EQ(sofa::core::vec_id::write_access::dforce.getName(), "dforce(V_DERIV)"); diff --git a/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.h b/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.h index 12d20351216..31e4c0387f6 100644 --- a/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.h +++ b/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.h @@ -38,10 +38,6 @@ 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(); diff --git a/Sofa/framework/Helper/src/sofa/helper/NameDecoder.h b/Sofa/framework/Helper/src/sofa/helper/NameDecoder.h index 2a7dc91b04d..3715a3b185b 100644 --- a/Sofa/framework/Helper/src/sofa/helper/NameDecoder.h +++ b/Sofa/framework/Helper/src/sofa/helper/NameDecoder.h @@ -31,27 +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 static std::string getTypeName() @@ -83,11 +62,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.h b/Sofa/framework/Helper/src/sofa/helper/OptionsGroup.h index a6fa39ac04b..ecc13f0b59e 100644 --- a/Sofa/framework/Helper/src/sofa/helper/OptionsGroup.h +++ b/Sofa/framework/Helper/src/sofa/helper/OptionsGroup.h @@ -52,11 +52,6 @@ public : /// Default constructor OptionsGroup(); - ///Constructor by given the number of argument following by the variable arguments - ///Example OptionsGroup m_options(4,"button0","button1","button2","button3"); - SOFA_ATTRIBUTE_DISABLED("v23.06", "v23.12", "This constructor is error-prone. Use another constructor.") - explicit OptionsGroup(int nbofRadioButton,...); - ///generic constructor taking other string container like list, set, vector template ::value> > explicit OptionsGroup(const T& list); @@ -78,10 +73,6 @@ public : 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 7a7e7f0ba16..68ae697d463 100644 --- a/Sofa/framework/Helper/src/sofa/helper/config.h.in +++ b/Sofa/framework/Helper/src/sofa/helper/config.h.in @@ -40,14 +40,6 @@ # 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 - #define SOFA_ATTRIBUTE_DISABLED__PLUGIN_GETCOMPONENTLIST() \ SOFA_ATTRIBUTE_DISABLED("v24.12", "v25.06", \ "Using entrypoint GetComponentList() from a plugin has been deprecated. Use the helper function listClassesFromTarget() from ObjectFactory instead.") 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/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 d146187a173..9e03db40a0f 100644 --- a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in +++ b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in @@ -40,22 +40,3 @@ #else # 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 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/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;