Skip to content

Commit

Permalink
Remove box, cylinder and ellipsoid composite types.
Browse files Browse the repository at this point in the history
Also, fix a bug with Flex textures that was causing an incorrect allocation of the textures in mjModel. Fixes #2013.

PiperOrigin-RevId: 692510858
Change-Id: I3d9cba72d32792554f47f617b3528d26a9a33830
  • Loading branch information
quagla authored and copybara-github committed Nov 2, 2024
1 parent 8358f6d commit d25bb88
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions dm_control/mjcf/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@
<element name="composite" repeated="true">
<attributes>
<attribute name="prefix" type="identifier"/>
<attribute name="type" type="keyword" valid_values="particle grid cable rope loop cloth box cylinder ellipsoid" required="true"/>
<attribute name="type" type="keyword" valid_values="particle grid cable rope loop cloth" required="true"/>
<attribute name="count" type="array" array_type="int" array_size="3"/>
<attribute name="spacing" type="float" required="false"/>
<attribute name="offset" type="array" array_type="float" array_size="3"/>
Expand Down Expand Up @@ -1604,7 +1604,7 @@
<element name="composite" repeated="true">
<attributes>
<attribute name="prefix" type="identifier"/>
<attribute name="type" type="keyword" valid_values="particle grid cable rope loop cloth box cylinder ellipsoid" required="true"/>
<attribute name="type" type="keyword" valid_values="particle grid cable rope loop cloth" required="true"/>
<attribute name="count" type="array" array_type="int" array_size="3"/>
<attribute name="spacing" type="float" required="false"/>
<attribute name="offset" type="array" array_type="float" array_size="3"/>
Expand Down

0 comments on commit d25bb88

Please sign in to comment.