Remove custom mujoco.texture format.
PiperOrigin-RevId: 960257562 Change-Id: I318c84d82576d405f0a5d8510acd5bab5f08c9af
This commit is contained in:
committed by
Copybara-Service
parent
84950fa371
commit
6fe04aa8d3
+5
-15
@@ -1653,18 +1653,9 @@ The texture data can be loaded from files or can be generated by the compiler as
|
||||
different texture types require different parameters, only a subset of the attributes below are used for any given
|
||||
texture. Provisions are provided for loading cube and skybox textures from individual image files.
|
||||
|
||||
Three file formats are supported for loading textures: PNG, KTX, and a custom MuJoCo texture format. The
|
||||
loader will use the extension of the file name to determine which format to use, defaulting to the custom format if
|
||||
the extension is not recognized. Alternatively, the content_type attribute can be used to specify the format
|
||||
explicitly. Only ``image/png``, ``image/ktx``, or ``image/vnd.mujoco.texture`` are supported.
|
||||
|
||||
The custom MuJoCo format is assumed to be a binary file containing the following data:
|
||||
|
||||
.. code:: Text
|
||||
|
||||
(int32) width
|
||||
(int32) height
|
||||
(byte) rgb_data[3*width*height]
|
||||
Two file formats are supported for loading textures: PNG and KTX. The loader will use the extension of the file name to
|
||||
determine which format to use. Alternatively, the content_type attribute can be used to specify the format explicitly.
|
||||
Only ``image/png`` and ``image/ktx`` are supported.
|
||||
|
||||
.. _asset-texture-name:
|
||||
|
||||
@@ -1687,7 +1678,7 @@ The custom MuJoCo format is assumed to be a binary file containing the following
|
||||
corresponding texture color. The six square images defining the cube can be the same or different; if they are the
|
||||
same, only one copy is stored in mjModel. There are four mechanisms for specifying the texture data:
|
||||
|
||||
#. Single file (PNG or custom) specified with the file attribute, containing a square image which is repeated on each
|
||||
#. Single file (PNG or KTX) specified with the file attribute, containing a square image which is repeated on each
|
||||
side of the cube. This is the most common approach. If for example the goal is to create the appearance of wood,
|
||||
repeating the same image on all sides is sufficient.
|
||||
#. Single file containing a composite image from which the six squares are extracted by the compiler. The layout of
|
||||
@@ -1722,8 +1713,7 @@ The custom MuJoCo format is assumed to be a binary file containing the following
|
||||
:at:`content_type`: :at-val:`string, optional`
|
||||
If the file attribute is specified, then this sets the
|
||||
`Media Type <https://www.iana.org/assignments/media-types/media-types.xhtml>`_ (formerly known as MIME types) of the
|
||||
file to be loaded. Any filename extensions will be ignored. Currently ``image/png``, ``image/ktx``, and
|
||||
``image/vnd.mujoco.texture`` are supported.
|
||||
file to be loaded. Any filename extensions will be ignored. Currently ``image/png`` and ``image/ktx`` are supported.
|
||||
|
||||
.. _asset-texture-file:
|
||||
|
||||
|
||||
@@ -14,6 +14,13 @@ General
|
||||
and gated by tests, as are the schema's enum keywords and declared defaults against the C headers and
|
||||
default-constructors.
|
||||
|
||||
.. admonition:: Breaking API changes
|
||||
:class: attention
|
||||
|
||||
- Removed the custom binary texture format (``image/vnd.mujoco.texture``) and the automatic fallback to custom
|
||||
textures when loading files with unrecognized extensions. Textures can now only be loaded from PNG (``image/png``)
|
||||
and KTX (``image/ktx``) files.
|
||||
|
||||
Actuation
|
||||
^^^^^^^^^
|
||||
- Added the :ref:`pid<actuator-pid>` actuator: a PID controller with real position and velocity setpoint inputs,
|
||||
|
||||
+1
-1
@@ -425,7 +425,7 @@ the other objects in the simulation, so the number of contacts will be small for
|
||||
Texture
|
||||
^^^^^^^
|
||||
|
||||
Textures can be loaded from PNG files or synthesized by the compiler based on user-defined procedural parameters.
|
||||
Textures can be loaded from PNG or KTX files or synthesized by the compiler based on user-defined procedural parameters.
|
||||
There is also the option to leave the texture empty at model creation time and change it later at runtime -- so as to
|
||||
render video in a MuJoCo simulation, or create other dynamic effects. The visualizer supports two types of texture
|
||||
mapping: 2D and cube. 2D mapping is useful for planes and height fields. Cube mapping is useful for "shrink-wrapping"
|
||||
|
||||
Reference in New Issue
Block a user