Skip to content

Commit 885e980

Browse files
committed
Squashed commit of the following:
commit f8ed001 Author: Alex Bilger <[email protected]> Date: Wed Jan 22 14:24:35 2025 +0100 [tests] Template method design pattern from BaseTest in derived classes (sofa-framework#5162) * [tests] Template method design pattern from BaseTest in derived classes * rename * use the deprecated function * Make SetUp and TearDown final * fix SofaCarving test * missing override commit 41bac37 Author: Frederick Roy <[email protected]> Date: Tue Jan 21 16:21:12 2025 +0100 [Helper] XCode: run in Debug (and load debug plugins) (sofa-framework#5168) remove deprecated cmake statement Co-authored-by: Hugo <[email protected]> commit 723420c Author: Hugo <[email protected]> Date: Tue Jan 21 16:18:00 2025 +0100 [Project] Start dev phase v25.06 (sofa-framework#5218) * Add ChangeLog for v24.12 * Bump dev version to v25.06.99 commit b445f57 Author: Frederick Roy <[email protected]> Date: Tue Jan 21 16:16:25 2025 +0100 [Helper] WriteAccessorVector: add resize method with default filler value (sofa-framework#5228) add resize with default filler value commit 4ba3bbe Author: Hugo <[email protected]> Date: Tue Jan 21 15:58:00 2025 +0100 [Core] Move all LifeCycle classes in a dedicated namespace (sofa-framework#5225) Co-authored-by: Paul Baksic <[email protected]> commit eb9fe59 Author: Alex Bilger <[email protected]> Date: Mon Jan 20 05:45:39 2025 +0100 [Type] Support structured binding for tuple-like types (sofa-framework#5208) * [Type] Support structured binding for tuple-like types * fix redefinition * fix test commit aedc7ff Author: Alex Bilger <[email protected]> Date: Mon Jan 20 00:10:57 2025 +0100 [Type] Simplification of the Rebind trait using concepts (sofa-framework#5200) * [Type] Simplification of the Rebind trait using concepts * fix * fix and test * parentheses commit 1f11bee Author: Alex Bilger <[email protected]> Date: Fri Jan 17 12:39:13 2025 +0100 [Type] Deprecate is_container trait (sofa-framework#5210) commit 3635db7 Author: Alex Bilger <[email protected]> Date: Fri Jan 17 08:19:18 2025 +0100 [Type] Convert enable_if to concepts in fixed_array (sofa-framework#5205) commit 1072217 Author: Alex Bilger <[email protected]> Date: Fri Jan 17 05:42:59 2025 +0100 [Type] Convert is_fixed_array trait to concept (sofa-framework#5209) Co-authored-by: Frederick Roy <[email protected]> commit d83d7ed Author: Alex Bilger <[email protected]> Date: Fri Jan 17 01:46:10 2025 +0100 [Type] Convert is_vector trait to concept (sofa-framework#5201) * [Type] Concert is_vector trait to concept * fix * use the concept commit 84e79d1 Author: Alex Bilger <[email protected]> Date: Thu Jan 16 02:48:10 2025 +0100 [Type] A concept for isRigidType (sofa-framework#5199) * [Type] A concept for isRigidType * fix commit f28c570 Author: Hugo <[email protected]> Date: Wed Jan 15 14:29:40 2025 +0100 [Helper] Fix warning in SelectableItem (sofa-framework#5163) * [Helper] Fix warning in SelectableItem * simpler code * simplify trait using concept * remove unused include --------- Co-authored-by: Alex Bilger <[email protected]> commit bf730d2 Author: Hugo <[email protected]> Date: Wed Jan 15 05:48:20 2025 +0100 [SolidMechanics] Make Data innerRadius of BeamFEMFF not required (sofa-framework#5203) commit 964136a Author: Hugo <[email protected]> Date: Thu Jan 9 16:37:53 2025 +0100 [Mapping] Fix draw in RigidMapping (sofa-framework#5204) * [Mapping] Fix draw in RigidMapping * Apply suggestions from code review Co-authored-by: Frederick Roy <[email protected]> --------- Co-authored-by: Frederick Roy <[email protected]> commit 61d4924 Author: Hugo <[email protected]> Date: Thu Jan 9 14:35:29 2025 +0100 [Engine] Fix drawLines from ValuesFromPositions (sofa-framework#5206) commit 88320b8 Author: Alex Bilger <[email protected]> Date: Thu Jan 9 07:39:53 2025 +0100 [Config] Introduce SOFA modules data structure (sofa-framework#5148) * Introduce SOFA modules data structure * apply everywhere * don't shadow with unique name * try to fix * generate unit tests automatically * remove dependency to string and make modules constexpr * restore conversion to string * constexpr * remove ambiguity * include modules.h only when necessary commit 1cbfa03 Author: Alex Bilger <[email protected]> Date: Thu Jan 9 06:09:39 2025 +0100 [DefaultType] Aliases defined twice (sofa-framework#5198) commit 589ea72 Author: Alex Bilger <[email protected]> Date: Thu Jan 9 01:34:09 2025 +0100 [Core] Isolate the intrusive reference counting (sofa-framework#5149) * [Core] Isolate the intrusive reference counting * add unit tests commit 7b3729f Author: erik pernod <[email protected]> Date: Wed Jan 8 23:33:30 2025 +0100 [Topology] Add function in BaseMeshTopology to compute all topology containers (sofa-framework#3368) * [Topology] rename method initTpology into initContainers and provide access to it from BaseMeshTopology * [MultiThreading] Replace call to getter to init topology by call to initContainers * Fix MeshTopology initContainer * REname initContainers into computeCrossElementBuffers * restore comment * Fix compilation * Update MeshTopology.cpp * Update MeshTopology.cpp * Update applications/plugins/MultiThreading/src/MultiThreading/component/collision/detection/algorithm/ParallelBVHNarrowPhase.cpp Co-authored-by: Hugo <[email protected]> * Update MeshTopology, Keep method ComputeCorssElementBuffer to be call only if needed. Not called at init * Update MeshTopology.h * Update MeshTopology.cpp * Update MeshTopology.h --------- Co-authored-by: Hugo <[email protected]> commit 292f5bc Author: Paul Baksic <[email protected]> Date: Wed Jan 8 23:32:44 2025 +0100 [tools] Update post-install fixup to fix rpath (sofa-framework#5197) Update post-install fixup to fix rpath commit 0bc3fb9 Author: Damien Marchal <[email protected]> Date: Mon Jan 6 15:30:09 2025 +0100 [GUI.Qt] Fix invalid color of the warning sign on object (sofa-framework#5190) Fix invalid color of the warning sign on object. commit b5c1f17 Author: Hugo <[email protected]> Date: Mon Dec 30 12:28:46 2024 +0100 [all] Fix additional warnings (sofa-framework#5180) * [all] Fix additional warnings * Update Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/init.cpp Co-authored-by: erik pernod <[email protected]> * Update Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/init.cpp --------- Co-authored-by: erik pernod <[email protected]> commit 82c4ea2 Author: Frederick Roy <[email protected]> Date: Sun Dec 29 04:08:56 2024 +0900 [Multithreading] Apply new factory registration mechanism (sofa-framework#5178) * apply new register mechanism to multithreading * fix test * Apply suggestions from code review (update descriptions) Co-authored-by: Hugo <[email protected]> --------- Co-authored-by: Hugo <[email protected]> commit bcc5a16 Author: Frederick Roy <[email protected]> Date: Sat Dec 28 00:26:20 2024 +0900 [Helper] PluginManager: support loading from Non-MSVC Multi-Configuration Build (sofa-framework#5133) * remove collections from searchable paths * cmake: pass config info and use it for search paths * remove typo in template parameters * add support for minsizerel * test existence of directory before browsing * just use the string commit 07ce419 Author: erik pernod <[email protected]> Date: Fri Dec 27 10:57:04 2024 +0100 [Sofa.GL] Fix OglModel crash when texture file is not found (sofa-framework#5182) [OglModel] Backup fix on texture not found crash commit 3711b9e Author: erik pernod <[email protected]> Date: Fri Dec 27 10:56:45 2024 +0100 [Core] Fix VisualState.h compilation on windows (sofa-framework#5181) [Visual] Fix VisualState.h compilation commit 238851c Author: Alex Bilger <[email protected]> Date: Thu Dec 26 22:01:07 2024 +0100 [SofaCUDA] Explicit the CUDA C++ standard version to 17 (sofa-framework#5165) commit 30844d0 Author: Paul Baksic <[email protected]> Date: Thu Dec 26 18:36:11 2024 +0100 [Plugins] Remove unsupported plugins: InvertibleFVM, SofaSimpleGUI and SensableEmulation (sofa-framework#5175) Remove unsupported plugins commit e2b9428 Author: Alex Bilger <[email protected]> Date: Mon Dec 23 05:52:16 2024 +0100 [Testing] Mitigate plugin import leakage between tests (sofa-framework#5161) * [Testing] ScopedPlugin * add version with lists * unload plugins at tear down * use ScopedPlugin in a test as an example * support multiple calls to loadPlugins commit ca66554 Author: Alex Bilger <[email protected]> Date: Fri Dec 20 13:31:30 2024 +0100 [Config] Upgrade to C++20 (sofa-framework#5111) commit 642cdc6 Author: Hugo <[email protected]> Date: Fri Dec 20 04:54:50 2024 +0100 [Lagrangian] Remove unused data numericalTolerance in BLC (sofa-framework#5164) commit 3e508d3 Author: Alex Bilger <[email protected]> Date: Fri Dec 20 04:53:09 2024 +0100 [Type] Test and clean BoundingBox (sofa-framework#5138) [Type] Test for BoundingBox commit 3ecd69c Author: Alex Bilger <[email protected]> Date: Wed Dec 18 17:24:59 2024 +0100 [SofaCUDA] Remove NO_CUDA condition (sofa-framework#5171) commit 4aca268 Author: Frederick Roy <[email protected]> Date: Wed Dec 18 21:28:35 2024 +0900 [Core, Simulation.Core] Registration: (re)enable deprecation warnings (sofa-framework#5155) * enable deprecation warnings for RegisterObject * enable runtime deprecation warnings * re enable disabled tests * fix typo * fix units tests * expect a warning when loading pluginA * load plugins once (avoiding registering several times) * add more info when warning the user of a deprecated registration * set warnings only if dev mode is enabled (SOFA_WITH_DEVTOOLS enabled) * apply new mechanism registration to AugmentedLagrangianConstraint commit 99df0a2 Author: Alex Bilger <[email protected]> Date: Tue Dec 17 15:26:53 2024 +0100 [Visual] Move, rename and clean OglCylinderModel (sofa-framework#5124) * move files * depreciation * rename * fix color management * remove string to color conversion and use the one from RGBAColor * remove unused private methods * cleaning * component change * remove Index alias * change the description * cache drawTool * remove calls to removed functions commit 02b3366 Author: Paul Baksic <[email protected]> Date: Tue Dec 17 02:06:24 2024 +0100 [All] Fix visualisation (sofa-framework#5152) * Fix visualisation * Remove inheritance from visual model; Remove the use of visitor for VisualStyle and instead call the fwdDraw directly in the two visualVisitor * Change methods name * Update Sofa/framework/Core/src/sofa/core/visual/BaseVisualStyle.h Co-authored-by: Alex Bilger <[email protected]> --------- Co-authored-by: Alex Bilger <[email protected]> commit 4eda9c7 Author: Paul Baksic <[email protected]> Date: Fri Dec 13 15:52:24 2024 +0100 [Constraint.Lagrangian] Add augmented lagrangians (sofa-framework#5003) * Add AugmentedLagrangianConstraint response * accelerate GS convergence * Added virtualization layer for constraints, but linker issue arise. Need to fix it then add virutalization in Contact response * FIX linking * Add virtualization layer for contact response * Fix OBBCapsule * Fix Distance grid and simplify fix for OBB * Fix default friction used by tests * Try fix macos compilation * Add tag for augmented lagrangian * add details to the description of epsilon data * remove multiple registration in factory * MAke parameters struct final * USe data accessor instead * fix compilation * Try fix scene tests * Apply suggestions from code review Co-authored-by: Hugo <[email protected]> * Add reference --------- Co-authored-by: Hugo <[email protected]> commit 8ba12f0 Author: Hugo <[email protected]> Date: Fri Dec 13 03:22:11 2024 +0100 [examples] Make symplectic option explicit (sofa-framework#5159) [Explicit] Make symplectic option explicit commit 6ae972f Author: Paul Baksic <[email protected]> Date: Wed Dec 11 13:56:40 2024 +0100 [Constraint.Projective] Make LinearVelocityProjectiveConstraint work with FreeMotionAL (sofa-framework#5025) * Implement missing methods to work in FreeMotionAnimationLoop and add feature to keep the constraint applied after all the key event have passed * Apply suggestions from code review Co-authored-by: Hugo <[email protected]> * Use constexpr when possible * Add example scene * Simplify the example and added the complete scene in the demo folder * Refactor finished mechanism and fix behavior when finished * Update scenes and regression tests * Put the boolean test on wether the constraint is still active or not inside a method --------- Co-authored-by: Hugo <[email protected]> commit 6141aac Author: Frederick Roy <[email protected]> Date: Wed Dec 11 18:29:09 2024 +0900 [All] Remove spam warnings (sofa-framework#5156) * fix duplicated macro * fix unused variables * use new vecids
1 parent a13b3ca commit 885e980

File tree

471 files changed

+36486
-12018
lines changed

Some content is hidden

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

471 files changed

+36486
-12018
lines changed

CHANGELOG.md

Lines changed: 229 additions & 0 deletions
Large diffs are not rendered by default.

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ project(Sofa
66
include(CMakeDependentOption)
77

88
# Manually define VERSION
9-
set(Sofa_VERSION_MAJOR 24)
10-
set(Sofa_VERSION_MINOR 12)
9+
set(Sofa_VERSION_MAJOR 25)
10+
set(Sofa_VERSION_MINOR 06)
1111
set(Sofa_VERSION_PATCH 99)
1212
set(Sofa_VERSION ${Sofa_VERSION_MAJOR}.${Sofa_VERSION_MINOR}.${Sofa_VERSION_PATCH})
1313

Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <sofa/simulation/CollisionAnimationLoop.h>
2626
#include <sofa/core/MultiVecId.h>
27-
#include <sofa/core/objectmodel/RenamedData.h>
27+
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
2828

2929
namespace sofa::core::behavior
3030
{
@@ -45,7 +45,7 @@ class SOFA_COMPONENT_ANIMATIONLOOP_API FreeMotionAnimationLoop : public sofa::si
4545

4646

4747
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
48-
sofa::core::objectmodel::RenamedData<bool> m_solveVelocityConstraintFirst;
48+
sofa::core::objectmodel::lifecycle::RenamedData<bool> m_solveVelocityConstraintFirst;
4949

5050
Data<bool> d_solveVelocityConstraintFirst; ///< solve separately velocity constraint violations before position constraint violations
5151
Data<bool> d_threadSafeVisitor; ///< If true, do not use realloc and free visitors in fwdInteractionForceField.

Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include <sofa/core/behavior/BaseAnimationLoop.h>
2727
#include <sofa/simulation/CollisionAnimationLoop.h>
28-
#include <sofa/core/objectmodel/RenamedData.h>
28+
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
2929

3030
namespace sofa::component::animationloop
3131
{
@@ -43,10 +43,10 @@ class SOFA_COMPONENT_ANIMATIONLOOP_API MultiStepAnimationLoop : public sofa::sim
4343
void step (const sofa::core::ExecParams* params, SReal dt) override;
4444

4545
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
46-
sofa::core::objectmodel::RenamedData<int> collisionSteps;
46+
sofa::core::objectmodel::lifecycle::RenamedData<int> collisionSteps;
4747

4848
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
49-
sofa::core::objectmodel::RenamedData<int> integrationSteps;
49+
sofa::core::objectmodel::lifecycle::RenamedData<int> integrationSteps;
5050

5151
Data<int> d_collisionSteps; ///< number of collision steps between each frame rendering
5252
Data<int> d_integrationSteps; ///< number of integration steps between each collision detection

Sofa/Component/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,10 @@ sofa_create_package_with_targets(
4949
INCLUDE_SOURCE_DIR "src"
5050
INCLUDE_INSTALL_DIR "${PROJECT_NAME}"
5151
)
52+
53+
# Tests
54+
# If SOFA_BUILD_TESTS exists and is OFF, then these tests will be auto-disabled
55+
cmake_dependent_option(SOFA_COMPONENT_BUILD_TESTS "Compile the automatic tests" ON "SOFA_BUILD_TESTS OR NOT DEFINED SOFA_BUILD_TESTS" OFF)
56+
if(SOFA_COMPONENT_BUILD_TESTS)
57+
add_subdirectory(test)
58+
endif()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <sofa/component/collision/detection/algorithm/config.h>
2525
#include <sofa/core/collision/BroadPhaseDetection.h>
2626
#include <sofa/component/collision/geometry/CubeModel.h>
27-
#include <sofa/core/objectmodel/RenamedData.h>
27+
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
2828

2929
namespace sofa::component::collision::detection::algorithm
3030
{
@@ -51,7 +51,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API BruteForceBroadPhase : pu
5151
private:
5252
///< if not empty, objects that do not intersect this bounding-box will be ignored
5353
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM()
54-
sofa::core::objectmodel::RenamedData<type::fixed_array<sofa::type::Vec3, 2> > box;
54+
sofa::core::objectmodel::lifecycle::RenamedData<type::fixed_array<sofa::type::Vec3, 2> > box;
5555

5656
Data<type::fixed_array<sofa::type::Vec3, 2> > d_box; ///< if not empty, objects that do not intersect this bounding-box will be ignored
5757

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include <map>
4343
#include <deque>
4444

45-
#include <sofa/core/objectmodel/RenamedData.h>
45+
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
4646

4747

4848
namespace sofa::component::collision::detection::algorithm
@@ -215,7 +215,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API IncrSAP :
215215
core::objectmodel::lifecycle::DeprecatedData bDraw {this, "v24.06", "v24.12", "draw", "This Data was not used"};
216216

217217
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM()
218-
sofa::core::objectmodel::RenamedData< type::fixed_array<type::Vec3,2> > box; ///< if not empty, objects that do not intersect this bounding-box will be ignored
218+
sofa::core::objectmodel::lifecycle::RenamedData< type::fixed_array<type::Vec3,2> > box; ///< if not empty, objects that do not intersect this bounding-box will be ignored
219219

220220
Data< type::fixed_array<type::Vec3,2> > d_box; ///< if not empty, objects that do not intersect this bounding-box will be ignored
221221

Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ class TestCollisionPipeline : public BaseSimulationTest {
7474
void checkCollisionPipelineWithMissingContactManager();
7575
int checkCollisionPipelineWithMonkeyValueForDepth(int value);
7676

77-
void SetUp() override
77+
void doSetUp() override
7878
{
79-
sofa::simpleapi::importPlugin("Sofa.Component.StateContainer");
80-
sofa::simpleapi::importPlugin("Sofa.Component.Collision");
79+
sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
80+
sofa::simpleapi::importPlugin(Sofa.Component.Collision);
8181
}
8282

83-
void TearDown() override
83+
void doTearDown() override
8484
{
8585
if (root)
8686
sofa::simulation::node::unload(root);

Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <sofa/component/collision/detection/intersection/DiscreteIntersection.h>
2626
#include <sofa/component/collision/geometry/CubeModel.h>
2727

28-
#include <sofa/core/objectmodel/RenamedData.h>
28+
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
2929

3030

3131
namespace sofa::component::collision::detection::intersection
@@ -41,10 +41,10 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API BaseProximityIntersect
4141
public:
4242
SOFA_ABSTRACT_CLASS(BaseProximityIntersection,DiscreteIntersection);
4343
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
44-
sofa::core::objectmodel::RenamedData<SReal> alarmDistance;
44+
sofa::core::objectmodel::lifecycle::RenamedData<SReal> alarmDistance;
4545

4646
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
47-
sofa::core::objectmodel::RenamedData<SReal> contactDistance;
47+
sofa::core::objectmodel::lifecycle::RenamedData<SReal> contactDistance;
4848

4949

5050
Data<SReal> d_alarmDistance; ///< Distance above which the intersection computations ignores the proximity pair. This distance can also be used in some broad phase algorithms to reduce the search area

Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <sofa/component/collision/geometry/CubeModel.h>
3232
#include <sofa/component/collision/geometry/RayModel.h>
3333

34-
#include <sofa/core/objectmodel/RenamedData.h>
34+
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
3535

3636
namespace sofa::component::collision::detection::intersection
3737
{
@@ -64,16 +64,16 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API LocalMinDistance : pub
6464
typedef core::collision::IntersectorFactory<LocalMinDistance> IntersectorFactory;
6565

6666
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
67-
sofa::core::objectmodel::RenamedData<bool> filterIntersection;
67+
sofa::core::objectmodel::lifecycle::RenamedData<bool> filterIntersection;
6868

6969
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
70-
sofa::core::objectmodel::RenamedData<double> angleCone;
70+
sofa::core::objectmodel::lifecycle::RenamedData<double> angleCone;
7171

7272
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
73-
sofa::core::objectmodel::RenamedData<double> coneFactor;
73+
sofa::core::objectmodel::lifecycle::RenamedData<double> coneFactor;
7474

7575
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
76-
sofa::core::objectmodel::RenamedData<bool> useLMDFilters;
76+
sofa::core::objectmodel::lifecycle::RenamedData<bool> useLMDFilters;
7777

7878

7979
Data<bool> d_filterIntersection; ///< Activate LMD filter

0 commit comments

Comments
 (0)