Skip to content

Commit

Permalink
[all] Lifecycle for v24.06 (2): remove Compat (sofa-framework#4533)
Browse files Browse the repository at this point in the history
* [all] Lifecycle for v24.06 (1)

* removed files

* forgotten Axis.h

* Complete SOFA_ATTRIBUTE_DEPRECATED ... v24.06 into DISABLED

* start removing ATTRIBUTE_DISABLED v23.06 and fix EdgeSetGeometryAlgorithms

* delete all v24.06 disabled functions

* Remove all data and attributes removed since v23.06

* [all] Lifecycle v24.06 (2): remove Compat

* Update last uses of type::Vector3

* missing change Vector3 in OmniDriverEmu.cpp

* Fix compilation GeomagicEmulator

* Fix TaskScheduler

* mising fixes

* fix reference to driver

* Fix warning in VariationalSymplecticSolver example scene

* Remove symbol in fwd.h for Win compilation

* Remove symbol in DAGSimulation for Win compilation

* Remove symbol in LCPcal and ColourPickingVisitor for Win compilation
  • Loading branch information
hugtalbot authored and bakpaul committed Mar 21, 2024
1 parent dbee77e commit a3e2885
Show file tree
Hide file tree
Showing 835 changed files with 325 additions and 20,806 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API DirectSAPNarrowPhase : pu
*/
void updateBoxes();

SOFA_ATTRIBUTE_DEPRECATED__DRAWNARROWPHASE()
sofa::core::objectmodel::lifecycle::DeprecatedData d_draw{this, "v23.12", "v24.06", "draw", "Use display flag 'showDetectionOutputs' instead"}; ///< enable/disable display of results
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 Expand Up @@ -140,4 +141,4 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API DirectSAPNarrowPhase : pu
bool needsDeepBoundingTree() const override { return false; }
};

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API RayTraceNarrowPhase : pub
SOFA_CLASS(RayTraceNarrowPhase, core::collision::NarrowPhaseDetection);

private:
SOFA_ATTRIBUTE_DEPRECATED__DRAWNARROWPHASE()
sofa::core::objectmodel::lifecycle::DeprecatedData bDraw{this, "v23.12", "v24.06", "draw", "Use display flag 'showDetectionOutputs' instead"}; ///< enable/disable display of results
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 All @@ -59,4 +59,4 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API RayTraceNarrowPhase : pub

};

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
#endif

#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_DETECTION
# define SOFA_ATTRIBUTE_DEPRECATED__DRAWNARROWPHASE()
# define SOFA_ATTRIBUTE_DISABLED__DRAWNARROWPHASE()
#else
# define SOFA_ATTRIBUTE_DEPRECATED__DRAWNARROWPHASE() \
SOFA_ATTRIBUTE_DEPRECATED( \
# 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
namespace sofa::component::collision::detection::algorithm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,6 @@
# define SOFA_COMPONENT_COLLISION_RESPONSE_CONTACT_API SOFA_IMPORT_DYNAMIC_LIBRARY
#endif

#ifdef SOFA_BUILD_SOFA_COMPONENT_COLLISION_RESPONSE_CONTACT
#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_COLLISIONRESPONSE()
#else
#define SOFA_ATTRIBUTE_DEPRECATED__RENAME_COLLISIONRESPONSE() \
SOFA_ATTRIBUTE_DEPRECATED( \
"v23.12", "v24.06", \
"DefaultContactManager renamed as CollisionResponse in #3891: Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.h")
#endif

namespace sofa::component::collision::response::contact
{
constexpr const char* MODULE_NAME = "@PROJECT_NAME@";
Expand Down
71 changes: 0 additions & 71 deletions Sofa/Component/Compat/CMakeLists.txt

This file was deleted.

10 changes: 0 additions & 10 deletions Sofa/Component/Compat/Sofa.Component.AnimationLoop.cmake

This file was deleted.

This file was deleted.

This file was deleted.

26 changes: 0 additions & 26 deletions Sofa/Component/Compat/Sofa.Component.Collision.Geometry.cmake

This file was deleted.

This file was deleted.

This file was deleted.

12 changes: 0 additions & 12 deletions Sofa/Component/Compat/Sofa.Component.CompatConfig.cmake.in

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

45 changes: 0 additions & 45 deletions Sofa/Component/Compat/Sofa.Component.Constraint.Projective.cmake

This file was deleted.

7 changes: 0 additions & 7 deletions Sofa/Component/Compat/Sofa.Component.Controller.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions Sofa/Component/Compat/Sofa.Component.Diffusion.cmake

This file was deleted.

17 changes: 0 additions & 17 deletions Sofa/Component/Compat/Sofa.Component.Engine.Analyze.cmake

This file was deleted.

Loading

0 comments on commit a3e2885

Please sign in to comment.