Skip to content

Commit 196856f

Browse files
hugtalbotfredroy
andauthored
[all] Remove SOFA_ATTRIBUTE_DISABLED (#5309)
* [all] Remove SOFA_ATTRIBUTE_DISABLED for v23.12 and start v24.06 * continue removing disabled attributes * update response method * continue SOFA_ATTRIBUTE_DISABLED on RigidMapping and DiagonalVelocityDamping * continue SOFA_ATTRIBUTE_DISABLED BaseMechanicalVisitor * remove unused nodeData * continue SOFA_ATTRIBUTE_DISABLED in OptionsGroup and Visitor * continue SOFA_ATTRIBUTE_DISABLED in SparseCommon * Complete removal of SOFA_ATTRIBUTE_DISABLED with Node --------- Co-authored-by: Frederick Roy <froy@lnrobo.com>
1 parent d0d6582 commit 196856f

101 files changed

Lines changed: 18 additions & 921 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAPNarrowPhase.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API DirectSAPNarrowPhase : pu
6363
*/
6464
void updateBoxes();
6565

66-
SOFA_ATTRIBUTE_DISABLED__DRAWNARROWPHASE()
67-
sofa::core::objectmodel::lifecycle::RemovedData d_draw{this, "v23.12", "v24.06", "draw", "Use display flag 'showDetectionOutputs' instead"}; ///< enable/disable display of results
68-
6966
Data<bool> d_showOnlyInvestigatedBoxes; ///< Show only boxes which will be sent to narrow phase
7067
Data<int> d_nbPairs; ///< number of pairs of elements sent to narrow phase
7168

Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API RayTraceNarrowPhase : pub
4444
public:
4545
SOFA_CLASS(RayTraceNarrowPhase, core::collision::NarrowPhaseDetection);
4646

47-
private:
48-
SOFA_ATTRIBUTE_DISABLED__DRAWNARROWPHASE()
49-
sofa::core::objectmodel::lifecycle::RemovedData bDraw{this, "v23.12", "v24.06", "draw", "Use display flag 'showDetectionOutputs' instead"}; ///< enable/disable display of results
50-
5147
protected:
5248
RayTraceNarrowPhase() = default;
5349

Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/config.h.in

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,6 @@
3131
# define SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API SOFA_IMPORT_DYNAMIC_LIBRARY
3232
#endif
3333

34-
#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM
35-
#define SOFA_ATTRIBUTE_DISABLED__RENAME_COLLISIONPIPELINE()
36-
#else
37-
#define SOFA_ATTRIBUTE_DISABLED__RENAME_COLLISIONPIPELINE() \
38-
SOFA_ATTRIBUTE_DISABLED( \
39-
"v23.06", "v23.12", \
40-
"DefaultPipeline renamed as CollisionPipeline in #3590: sofa/component/collision/detection/algorithm/CollisionPipeline.h")
41-
#endif
42-
43-
#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION
44-
# define SOFA_ATTRIBUTE_DISABLED__DRAWNARROWPHASE()
45-
#else
46-
# define SOFA_ATTRIBUTE_DISABLED__DRAWNARROWPHASE() \
47-
SOFA_ATTRIBUTE_DISABLED( \
48-
"v23.12", "v24.06", "This data is not used anymore: the drawing is now controlled by a draw flag")
49-
#endif
50-
5134
#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM
5235
#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM()
5336
#else

Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.h

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,28 +67,6 @@ public :
6767
if (arg)
6868
obj->parse(arg);
6969

70-
//SOFA_ATTRIBUTE_DISABLED("v21.12 (PR#2522)", "v24.06","This attribute was only added to build a compatibility layer on the response name.")
71-
{
72-
static const std::map<std::string,std::string> renamingResponseMethod = {
73-
{"ray", "RayContact"},
74-
{"default", "PenalityContactForceField"},
75-
{"FrictionContact", "FrictionContactConstraint"},
76-
{"registration", "RegistrationContactForceField"},
77-
{"stick", "StickContactForceField"},
78-
};
79-
80-
const std::string responseDesired = arg->getAttribute("response","");
81-
const auto it = renamingResponseMethod.find(responseDesired);
82-
83-
if(it != renamingResponseMethod.end())
84-
{
85-
msg_error("CollisionResponse")
86-
<< "Option \"" << it->first << "\" "
87-
<< "for data \"response\" has been renamed since v21.12 (PR#2522). "
88-
<< "Use \"" << it->second << "\" instead.";
89-
}
90-
}
91-
9270
return obj;
9371
}
9472

Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/BarycentricContactMapper.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ class BarycentricContactMapper : public BaseContactMapper<TDataTypes>
5353
typename MMapping::SPtr mapping;
5454
typename MMapper::SPtr mapper;
5555

56-
SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index);
57-
SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Size, sofa::Size);
58-
5956
BarycentricContactMapper()
6057
: model(nullptr), mapping(nullptr), mapper(nullptr)
6158
{

Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/TetrahedronBarycentricContactMapper.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ template<class DataTypes>
3434
class ContactMapper<collision::geometry::TetrahedronCollisionModel, DataTypes> : public BarycentricContactMapper<collision::geometry::TetrahedronCollisionModel, DataTypes>
3535
{
3636
public:
37-
SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Index, sofa::Index);
3837
typedef typename DataTypes::Real Real;
3938
typedef typename DataTypes::Coord Coord;
4039
sofa::Index addPoint(const Coord& P, sofa::Index index, Real&)

Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER_API GenericConstraintSolver :
149149
sofa::type::fixed_array<GenericConstraintProblem, CP_BUFFER_SIZE> m_cpBuffer;
150150
sofa::type::fixed_array<bool, CP_BUFFER_SIZE> m_cpIsLocked;
151151
GenericConstraintProblem *current_cp, *last_cp;
152-
SOFA_ATTRIBUTE_DISABLED__GENERICCONSTRAINTSOLVER_CONSTRAINTCORRECTIONS() DeprecatedAndRemoved constraintCorrections; //use ConstraintSolverImpl::l_constraintCorrections instead
153152

154153
sofa::core::MultiVecDerivId m_lambdaId;
155154
sofa::core::MultiVecDerivId m_dxId;

Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER_API LCPConstraintSolver : publ
167167
void keepContactForcesValue();
168168

169169
unsigned int _numConstraints;
170-
SOFA_ATTRIBUTE_DEPRECATED__LCPCONSTRAINTSOLVERMUMEMBER() DeprecatedAndRemoved _mu;
171170

172171
/// Multigrid hierarchy is resized and cleared
173172
void buildHierarchy();

Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/config.h.in

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,6 @@ namespace sofa::component::constraint::lagrangian::solver
3838
} // namespace sofa::component::constraint::lagrangian::solver
3939

4040

41-
// deprecate _mu as member
42-
#ifdef SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER
43-
#define SOFA_ATTRIBUTE_DEPRECATED__LCPCONSTRAINTSOLVERMUMEMBER()
44-
#else
45-
#define SOFA_ATTRIBUTE_DEPRECATED__LCPCONSTRAINTSOLVERMUMEMBER() \
46-
SOFA_ATTRIBUTE_DISABLED( \
47-
"v23.12", "v24.06", "_mu is not a member anymore. Use the Data \"mu\" to get the friction value.")
48-
#endif // SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER
49-
50-
#ifdef SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER
51-
#define SOFA_ATTRIBUTE_DISABLED__GENERICCONSTRAINTSOLVER_CONSTRAINTCORRECTIONS()
52-
#else
53-
#define SOFA_ATTRIBUTE_DISABLED__GENERICCONSTRAINTSOLVER_CONSTRAINTCORRECTIONS() \
54-
SOFA_ATTRIBUTE_DISABLED( \
55-
"v23.12", "v23.12", "Use ConstraintSolverImpl::l_constraintCorrections instead")
56-
#endif // SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER
57-
5841
#ifdef SOFA_BUILD_SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER
5942
#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_CONSTRAINT_LAGRANGIAN_SOLVER()
6043
#else

Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/DirectionProjectiveConstraint.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class DirectionProjectiveConstraint : public core::behavior::ProjectiveConstrain
6969
typedef Data<VecDeriv> DataVecDeriv;
7070
typedef Data<MatrixDeriv> DataMatrixDeriv;
7171
typedef type::vector<Index> Indices;
72-
SOFA_ATTRIBUTE_REPLACED__TYPEMEMBER(Vector3, sofa::type::Vec3);
7372
typedef sofa::core::topology::TopologySubsetIndices IndexSubsetData;
7473
typedef linearalgebra::EigenBaseSparseMatrix<SReal> BaseSparseMatrix;
7574
typedef linearalgebra::EigenSparseMatrix<DataTypes,DataTypes> SparseMatrix;

0 commit comments

Comments
 (0)