Skip to content

Commit f78c3f6

Browse files
committed
Squashed commit of the following:
commit d1d4ee8 Author: Hugo <hugo.talbot@sofa-framework.org> Date: Wed Apr 2 15:31:53 2025 +0200 [examples] Minor update default scene (sofa-framework#5373) Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> commit 7ae2862 Author: Hugo <hugo.talbot@sofa-framework.org> Date: Wed Apr 2 15:30:58 2025 +0200 [Mapping] Remove warning in DistanceToPlaneMapping_test.cpp (sofa-framework#5374) Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> commit 82b05c6 Author: Paul Baksic <30337881+bakpaul@users.noreply.github.com> Date: Wed Apr 2 15:29:27 2025 +0200 [CMake] Fetch in build dir instead of source to avoid lots of cmake errors (sofa-framework#5332) * Fetch in build dir instead of source to avoid lots of cmake errors * Use sofa_add_generic in macros instead of sofa_add_subdirectory, because it makes no sense + remove deprecated macros * Fix reference handling * Fix topology regression * Remove plugisn directory ans set everything in the cmakelist * Fix config commit c038c1d Author: Frederick Roy <fredroy@users.noreply.github.com> Date: Mon Mar 31 16:53:03 2025 +0900 [Examples] Add an option to (not) build SimpleAPI examples (sofa-framework#5362) * add an option to build simplapi examples * add option in presets --------- Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> commit b5afc3f Author: Frederick Roy <fredroy@users.noreply.github.com> Date: Mon Mar 31 16:31:36 2025 +0900 [All] Fix warnings (sofa-framework#5369) * remove nagging deprecation warnings * remove trivial warnings commit 5179ed3 Author: Hugo <hugo.talbot@sofa-framework.org> Date: Fri Mar 28 09:20:18 2025 +0100 [all] Lifecycle : Disable SOFA_ATTRIBUTE_DEPRECATED (sofa-framework#5360) * [all] Lifecycle : Disable SOFA_ATTRIBUTE_DEPRECATED * forgotten PartialFixedConstraint.h commit 8f8989f Author: Alex Bilger <alxbilger@users.noreply.github.com> Date: Fri Mar 28 06:58:56 2025 +0100 [GUI.Common] Clean and fix MouseOperation (sofa-framework#5336) * fix typo * propagate fix typo * minimal cleaning + variable initialization * fix function return * fix compilation for clang --------- Co-authored-by: Frederick Roy <froy@lnrobo.com> commit 3f98c18 Author: Hugo <hugo.talbot@sofa-framework.org> Date: Fri Mar 28 02:24:30 2025 +0100 [examples] Fix wrong topology Data arrays on the surface mesh in HexahedralFEMForceField.scn (sofa-framework#5367) * Update HexahedralFEMForceField.scn * Update HexahedralFEMForceField.scn --------- Co-authored-by: erik pernod <erik.pernod@gmail.com> commit 80fa9d7 Author: Frederick Roy <fredroy@users.noreply.github.com> Date: Thu Mar 27 17:29:13 2025 +0900 [CMake] Remove references to deleted projects/option (sofa-framework#5361) remove references to deleted stuff Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> commit 688cd89 Author: Frederick Roy <fredroy@users.noreply.github.com> Date: Thu Mar 27 16:46:31 2025 +0900 [CMake] Fix install process with default option SOFA_INSTALL_RESOURCES_FILES (sofa-framework#5363) * remove install of now-externalized sofa-launcher * Update CMakeLists.txt commit c7807fc Author: Hugo <hugo.talbot@sofa-framework.org> Date: Thu Mar 27 04:37:18 2025 +0100 [all] Lifecycle : Remove SOFA_ATTRIBUTE_DISABLED, forgotten files (sofa-framework#5359) commit 183fee1 Author: Paul Baksic <30337881+bakpaul@users.noreply.github.com> Date: Wed Mar 26 21:02:30 2025 +0100 [CMake] Remove compatibility layer in macro (sofa-framework#5349) Remove compatibility layer meant for SOFA modules Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> commit a86f468 Author: Paul Baksic <30337881+bakpaul@users.noreply.github.com> Date: Wed Mar 26 19:17:28 2025 +0100 [All] Spring cleaning 5: reduce size of ressources (sofa-framework#5341) * Remove unused heavy mesh files + some config files + unused behavior models * Restore needed raw file * restore missing file --------- Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> commit 878d3e9 Author: Paul Baksic <30337881+bakpaul@users.noreply.github.com> Date: Wed Mar 26 17:37:08 2025 +0100 [Tutorials] Spring cleaning 3: remove old c++ tutorials (sofa-framework#5339) * delete old tutorials and exctract the two missing examples and implement them in xml * Fix cmake config * Add version of fallingBeam in SimpleAPI * Add GUI but not working... * Gui fixed * Fix config file in current dir * fix constraint attach button commit 2ed5cf2 Author: Paul Baksic <30337881+bakpaul@users.noreply.github.com> Date: Wed Mar 26 16:04:14 2025 +0100 [All] Spring cleaning 1: clean main & tools directories (sofa-framework#5325) * Clean main directory + tools directory by removing unused stuff * Take comment into account commit 1c8cf17 Author: Paul Baksic <30337881+bakpaul@users.noreply.github.com> Date: Wed Mar 26 16:03:13 2025 +0100 [examples] Propose a new default scene (sofa-framework#5324) * Propose a new simple default scene * some perf improvements * Set it as the default scene * Reduce timestep to get better dynamic * Add regression test * Add required plugins to try to fix regression * Add comments as requested * Apply suggestions from code review Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> * Apply suggestions from code review Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> --------- Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> commit 95cb283 Author: Alex Bilger <alxbilger@users.noreply.github.com> Date: Wed Mar 26 14:03:28 2025 +0100 [ODESolver] Introduction of generic Newton-Raphson algorithm (sofa-framework#5173) * introduce files for NewtonRaphsonSolver * start implementation * move into Core * create module for integration methods * files for backward euler * register objects * function to get matrices factors * start computation of right-hand side * matrix factors * start manipulation of vectors * some comments * rhs input * apply projective * compute error * introduce first convergence criterion * introduce example * start the loop * fix convergence criterion * solve system * update state * some comments * another simpler example * fix intermediateVelocity * check for convergence * fix force computation * fix some vector operations * fix mass factor * adjust parameters * clear debug stuff * cleaning * show iteration count in the failing case * implement line search * support no line search with nb iter = 0 * Rayleigh damping * extract force from the input because it's not an input * update the scenes * compute true residual * implementation of relative stopping criteria * rename * implement relative successive stopping criteria * compare to initial guess (not the first iteration) * implement absolute estimate difference criterion * implement relative estimate difference criterion * update scenes * test and feedback on convergence * fix * fix modules * test another form * missing test * remove duplicated test * refactor state list * move convergence criteria in files * try to fix algorithm * add residual graph * don't add residual if line search failed * fix * Introduce static solver * Move integration method into Sofa.Component.ODESolver.Backward * introduce ode solvers * New design working with scalar in tests and in the static solver * work on linear multi step * add comments * Remove Static (which is replaced by StaticOdeSolver) * introduction of BDF2 * Introduce unique component for BDF * cleaning and fix * revert unnecessary * clean and comments * show squared * more details * implement line search with prediction * data to warn or not * fix static * stopping criteria group * test on coefficients * callback on the order * cleaning * make sure order is >0 * remove backup * restore alpha=1 after failed line search * restore absolute estimate difference * restore relative estimate difference measure * remove static solver * speed up the solver * remove static solver scene * Apply suggestions from code review Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> --------- Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> commit 5ceafe0 Author: Hugo <hugo.talbot@sofa-framework.org> Date: Wed Mar 26 09:11:00 2025 +0100 [all] Lifecycle : Remove SOFA_ATTRIBUTE_DEPRECATED (part 2) (sofa-framework#5347) * Remove SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH * Remove SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL * Remove SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SETTING * Cleaning : remove unnecessary includes * forgotten VEC3STATE_AS_VISUALSTATE * Remove SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK * fix compilation * Remove SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_DYNAMIC * Remove SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE * Remove ALL SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA* * Disabling all v24.12 SOFA_ATTRIBUTE_DEPRECATED * Disable all SOFA_HEADER_DEPRECATED and Fix older lifecycle forgotten * Disable all SOFA_ATTRIBUTE_DEPRECATED * forgotten setOriginalData * complete removal of SparseCommon.cpp * remove SOFAGENERALLOADER_HAVE_ZLIB compat * Remove RemovedData d_draw * fix compilation * Fix PluginManager_Test * Fix all uses of vec_id * Fix compilation: macro didn't exists * Fix scenes using plane definition in TrianglePressureForceField --------- Co-authored-by: Frederick Roy <froy@lnrobo.com> Co-authored-by: Paul Baksic <paul.baksic@outlook.fr> Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> commit c3ef5ce Author: Alex Bilger <alxbilger@users.noreply.github.com> Date: Wed Mar 26 06:16:07 2025 +0100 [GUI.Common] Change inheritance of ConstraintAttachOperation (sofa-framework#5338) commit 761ddfc Author: Themis Skamagkis <70031729+th-skam@users.noreply.github.com> Date: Wed Mar 26 05:50:52 2025 +0100 [IO.Mesh.BlenderExporter] Inherit from BaseSimulationExporter (sofa-framework#5334) * [BlenderExporter] Example scene added in Component/IO/Mesh * [IO.Mesh] Changed inheritance of BlenderExporter to BaseSimulationExporter * [BlenderExporter] Refactoring under BaseSimulationExporter * Substituted member frameCounter with BaseSimulationExporter::m_stepCounter * The code block that does the writing in BlenderExporter::handleEvent was moved to BlenderExporter::write * fileName is now created through BaseSimulationExporter::getOrCreateTargetPath * Use of Base::isComponentValid instead of d_componentState [Scenes] Adjusted BlenderExporter.scn to new variables * [IO.Mesh] Removed redundant calls to BaseSimulationExporter::handleEvent A few of the exporter components in IO/Mesh (BlenderExporter, MeshExporter, VisualModelOBJExporter) override the handleEvent method yet do nothing except call the one in the parent class. This call was removed. * [BlenderExporter] Implemented intializations in doInit, called by doReInit * Update examples/Component/IO/Mesh/BlenderExporter.scn Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> --------- Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> commit 55425f4 Author: Paul Baksic <30337881+bakpaul@users.noreply.github.com> Date: Tue Mar 25 23:54:46 2025 +0100 [examples] Fix SofaScene not launched during scene tests (sofa-framework#5353) * Expand RequiredPlugins * Remove false diffs * Apply suggestions from code review --------- Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
1 parent dae35aa commit f78c3f6

608 files changed

Lines changed: 3585 additions & 1095180 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.

CMakeLists.txt

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,10 @@ add_subdirectory(extlibs)
187187
### SOFA (framework and components)
188188
add_subdirectory(Sofa)
189189

190-
## Tutorials option
191-
option(SOFA_BUILD_TUTORIALS "Build (most of) the tutorials available." OFF)
192-
193190
# SceneCreator plugin
194-
# Library used by SOFA_BUILD_TESTS and SOFA_BUILD_TUTORIALS
191+
# Library used by SOFA_BUILD_TESTS
195192
sofa_add_subdirectory(plugin applications/plugins/SceneCreator SceneCreator OFF
196-
WHEN_TO_SHOW "NOT SOFA_BUILD_SCENECREATOR AND NOT SOFA_BUILD_TESTS AND NOT SOFA_BUILD_TUTORIALS AND NOT SOFA_BUILD_RELEASE_PACKAGE"
193+
WHEN_TO_SHOW "NOT SOFA_BUILD_SCENECREATOR AND NOT SOFA_BUILD_TESTS AND NOT SOFA_BUILD_RELEASE_PACKAGE"
197194
VALUE_IF_HIDDEN "ON")
198195

199196
## Guis
@@ -205,11 +202,13 @@ add_subdirectory(applications/plugins)
205202
## Applications
206203
add_subdirectory(applications/projects)
207204

208-
# Tutorial add subdirectory
209-
if(SOFA_BUILD_TUTORIALS)
210-
add_subdirectory(applications/tutorials)
205+
## SimpleAPI examples
206+
option(SOFA_BUILD_SIMPLEAPI_EXAMPLES "Build SOFA scenes based on SimpleAPI." OFF)
207+
if(SOFA_BUILD_SIMPLEAPI_EXAMPLES)
208+
add_subdirectory(examples/SimpleAPI)
211209
endif()
212210

211+
213212
## SOFA scenes
214213
option(SOFA_BUILD_ADD_SCENES "Add SOFA scenes as a project of the build." OFF)
215214
if (SOFA_BUILD_ADD_SCENES)
@@ -232,11 +231,6 @@ if(NOT "${SOFA_EXTERNAL_DIRECTORIES}" STREQUAL "")
232231
endforeach()
233232
endif()
234233

235-
## Custom
236-
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/custom.cmake")
237-
message("Adding custom file")
238-
include( "custom.cmake" )
239-
endif()
240234

241235
## IDE directories
242236
# Sofa.Component
@@ -264,12 +258,11 @@ install(FILES "${CMAKE_SOURCE_DIR}/CHANGELOG.md" DESTINATION . COMPONENT applica
264258
install(FILES "${CMAKE_SOURCE_DIR}/LICENSE-LGPL.md" DESTINATION . COMPONENT applications)
265259
install(FILES "${CMAKE_SOURCE_DIR}/Authors.txt" DESTINATION . COMPONENT applications)
266260

267-
option(SOFA_INSTALL_RESOURCES_FILES "Copy resources files (etc/, share/, examples/, tools/sofa-launcher/) when installing" ON)
261+
option(SOFA_INSTALL_RESOURCES_FILES "Copy resources files (share/, examples/) when installing" ON)
268262
## Install resource files
269263
if(SOFA_INSTALL_RESOURCES_FILES)
270264
install(DIRECTORY share/ DESTINATION share/sofa COMPONENT resources)
271265
install(DIRECTORY examples/ DESTINATION share/sofa/examples COMPONENT resources)
272-
install(DIRECTORY tools/sofa-launcher/ DESTINATION share/sofa/sofa-launcher COMPONENT resources)
273266
endif()
274267

275268
file(WRITE "${CMAKE_BINARY_DIR}/plugins/README.txt"

CMakePresets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@
9898
{
9999
"name": "standard",
100100
"displayName": "Standard Config",
101-
"description": "Adds the default GUI, the SofaPhysics API, the tutorials and the Python3 support",
101+
"description": "Adds the default GUI, the SofaPhysics API, the examples based on SimpleAPI and the Python3 support",
102102
"hidden": false,
103103
"inherits": ["minimal","defaultGUI"],
104104
"cacheVariables": {
105105
"APPLICATION_SOFAPHYSICSAPI": {
106106
"type": "BOOL",
107107
"value": "ON"
108108
},
109-
"SOFA_BUILD_TUTORIALS": {
109+
"SOFA_BUILD_SIMPLEAPI_EXAMPLES": {
110110
"type": "BOOL",
111111
"value": "ON"
112112
},

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,6 @@ namespace sofa::component::constraint::lagrangian::solver
5252
namespace sofa::component::animationloop
5353
{
5454

55-
using MechanicalGetConstraintResolutionVisitor
56-
SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR("Use sofa::component::constraint::lagrangian::solver::MechanicalGetConstraintResolutionVisitor instead.")
57-
= sofa::component::constraint::lagrangian::solver::MechanicalGetConstraintResolutionVisitor;
58-
59-
using MechanicalSetConstraint
60-
SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR("Use sofa::simulation::mechanicalvisitor::MechanicalBuildConstraintMatrix instead.")
61-
= sofa::simulation::mechanicalvisitor::MechanicalBuildConstraintMatrix;
62-
63-
using MechanicalAccumulateConstraint2
64-
SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR("Use sofa::simulation::mechanicalvisitor::MechanicalAccumulateMatrixDeriv instead.")
65-
= sofa::simulation::mechanicalvisitor::MechanicalAccumulateMatrixDeriv;
66-
6755
class SOFA_COMPONENT_ANIMATIONLOOP_API ConstraintProblem
6856
{
6957
protected:

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ FreeMotionAnimationLoop::FreeMotionAnimationLoop() :
7878
{
7979
d_parallelCollisionDetectionAndFreeMotion.setGroup("Multithreading");
8080
d_parallelODESolving.setGroup("Multithreading");
81-
82-
m_solveVelocityConstraintFirst.setOriginalData(&d_solveVelocityConstraintFirst);
8381
}
8482

8583
FreeMotionAnimationLoop::~FreeMotionAnimationLoop()
@@ -173,7 +171,7 @@ void FreeMotionAnimationLoop::step(const sofa::core::ExecParams* params, SReal d
173171
cparams.setV(freeVel);
174172
cparams.setDx(l_constraintSolver->getDx());
175173
cparams.setLambda(l_constraintSolver->getLambda());
176-
cparams.setOrder(m_solveVelocityConstraintFirst.getValue() ? core::ConstraintOrder::VEL : core::ConstraintOrder::POS_AND_VEL);
174+
cparams.setOrder(d_solveVelocityConstraintFirst.getValue() ? core::ConstraintOrder::VEL : core::ConstraintOrder::POS_AND_VEL);
177175

178176
MultiVecDeriv dx(&vop, core::vec_id::write_access::dx);
179177
dx.realloc(&vop, !d_threadSafeVisitor.getValue(), true);

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

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

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

2928
namespace sofa::core::behavior
3029
{
@@ -43,10 +42,6 @@ class SOFA_COMPONENT_ANIMATIONLOOP_API FreeMotionAnimationLoop : public sofa::si
4342
void step (const sofa::core::ExecParams* params, SReal dt) override;
4443
void init() override;
4544

46-
47-
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
48-
sofa::core::objectmodel::lifecycle::RenamedData<bool> m_solveVelocityConstraintFirst;
49-
5045
Data<bool> d_solveVelocityConstraintFirst; ///< solve separately velocity constraint violations before position constraint violations
5146
Data<bool> d_threadSafeVisitor; ///< If true, do not use realloc and free visitors in fwdInteractionForceField.
5247
Data<bool> d_parallelCollisionDetectionAndFreeMotion; ///< If true, executes free motion step and collision detection step in parallel.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ MultiStepAnimationLoop::MultiStepAnimationLoop() :
5353
d_collisionSteps( initData(&d_collisionSteps,1,"collisionSteps", "number of collision steps between each frame rendering") )
5454
, d_integrationSteps( initData(&d_integrationSteps,1,"integrationSteps", "number of integration steps between each collision detection") )
5555
{
56-
collisionSteps.setOriginalData(&d_collisionSteps);
57-
integrationSteps.setOriginalData(&d_integrationSteps);
5856
}
5957

6058
MultiStepAnimationLoop::~MultiStepAnimationLoop()

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

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

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

3029
namespace sofa::component::animationloop
3130
{
@@ -42,12 +41,6 @@ class SOFA_COMPONENT_ANIMATIONLOOP_API MultiStepAnimationLoop : public sofa::sim
4241
public:
4342
void step (const sofa::core::ExecParams* params, SReal dt) override;
4443

45-
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
46-
sofa::core::objectmodel::lifecycle::RenamedData<int> collisionSteps;
47-
48-
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
49-
sofa::core::objectmodel::lifecycle::RenamedData<int> integrationSteps;
50-
5144
Data<int> d_collisionSteps; ///< number of collision steps between each frame rendering
5245
Data<int> d_integrationSteps; ///< number of integration steps between each collision detection
5346
};

Sofa/Component/AnimationLoop/src/sofa/component/animationloop/config.h.in

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

34-
#ifdef SOFA_BUILD_SOFA_COMPONENT_ANIMATIONLOOP
35-
#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
36-
#else
37-
#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP() \
38-
SOFA_ATTRIBUTE_DEPRECATED( \
39-
"v24.06", "v24.12", \
40-
"Data renamed according to the guidelines")
41-
#endif
42-
43-
#ifdef SOFA_BUILD_SOFA_COMPONENT_ANIMATIONLOOP
44-
#define SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR(msg)
45-
#else
46-
#define SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR(msg) \
47-
SOFA_ATTRIBUTE_DEPRECATED( \
48-
"v24.06", "v24.12", \
49-
msg)
50-
#endif
51-
5234
namespace sofa::component::animationloop
5335
{
5436
constexpr const char* MODULE_NAME = "@PROJECT_NAME@";

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ void registerBruteForceBroadPhase(sofa::core::ObjectFactory* factory)
3737
BruteForceBroadPhase::BruteForceBroadPhase()
3838
: d_box(initData(&d_box, "box", "if not empty, objects that do not intersect this bounding-box will be ignored"))
3939
{
40-
41-
box.setOriginalData (&d_box);
42-
4340
}
4441

4542
void BruteForceBroadPhase::init()

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
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/lifecycle/RenamedData.h>
2827

2928
namespace sofa::component::collision::detection::algorithm
3029
{
@@ -49,10 +48,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API BruteForceBroadPhase : pu
4948
~BruteForceBroadPhase() override = default;
5049

5150
private:
52-
///< if not empty, objects that do not intersect this bounding-box will be ignored
53-
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM()
54-
sofa::core::objectmodel::lifecycle::RenamedData<type::fixed_array<sofa::type::Vec3, 2> > box;
55-
5651
Data<type::fixed_array<sofa::type::Vec3, 2> > d_box; ///< if not empty, objects that do not intersect this bounding-box will be ignored
5752

5853

0 commit comments

Comments
 (0)