diff --git a/doc/mjx.rst b/doc/mjx.rst index 90a43e87..6726c3c1 100644 --- a/doc/mjx.rst +++ b/doc/mjx.rst @@ -196,7 +196,8 @@ The following features are **fully supported** in MJX: * - :ref:`Actuator Bias ` - ``NONE``, ``AFFINE`` * - :ref:`Geom ` - - ``PLANE``, ``HFIELD``, ``SPHERE``, ``CAPSULE``, ``BOX``, ``MESH`` are fully implemented. ``ELLIPSOID`` and ``CYLINDER`` are implemented but only collide with other primitives. + - ``PLANE``, ``HFIELD``, ``SPHERE``, ``CAPSULE``, ``BOX``, ``MESH`` are fully implemented. ``ELLIPSOID`` and + ``CYLINDER`` are implemented but only collide with other primitives, note that ``BOX`` is implemented as a mesh. * - :ref:`Constraint ` - ``EQUALITY``, ``LIMIT_JOINT``, ``CONTACT_FRICTIONLESS``, ``CONTACT_PYRAMIDAL``, ``CONTACT_ELLIPTIC`` * - :ref:`Equality ` @@ -225,7 +226,8 @@ The following features are **in development** and coming soon: * - Category - Feature * - :ref:`Geom ` - - ``SDF``. Collisions between (``SPHERE``, ``BOX``, ``MESH``, ``HFIELD``) and ``CYLINDER``. Collisions between (``BOX``, ``MESH``, ``HFIELD``) and ``ELLIPSOID``. + - ``SDF``. Collisions between (``SPHERE``, ``BOX``, ``MESH``, ``HFIELD``) and ``CYLINDER``. Collisions between + (``BOX``, ``MESH``, ``HFIELD``) and ``ELLIPSOID``. * - :ref:`Constraint ` - :ref:`Frictionloss `, ``FRICTION_DOF`` * - :ref:`Integrator `