Skip to content

[all] Clean uncovered lifecycle codes #5898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hugtalbot wants to merge 6 commits into
base: master
Choose a base branch
from
+6 −9
Open

[all] Clean uncovered lifecycle codes #5898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e789b2b
Disable RegisterObject as it should have been
Jan 28, 2026
67a6511
Remove data J, m_constraintMatrix to be used instead
Jan 28, 2026
7cb3738
Postpone removal to give epernod time to work on it
Jan 28, 2026
f0ef325
Fix error on lifecycle disabling version in Prism
Jan 28, 2026
9001bc8
Fix version also in Prism in topology
Jan 28, 2026
e41bcd3
restore RegisterObject as deprecated since SofaCUDA has only been merged
Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ...on/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,6 @@ class LinearSolverConstraintCorrection : public sofa::core::behavior::Constraint
void getBlockDiagonalCompliance(linearalgebra::BaseMatrix* W, int begin, int end) override;

protected:
//SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v25.12", "Further to #5017 use m_constraintMatrix instead")
DeprecatedAndRemoved J; ///< use m_constraintMatrix instead

linearalgebra::SparseMatrix<Real> m_constraintJacobian;

/**
Expand Down
6 changes: 3 additions & 3 deletions ...ner/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,13 +394,13 @@ class TriangleSetGeometryAlgorithms : public EdgeSetGeometryAlgorithms<DataTypes

// compute barycentric coefficients
// {
SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v25.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates")
SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v26.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates")
sofa::type::vector< SReal > computeTriangleBarycoefs(const TriangleID ind_t, const sofa::type::Vec<3, Real>& p) const;

SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v25.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates with useRestPosition set to true")
SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v26.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates with useRestPosition set to true")
sofa::type::vector< SReal > computeRestTriangleBarycoefs(const TriangleID ind_t, const sofa::type::Vec<3, Real>& p) const;

SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v25.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates")
SOFA_ATTRIBUTE_DEPRECATED("v25.06", "v26.12", "Use sofa::component::topology::container::dynamic::TriangleSetGeometryAlgorithms::computeTriangleBarycentricCoordinates")
sofa::type::vector< SReal > compute3PointsBarycoefs(const sofa::type::Vec<3, Real>& p,
PointID ind_p1,
PointID ind_p2,
Expand Down
2 changes: 1 addition & 1 deletion Sofa/framework/Core/src/sofa/core/config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
#define SOFA_ATTRIBUTE_DEPRECATED__REGISTEROBJECT()
#else
#define SOFA_ATTRIBUTE_DEPRECATED__REGISTEROBJECT() \
SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v25.12", "RegisterObject and the associated implicit registration is being phased out. Use ObjectRegistrationData and explicit registration from now on. See #4429 for more information.")
SOFA_ATTRIBUTE_DEPRECATED("v24.12", "v26.12", "RegisterObject and the associated implicit registration is being phased out. Use ObjectRegistrationData and explicit registration from now on. See #4429 for more information.")
#endif

#ifdef SOFA_BUILD_SOFA_CORE
Expand Down
2 changes: 1 addition & 1 deletion Sofa/framework/Geometry/src/sofa/geometry/Prism.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ struct Prism
Prism() = delete;
};

using Pentahedron SOFA_ATTRIBUTE_DEPRECATED("v25.12", "v25.06", "Pentahedron is renamed to Prism") = Prism;
using Pentahedron SOFA_ATTRIBUTE_DEPRECATED("v25.12", "v26.06", "Pentahedron is renamed to Prism") = Prism;

} // namespace sofa::geometry
2 changes: 1 addition & 1 deletion Sofa/framework/Topology/src/sofa/topology/Prism.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace sofa::topology
{
using Prism = sofa::topology::Element<sofa::geometry::Prism>;

using Pentahedron SOFA_ATTRIBUTE_DEPRECATED("v25.12", "v25.06", "Pentahedron is renamed to Prism") = Prism;
using Pentahedron SOFA_ATTRIBUTE_DEPRECATED("v25.12", "v26.06", "Pentahedron is renamed to Prism") = Prism;

static constexpr Prism InvalidPrism;
}
Loading