chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typos in docs.

Browse Source 
PiperOrigin-RevId: 573172715
Change-Id: I0073d0872597b01d84151b9eea578cc0ae0a5013
This commit is contained in:
Alessio Quaglino
2023-10-13 04:01:54 -07:00
committed by Copybara-Service
parent 36de0cc084
commit 389e13938e
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/XMLreference.rst
+1 -3
View File
@@ -3791,8 +3791,6 @@ Associate this composite with an :ref:`engine plugin<exPlugin>`. Either :at:`plu
.. _flex-contact: .. _flex-contact:
.. _flexcomp-contact: .. _flexcomp-contact:
.. _flexcomp-contact-:
.. _flex-contact-contype: .. _flex-contact-contype:
.. _flexcomp-contact-contype: .. _flexcomp-contact-contype:
@@ -3865,7 +3863,7 @@ Associate this composite with an :ref:`engine plugin<exPlugin>`. Either :at:`plu
**deformable** (*) **deformable** (*)
~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
.. _contact: .. _contact:
doc/XMLschema.rst
+1 -1
View File
@@ -517,7 +517,7 @@
| | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ | | | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ |
| | | | :ref:`friction<flexcomp-contact-friction>` | :ref:`solmix<flexcomp-contact-solmix>` | :ref:`solref<flexcomp-contact-solref>` | :ref:`solimp<flexcomp-contact-solimp>` | | | | | | :ref:`friction<flexcomp-contact-friction>` | :ref:`solmix<flexcomp-contact-solmix>` | :ref:`solref<flexcomp-contact-solref>` | :ref:`solimp<flexcomp-contact-solimp>` | |
| | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ | | | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ |
| | | | :ref:`margin<flexcomp-contact-margin>` | :ref:`gap<flexcomp-contact-gap>` | :ref:`<flexcomp-contact->` | | | | | | | :ref:`margin<flexcomp-contact-margin>` | :ref:`gap<flexcomp-contact-gap>` | | | |
| | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ | | | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ |
+------------------------------------+----+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +------------------------------------+----+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| |_2| flexcomp |br| |_2| |L| | | .. table:: | | |_2| flexcomp |br| |_2| |L| | | .. table:: |
doc/changelog.rst
+1 -1
View File
@@ -142,7 +142,7 @@ Python bindings
24. Fixed `#870 <https://github.com/google-deepmind/mujoco/issues/870>`__ where calling ``update_scene`` with an invalid 24. Fixed `#870 <https://github.com/google-deepmind/mujoco/issues/870>`__ where calling ``update_scene`` with an invalid
camera name used the default camera. camera name used the default camera.
25. Added ``user_scn`` to the :ref:`passive viewer<PyViewerPassive>` handle, which allows users to add custom 25. Added ``user_scn`` to the :ref:`passive viewer<PyViewerPassive>` handle, which allows users to add custom
visualization geoms (`#1023 <https://github.com/google-deepmind/mujoco/issues/870>`__). visualization geoms (`#1023 <https://github.com/google-deepmind/mujoco/issues/870>`__).
26. Added optional boolean keyword arguments ``show_left_ui`` and ``show_right_ui`` to the functions ``viewer.launch`` 26. Added optional boolean keyword arguments ``show_left_ui`` and ``show_right_ui`` to the functions ``viewer.launch``
and ``viewer.launch_passive``, which allow users to launch a viewer with UI panels hidden. and ``viewer.launch_passive``, which allow users to launch a viewer with UI panels hidden.
src/xml/xml_native_reader.cc
+1 -1
View File
@@ -300,7 +300,7 @@ static const char* MJCF[nMJCF][mjXATTRNUM] = {
{"<"}, {"<"},
{"edge", "?", "5", "equality", "solref", "solimp", "stiffness", "damping"}, {"edge", "?", "5", "equality", "solref", "solimp", "stiffness", "damping"},
{"contact", "?", "10", "contype", "conaffinity", "condim", "priority", {"contact", "?", "10", "contype", "conaffinity", "condim", "priority",
"friction", "solmix", "solref", "solimp", "margin", "gap", }, "friction", "solmix", "solref", "solimp", "margin", "gap"},
{"pin", "*", "4", "id", "range", "grid", "gridrange"}, {"pin", "*", "4", "id", "range", "grid", "gridrange"},
{">"}, {">"},
{">"}, {">"},