Skip to content

Commit d25bb88

Browse files
quaglacopybara-github
authored andcommitted
Remove box, cylinder and ellipsoid composite types.
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
1 parent 8358f6d commit d25bb88

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

dm_control/mjcf/schema.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@
12101210
<element name="composite" repeated="true">
12111211
<attributes>
12121212
<attribute name="prefix" type="identifier"/>
1213-
<attribute name="type" type="keyword" valid_values="particle grid cable rope loop cloth box cylinder ellipsoid" required="true"/>
1213+
<attribute name="type" type="keyword" valid_values="particle grid cable rope loop cloth" required="true"/>
12141214
<attribute name="count" type="array" array_type="int" array_size="3"/>
12151215
<attribute name="spacing" type="float" required="false"/>
12161216
<attribute name="offset" type="array" array_type="float" array_size="3"/>
@@ -1604,7 +1604,7 @@
16041604
<element name="composite" repeated="true">
16051605
<attributes>
16061606
<attribute name="prefix" type="identifier"/>
1607-
<attribute name="type" type="keyword" valid_values="particle grid cable rope loop cloth box cylinder ellipsoid" required="true"/>
1607+
<attribute name="type" type="keyword" valid_values="particle grid cable rope loop cloth" required="true"/>
16081608
<attribute name="count" type="array" array_type="int" array_size="3"/>
16091609
<attribute name="spacing" type="float" required="false"/>
16101610
<attribute name="offset" type="array" array_type="float" array_size="3"/>

0 commit comments

Comments
 (0)