diff --git a/doc/XMLreference.rst b/doc/XMLreference.rst index 2f8fdbb5..c9de4f53 100644 --- a/doc/XMLreference.rst +++ b/doc/XMLreference.rst @@ -3655,11 +3655,6 @@ saving the XML: -.. _body-flexcomp-class: - -:at:`class`: :at-val:`string, optional` - Defaults class for setting unspecified attributes. - .. _body-flexcomp-name: :at:`name`: :at-val:`string, required` diff --git a/doc/XMLschema.rst b/doc/XMLschema.rst index e7fbe7ff..84b5aff4 100644 --- a/doc/XMLschema.rst +++ b/doc/XMLschema.rst @@ -487,19 +487,17 @@ | :ref:`flexcomp | \* | :class: mjcf-attributes | | ` | | | | | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ | -| | | | :ref:`name` | :ref:`class` | :ref:`type` | :ref:`group` | | +| | | | :ref:`name` | :ref:`type` | :ref:`group` | :ref:`dim` | | | | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ | -| | | | :ref:`dim` | :ref:`count` | :ref:`spacing` | :ref:`radius` | | +| | | | :ref:`count` | :ref:`spacing` | :ref:`radius` | :ref:`rigid` | | | | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ | -| | | | :ref:`rigid` | :ref:`mass` | :ref:`inertiabox` | :ref:`scale` | | +| | | | :ref:`mass` | :ref:`inertiabox` | :ref:`scale` | :ref:`file` | | | | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ | -| | | | :ref:`file` | :ref:`point` | :ref:`element` | :ref:`texcoord` | | +| | | | :ref:`point` | :ref:`element` | :ref:`texcoord` | :ref:`material` | | | | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ | -| | | | :ref:`material` | :ref:`rgba` | :ref:`flatskin` | :ref:`pos` | | +| | | | :ref:`rgba` | :ref:`flatskin` | :ref:`pos` | :ref:`quat` | | | | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ | -| | | | :ref:`quat` | :ref:`axisangle` | :ref:`xyaxes` | :ref:`zaxis` | | -| | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ | -| | | | :ref:`euler` | | | | | +| | | | :ref:`axisangle` | :ref:`xyaxes` | :ref:`zaxis` | :ref:`euler` | | | | | +-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+-----------------------------------------------------------------+ | +------------------------------------+----+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | |_2| flexcomp |br| |_2| |L| | | .. table:: | diff --git a/src/xml/xml_native_reader.cc b/src/xml/xml_native_reader.cc index 8cf7e0d1..49f9c007 100644 --- a/src/xml/xml_native_reader.cc +++ b/src/xml/xml_native_reader.cc @@ -293,7 +293,7 @@ static const char* MJCF[nMJCF][mjXATTRNUM] = { {"config", "*", "2", "key", "value"}, {">"}, {">"}, - {"flexcomp", "*", "25", "name", "class", "type", "group", "dim", + {"flexcomp", "*", "24", "name", "type", "group", "dim", "count", "spacing", "radius", "rigid", "mass", "inertiabox", "scale", "file", "point", "element", "texcoord", "material", "rgba", "flatskin", "pos", "quat", "axisangle", "xyaxes", "zaxis", "euler"},