From d3d46e16a4a7221e4d6d7480bd19e5dc09660777 Mon Sep 17 00:00:00 2001 From: Alessio Quaglino Date: Mon, 25 Sep 2023 03:37:42 -0700 Subject: [PATCH] Remove cloth and rope composites and deprecate loop. PiperOrigin-RevId: 568168329 Change-Id: Ida4a5236bef74828c7bf59affdc28adea3db53b1 --- doc/changelog.rst | 24 +- model/composite/cloth.xml | 35 - model/composite/loop.xml | 32 - model/{flag => plugin/elasticity}/flag.xml | 27 +- model/plugin/elasticity/plate.xml | 2 +- src/user/user_composite.cc | 388 +- src/user/user_composite.h | 2 - .../engine_core_smooth_benchmark_test.cc | 4 +- .../engine_util_sparse_benchmark_test.cc | 2 +- test/benchmark/parse_benchmark_test.cc | 9 +- test/benchmark/step_benchmark_test.cc | 9 +- test/benchmark/testdata/flag.xml | 5582 +++++++++++++++++ test/user/user_composite_test.cc | 28 - test/xml/xml_native_writer_test.cc | 13 +- 14 files changed, 5709 insertions(+), 448 deletions(-) delete mode 100644 model/composite/cloth.xml delete mode 100644 model/composite/loop.xml rename model/{flag => plugin/elasticity}/flag.xml (66%) create mode 100644 test/benchmark/testdata/flag.xml diff --git a/doc/changelog.rst b/doc/changelog.rst index 988c1ef5..4ef82bfa 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -84,35 +84,39 @@ General :ref:`conaffinity` attributes in the model and then setting them globally to ``0`` using |br| `` ``. -11. Added a new :ref:`dyntype`, ``filterexact``, which updates first-order filter states with + 11. Removed the :at:`rope` and :at:`cloth` composite objects. + + **Migration:** Users should use the :at:`cable` and :at:`shell` elasticity plugins. + +12. Added a new :ref:`dyntype`, ``filterexact``, which updates first-order filter states with the exact formula rather than with Euler integration. -12. Added an actuator attribute, :ref:`actearly`, which uses semi-implicit integration for +13. Added an actuator attribute, :ref:`actearly`, which uses semi-implicit integration for actuator forces: using the next step's actuator state to compute the current actuator forces at the current timestep. -13. Renamed ``actuatorforcerange`` and ``actuatorforcelimited``, introduced in the previous version to +14. Renamed ``actuatorforcerange`` and ``actuatorforcelimited``, introduced in the previous version to :ref:`actuatorfrcrange` and :ref:`actuatorfrclimited`, respectively. -14. Added the flag :ref:`eulerdamp`, which disables implicit integration of joint damping in the +15. Added the flag :ref:`eulerdamp`, which disables implicit integration of joint damping in the Euler integrator. See the :ref:`Numerical Integration` section for more details. -15. Added the flag :ref:`invdiscrete`, which enables discrete-time inverse dynamics for all +16. Added the flag :ref:`invdiscrete`, which enables discrete-time inverse dynamics for all :ref:`integrators` other than ``RK4``. See the flag documentation for more details. -16. Added :ref:`ls_iterations` and :ref:`ls_tolerance` options for adjusting +17. Added :ref:`ls_iterations` and :ref:`ls_tolerance` options for adjusting linesearch stopping criteria in CG and Newton solvers. These can be useful for performance tuning. -17. Added ``mesh_pos`` and ``mesh_quat`` fields to :ref:`mjModel` to store the normalizing transformation applied to +18. Added ``mesh_pos`` and ``mesh_quat`` fields to :ref:`mjModel` to store the normalizing transformation applied to mesh assets. Fixes `#409 `__ . -18. Added camera :ref:`resolution` attribute and :ref:`camprojection` +19. Added camera :ref:`resolution` attribute and :ref:`camprojection` sensor. If camera resolution is set to positive values, the camera projection sensor will report the location of a target site, projected onto the camera image, in pixel coordinates. Python bindings ^^^^^^^^^^^^^^^ -19. Fixed `#870 `__ where calling ``update_scene`` with an invalid +20. Fixed `#870 `__ where calling ``update_scene`` with an invalid camera name used the default camera. Bug fixes ^^^^^^^^^ -20. Fixed a bug that was causing :ref:`geom margin` to be ignored during the construction of +21. Fixed a bug that was causing :ref:`geom margin` to be ignored during the construction of midphase collision trees. diff --git a/model/composite/cloth.xml b/model/composite/cloth.xml deleted file mode 100644 index d0d1d3e1..00000000 --- a/model/composite/cloth.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - diff --git a/model/composite/loop.xml b/model/composite/loop.xml deleted file mode 100644 index ba0a5993..00000000 --- a/model/composite/loop.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - diff --git a/model/flag/flag.xml b/model/plugin/elasticity/flag.xml similarity index 66% rename from model/flag/flag.xml rename to model/plugin/elasticity/flag.xml index fa1b680a..cfe4b6c1 100644 --- a/model/flag/flag.xml +++ b/model/plugin/elasticity/flag.xml @@ -23,22 +23,33 @@ --> -