Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
b66e757
Disable SOFA_HEADER_DEPRECATED 1/n
hugtalbot Jan 16, 2025
934846a
Remove SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_IO_MESH
hugtalbot Jan 23, 2025
8c338c6
Remove SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_VISUAL
hugtalbot Jan 23, 2025
f2e940f
Remove SOFA_ATTRIBUTE_DISABLED__VEC3STATE_AS_VISUALSTATE
hugtalbot Jan 23, 2025
4c3f192
Remove SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SETTING
hugtalbot Jan 23, 2025
11de001
Remove SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_PLAYBACK
hugtalbot Jan 23, 2025
04f6944
Remove SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_TOPOLOGY_CONTAINER_D…
hugtalbot Jan 23, 2025
1bb0749
Remove SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ENGINE_GENERATE
hugtalbot Jan 23, 2025
25ebef2
Remove ALL SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA*
hugtalbot Jan 24, 2025
1d5382b
Disabling all v24.12 SOFA_ATTRIBUTE_DEPRECATED
hugtalbot Jan 25, 2025
bf62f3b
Disable all SOFA_HEADER_DEPRECATED and Fix older lifecycle forgotten
hugtalbot Jan 25, 2025
3bca6ff
Disable all SOFA_ATTRIBUTE_DEPRECATED
hugtalbot Jan 25, 2025
7dc2030
Remove all RemovedData v24.06
hugtalbot Jan 25, 2025
f1969f4
Remove all SOFA_ATTRIBUTE_DISABLED v24.06
hugtalbot Jan 25, 2025
4b4503e
Update CMakeLists with removed files
hugtalbot Jan 25, 2025
fefde77
first attempt to fix compilation (before merge with master)
hugtalbot Jan 25, 2025
5019950
Fix last forgotten disabled
hugtalbot Jan 26, 2025
9769a27
forgotten delete in SparseCommon
hugtalbot Jan 26, 2025
79659e4
Merge master
hugtalbot Jan 26, 2025
3804579
Fix compilation, especially using vec_id::write_access
hugtalbot Jan 26, 2025
e5041a1
Replace getModuleComponentList by listClassesFromTarget in PluginManager
hugtalbot Jan 26, 2025
0e688df
Merge branch 'master' into 202501_lifecycle_v2506
hugtalbot Jan 29, 2025
6360366
Fix compilation in OglVolumetricModel
hugtalbot Feb 12, 2025
5b471a8
merge master
hugtalbot Feb 12, 2025
d992dd8
Fix reverted change
hugtalbot Feb 12, 2025
b5020f0
Fix compilation plugin Assimp
hugtalbot Feb 17, 2025
693f3df
Complete compilation on Assimp
hugtalbot Feb 17, 2025
ffc2120
Fix compilation in tutorials
hugtalbot Feb 17, 2025
67af674
Merge branch 'master' into 202501_lifecycle_v2506
fredroy Feb 20, 2025
e571ad0
Merge branch 'master' into 202501_lifecycle_v2506
hugtalbot Feb 25, 2025
f2fc420
fix compilation
fredroy Feb 26, 2025
db156bb
fix compilation again
fredroy Feb 26, 2025
095de32
fix compilation (cuda with sph)
fredroy Feb 26, 2025
d9288bd
fix compilation (cuda with distancegrid)
fredroy Feb 26, 2025
922e0c4
Merge branch 'master' into 202501_lifecycle_v2506
fredroy Feb 28, 2025
8616c36
Merge branch 'master' into 202501_lifecycle_v2506
fredroy Mar 4, 2025
6b00e42
fix merge
fredroy Mar 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -400,12 +400,12 @@ void ConstraintAnimationLoop::writeAndAccumulateAndCountConstraintDirections(con
MechanicalResetConstraintVisitor(&cparams).execute(context);

// calling applyConstraint on each constraint
MechanicalSetConstraint(&cparams, core::vec_id::write_access::constraintJacobian, numConstraints).execute(context);
sofa::simulation::mechanicalvisitor::MechanicalBuildConstraintMatrix(&cparams, core::vec_id::write_access::constraintJacobian, numConstraints).execute(context);

sofa::helper::AdvancedTimer::valSet("numConstraints", numConstraints);

// calling accumulateConstraint on the mappings
MechanicalAccumulateConstraint2(&cparams, core::vec_id::write_access::constraintJacobian).execute(context);
sofa::simulation::mechanicalvisitor::MechanicalAccumulateMatrixDeriv(&cparams, core::vec_id::write_access::constraintJacobian).execute(context);

getCP()->clear(numConstraints,this->d_tol.getValue());
}
Expand All @@ -426,7 +426,7 @@ void ConstraintAnimationLoop::getIndividualConstraintSolvingProcess(const core::
cparams.setX(core::vec_id::read_access::freePosition);
cparams.setV(core::vec_id::read_access::freeVelocity);

MechanicalGetConstraintResolutionVisitor(&cparams, getCP()->getConstraintResolutions(), 0).execute(context);
sofa::component::constraint::lagrangian::solver::MechanicalGetConstraintResolutionVisitor(&cparams, getCP()->getConstraintResolutions(), 0).execute(context);
}

void ConstraintAnimationLoop::computeComplianceInConstraintSpace()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,6 @@ namespace sofa::component::constraint::lagrangian::solver
namespace sofa::component::animationloop
{

using MechanicalGetConstraintResolutionVisitor
SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR("Use sofa::component::constraint::lagrangian::solver::MechanicalGetConstraintResolutionVisitor instead.")
= sofa::component::constraint::lagrangian::solver::MechanicalGetConstraintResolutionVisitor;

using MechanicalSetConstraint
SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR("Use sofa::simulation::mechanicalvisitor::MechanicalBuildConstraintMatrix instead.")
= sofa::simulation::mechanicalvisitor::MechanicalBuildConstraintMatrix;

using MechanicalAccumulateConstraint2
SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR("Use sofa::simulation::mechanicalvisitor::MechanicalAccumulateMatrixDeriv instead.")
= sofa::simulation::mechanicalvisitor::MechanicalAccumulateMatrixDeriv;

class SOFA_COMPONENT_ANIMATIONLOOP_API ConstraintProblem
{
protected:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ FreeMotionAnimationLoop::FreeMotionAnimationLoop() :
{
d_parallelCollisionDetectionAndFreeMotion.setGroup("Multithreading");
d_parallelODESolving.setGroup("Multithreading");

m_solveVelocityConstraintFirst.setOriginalData(&d_solveVelocityConstraintFirst);
}

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

MultiVecDeriv dx(&vop, core::vec_id::write_access::dx);
dx.realloc(&vop, !d_threadSafeVisitor.getValue(), true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

#include <sofa/simulation/CollisionAnimationLoop.h>
#include <sofa/core/MultiVecId.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

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


SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
sofa::core::objectmodel::lifecycle::RenamedData<bool> m_solveVelocityConstraintFirst;

Data<bool> d_solveVelocityConstraintFirst; ///< solve separately velocity constraint violations before position constraint violations
Data<bool> d_threadSafeVisitor; ///< If true, do not use realloc and free visitors in fwdInteractionForceField.
Data<bool> d_parallelCollisionDetectionAndFreeMotion; ///< If true, executes free motion step and collision detection step in parallel.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ MultiStepAnimationLoop::MultiStepAnimationLoop() :
d_collisionSteps( initData(&d_collisionSteps,1,"collisionSteps", "number of collision steps between each frame rendering") )
, d_integrationSteps( initData(&d_integrationSteps,1,"integrationSteps", "number of integration steps between each collision detection") )
{
collisionSteps.setOriginalData(&d_collisionSteps);
integrationSteps.setOriginalData(&d_integrationSteps);
}

MultiStepAnimationLoop::~MultiStepAnimationLoop()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

#include <sofa/core/behavior/BaseAnimationLoop.h>
#include <sofa/simulation/CollisionAnimationLoop.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

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

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
sofa::core::objectmodel::lifecycle::RenamedData<int> collisionSteps;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
sofa::core::objectmodel::lifecycle::RenamedData<int> integrationSteps;

Data<int> d_collisionSteps; ///< number of collision steps between each frame rendering
Data<int> d_integrationSteps; ///< number of integration steps between each collision detection
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,6 @@
# define SOFA_COMPONENT_ANIMATIONLOOP_API SOFA_IMPORT_DYNAMIC_LIBRARY
#endif

#ifdef SOFA_BUILD_SOFA_COMPONENT_ANIMATIONLOOP
#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
#else
#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP() \
SOFA_ATTRIBUTE_DEPRECATED( \
"v24.06", "v24.12", \
"Data renamed according to the guidelines")
#endif

#ifdef SOFA_BUILD_SOFA_COMPONENT_ANIMATIONLOOP
#define SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR(msg)
#else
#define SOFA_ATTRIBUTE_DEPRECATED__DUPLICATED_CONSTRAINT_RESOLUTION_VISITOR(msg) \
SOFA_ATTRIBUTE_DEPRECATED( \
"v24.06", "v24.12", \
msg)
#endif

namespace sofa::component::animationloop
{
constexpr const char* MODULE_NAME = "@PROJECT_NAME@";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ void registerBruteForceBroadPhase(sofa::core::ObjectFactory* factory)
BruteForceBroadPhase::BruteForceBroadPhase()
: d_box(initData(&d_box, "box", "if not empty, objects that do not intersect this bounding-box will be ignored"))
{

box.setOriginalData (&d_box);

}

void BruteForceBroadPhase::init()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <sofa/component/collision/detection/algorithm/config.h>
#include <sofa/core/collision/BroadPhaseDetection.h>
#include <sofa/component/collision/geometry/CubeModel.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

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

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

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


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API DirectSAPNarrowPhase : pu
*/
void updateBoxes();

SOFA_ATTRIBUTE_DISABLED__DRAWNARROWPHASE()
sofa::core::objectmodel::lifecycle::RemovedData d_draw{this, "v23.12", "v24.06", "draw", "Use display flag 'showDetectionOutputs' instead"}; ///< enable/disable display of results

Data<bool> d_showOnlyInvestigatedBoxes; ///< Show only boxes which will be sent to narrow phase
Data<int> d_nbPairs; ///< number of pairs of elements sent to narrow phase

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ IncrSAP::IncrSAP()
:d_box(initData(&d_box, "box", "if not empty, objects that do not intersect this bounding-box will be ignored")),
_nothing_added(true)
{
box.setOriginalData ( &d_box);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@
#include <map>
#include <deque>

#include <sofa/core/objectmodel/lifecycle/RenamedData.h>


namespace sofa::component::collision::detection::algorithm
{

Expand Down Expand Up @@ -211,12 +208,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API IncrSAP :
*/
void purge();

SOFA_ATTRIBUTE_DEPRECATED__REMOVE_BDRAW_DATA()
core::objectmodel::lifecycle::DeprecatedData bDraw {this, "v24.06", "v24.12", "draw", "This Data was not used"};

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM()
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

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

collision::geometry::CubeCollisionModel::SPtr boxModel;
Expand Down Expand Up @@ -254,10 +245,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API IncrSAP :
~IncrSAP() override;

public:

SOFA_ATTRIBUTE_DEPRECATED__REMOVE_BDRAW_DATA()
void setDraw(bool) {}

void init() override;
void reinit() override;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API RayTraceNarrowPhase : pub
public:
SOFA_CLASS(RayTraceNarrowPhase, core::collision::NarrowPhaseDetection);

private:
SOFA_ATTRIBUTE_DISABLED__DRAWNARROWPHASE()
sofa::core::objectmodel::lifecycle::RemovedData bDraw{this, "v23.12", "v24.06", "draw", "Use display flag 'showDetectionOutputs' instead"}; ///< enable/disable display of results

protected:
RayTraceNarrowPhase() = default;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,41 +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

#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION
# define SOFA_ATTRIBUTE_DISABLED__DRAWNARROWPHASE()
#else
# define SOFA_ATTRIBUTE_DISABLED__DRAWNARROWPHASE() \
SOFA_ATTRIBUTE_DISABLED( \
"v23.12", "v24.06", "This data is not used anymore: the drawing is now controlled by a draw flag")
#endif

#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM
#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM()
#else
#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM() \
SOFA_ATTRIBUTE_DEPRECATED(\
"v24.06", "v24.12",\
"data renamed according to the guidelines")
#endif

#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM
#define SOFA_ATTRIBUTE_DEPRECATED__REMOVE_BDRAW_DATA()
#else
#define SOFA_ATTRIBUTE_DEPRECATED__REMOVE_BDRAW_DATA() \
SOFA_ATTRIBUTE_DEPRECATED(\
"v24.06", "v24.12",\
"This Data was not used")
#endif

namespace sofa::component::collision::detection::algorithm
{
constexpr const char* MODULE_NAME = "@PROJECT_NAME@";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ BaseProximityIntersection::BaseProximityIntersection()
{
d_alarmDistance.setRequired(true);
d_contactDistance.setRequired(true);

alarmDistance.setOriginalData(&d_alarmDistance);
contactDistance.setOriginalData(&d_contactDistance);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
#include <sofa/component/collision/detection/intersection/DiscreteIntersection.h>
#include <sofa/component/collision/geometry/CubeModel.h>

#include <sofa/core/objectmodel/lifecycle/RenamedData.h>


namespace sofa::component::collision::detection::intersection
{

Expand All @@ -40,12 +37,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API BaseProximityIntersect
{
public:
SOFA_ABSTRACT_CLASS(BaseProximityIntersection,DiscreteIntersection);
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::lifecycle::RenamedData<SReal> alarmDistance;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::lifecycle::RenamedData<SReal> contactDistance;


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
Data<SReal> d_contactDistance; ///< Distance below which a contact is created
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@ LocalMinDistance::LocalMinDistance()
, d_coneFactor(initData(&d_coneFactor, 0.5, "coneFactor", "Factor for filtering cone angle computation"))
, d_useLMDFilters(initData(&d_useLMDFilters, false, "useLMDFilters", "Use external cone computation"))
{
filterIntersection.setOriginalData(&d_filterIntersection);
angleCone.setOriginalData(&d_angleCone);
coneFactor.setOriginalData(&d_coneFactor);
useLMDFilters.setOriginalData(&d_useLMDFilters);
}

void LocalMinDistance::init()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
#include <sofa/component/collision/geometry/CubeModel.h>
#include <sofa/component/collision/geometry/RayModel.h>

#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

namespace sofa::component::collision::detection::intersection
{

Expand Down Expand Up @@ -63,19 +61,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API LocalMinDistance : pub

typedef core::collision::IntersectorFactory<LocalMinDistance> IntersectorFactory;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::lifecycle::RenamedData<bool> filterIntersection;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::lifecycle::RenamedData<double> angleCone;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::lifecycle::RenamedData<double> coneFactor;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::lifecycle::RenamedData<bool> useLMDFilters;


Data<bool> d_filterIntersection; ///< Activate LMD filter
Data<double> d_angleCone; ///< Filtering cone extension angle
Data<double> d_coneFactor; ///< Factor for filtering cone angle computation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@ MinProximityIntersection::MinProximityIntersection()
, d_useLinePoint(initData(&d_useLinePoint, true, "useLinePoint", "activate Line-Point intersection tests"))
, d_useLineLine(initData(&d_useLineLine, true, "useLineLine", "activate Line-Line intersection tests"))
{
useSphereTriangle.setOriginalData(&d_useSphereTriangle);
usePointPoint.setOriginalData(&d_usePointPoint);
useLinePoint.setOriginalData(&d_useLinePoint);
useLineLine.setOriginalData(&d_useLineLine);
useSurfaceNormals.setOriginalData(&d_useSurfaceNormals);
}

void MinProximityIntersection::init()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@

#include <sofa/component/collision/detection/intersection/BaseProximityIntersection.h>

#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

namespace sofa::component::collision::detection::intersection
{

Expand Down Expand Up @@ -56,22 +54,6 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API MinProximityIntersecti
{
public:
SOFA_CLASS(MinProximityIntersection,BaseProximityIntersection);
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::lifecycle::RenamedData<bool> useSphereTriangle;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::lifecycle::RenamedData<bool> usePointPoint;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::lifecycle::RenamedData<bool> useSurfaceNormals;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::lifecycle::RenamedData<bool> useLinePoint;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::lifecycle::RenamedData<bool> useLineLine;



Data<bool> d_useSphereTriangle; ///< activate Sphere-Triangle intersection tests
Data<bool> d_usePointPoint; ///< activate Point-Point intersection tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ NewProximityIntersection::NewProximityIntersection()
: BaseProximityIntersection()
, d_useLineLine(initData(&d_useLineLine, false, "useLineLine", "Line-line collision detection enabled"))
{
useLineLine.setOriginalData(&d_useLineLine);
}

void NewProximityIntersection::init()
Expand Down
Loading