diff --git a/doc/XMLreference.rst b/doc/XMLreference.rst index 59925532..ff2783ef 100644 --- a/doc/XMLreference.rst +++ b/doc/XMLreference.rst @@ -2171,7 +2171,7 @@ chapter. .. _asset-texture-gridlayout: :at:`gridlayout`: :at-val:`string, "............"` - .. figure:: images/modeling/skybox.png + .. figure:: images/XMLreference/skybox.png :width: 250px :align: right @@ -2357,7 +2357,7 @@ also known as terrain map, is a 2D matrix of elevation data. The data can be spe .. _asset-hfield-size: :at:`size`: :at-val:`real(4), required` - .. figure:: images/modeling/peaks.png + .. figure:: images/XMLreference/peaks.png :width: 350px :align: right @@ -3402,13 +3402,21 @@ helps clarify the role of bodies and geoms in MuJoCo. .. _body-geom-fromto: :at:`fromto`: :at-val:`real(6), optional` - This attribute can only be used with capsule, cylinder, ellipsoid and box geoms. It provides an alternative + .. figure:: images/XMLreference/fromto.png + :width: 350px + :align: right + + This attribute can only be used with capsule, box, cylinder and ellipsoid geoms. It provides an alternative specification of the geom length as well as the frame position and orientation. The six numbers are the 3D coordinates of one point followed by the 3D coordinates of another point. The elongated part of the geom connects - these two points, with the +Z axis of the geom's frame oriented from the first towards the second point. The frame - orientation is obtained with the same procedure as the zaxis attribute described in :ref:`Frame orientations - `. The frame position is in the middle between the two points. If this attribute is specified, the - remaining position and orientation-related attributes are ignored. + these two points, with the +Z axis of the geom's frame oriented from the first towards the second point, while in the + perpendicular direction, the geom sizes are both equal to the first value of the :at:`size` attribute. The frame + orientation is obtained with the same procedure as the :at:`zaxis` attribute described in :ref:`Frame orientations + `. The frame position is in the middle between the end points. If this attribute is specified, the + remaining position and orientation-related attributes are ignored. The image on the right demonstrates use of + :at:`fromto` with the four supported geoms, using identical Z values. The model is `here <_static/fromto.xml>`__. + Note that the :at:`fromto` semantics of *capsule* are unique: the two end points specify the segement around which + the radius defines the capsule surface. .. _body-geom-pos: @@ -4562,7 +4570,7 @@ can also represent different forms of mechanical coupling. :el-prefix:`tendon/` |-| **spatial** (*) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -.. figure:: images/modeling/tendon.png +.. figure:: images/XMLreference/tendon.png :width: 400px :align: right diff --git a/doc/_static/fromto.xml b/doc/_static/fromto.xml new file mode 100644 index 00000000..ec78f51d --- /dev/null +++ b/doc/_static/fromto.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/doc/images/XMLreference/fromto.png b/doc/images/XMLreference/fromto.png new file mode 100644 index 00000000..7a3fd97c Binary files /dev/null and b/doc/images/XMLreference/fromto.png differ diff --git a/doc/images/modeling/peaks.png b/doc/images/XMLreference/peaks.png similarity index 100% rename from doc/images/modeling/peaks.png rename to doc/images/XMLreference/peaks.png diff --git a/doc/images/modeling/skybox.png b/doc/images/XMLreference/skybox.png similarity index 100% rename from doc/images/modeling/skybox.png rename to doc/images/XMLreference/skybox.png diff --git a/doc/images/modeling/tendon.png b/doc/images/XMLreference/tendon.png similarity index 100% rename from doc/images/modeling/tendon.png rename to doc/images/XMLreference/tendon.png