Skip to content

Commit f3e1114

Browse files
louisgeverscopybara-github
authored andcommitted
dm_control: Import of refs/pull/467/head
PiperOrigin-RevId: 629749867 Change-Id: I4485cf17f8e10a9d0f6b30a03ce8fe1b13f117f8
1 parent abcccbb commit f3e1114

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

dm_control/mjcf/schema.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,10 +1103,10 @@
11031103
<attribute name="name" type="identifier"/>
11041104
<attribute name="type" type="keyword" valid_values="grid box cylinder ellipsoid mesh gmsh direct"/>
11051105
<attribute name="count" type="array" array_type="int" array_size="3"/>
1106-
<attribute name="spacing" type="array" array_type="int" array_size="3"/>
1106+
<attribute name="spacing" type="array" array_type="float" array_size="3"/>
11071107
<attribute name="scale" type="array" array_type="float" array_size="3"/>
11081108
<attribute name="radius" type="float"/>
1109-
<attribute name="rigid" type="int"/>
1109+
<attribute name="rigid" type="string" valid_values="true false"/>
11101110
<attribute name="mass" type="float"/>
11111111
<attribute name="inertiabox" type="float"/>
11121112
<attribute name="file" type="string"/>
@@ -1117,7 +1117,7 @@
11171117
<attribute name="rgba" type="array" array_type="float" array_size="4"/>
11181118
<attribute name="flatskin" type="int"/>
11191119
<attribute name="pos" type="array" array_type="float" array_size="3"/>
1120-
<attribute name="quat" type="array" array_type="int" array_size="4"/>
1120+
<attribute name="quat" type="array" array_type="float" array_size="4"/>
11211121
<attribute name="axisangle" type="array" array_type="float" array_size="4"/>
11221122
<attribute name="xyaxis" type="array" array_type="float" array_size="6"/>
11231123
<attribute name="zaxis" type="array" array_type="float" array_size="3"/>
@@ -1161,7 +1161,7 @@
11611161
<attribute name="solimp" type="array" array_type="float" array_size="5"/>
11621162
<attribute name="margin" type="float"/>
11631163
<attribute name="gap" type="float"/>
1164-
<attribute name="internal" type="int"/>
1164+
<attribute name="internal" type="string" valid_values="true false"/>
11651165
<attribute name="selfcollide" type="string" valid_values="none narrow bvh sap auto"/>
11661166
<attribute name="activelayers" type="int"/>
11671167
</attributes>
@@ -1491,10 +1491,10 @@
14911491
<attribute name="name" type="identifier"/>
14921492
<attribute name="type" type="keyword" valid_values="grid box cylinder ellipsoid mesh gmsh direct"/>
14931493
<attribute name="count" type="array" array_type="int" array_size="3"/>
1494-
<attribute name="spacing" type="array" array_type="int" array_size="3"/>
1494+
<attribute name="spacing" type="array" array_type="float" array_size="3"/>
14951495
<attribute name="scale" type="array" array_type="float" array_size="3"/>
14961496
<attribute name="radius" type="float"/>
1497-
<attribute name="rigid" type="int"/>
1497+
<attribute name="rigid" type="string" valid_values="true false"/>
14981498
<attribute name="mass" type="float"/>
14991499
<attribute name="inertiabox" type="float"/>
15001500
<attribute name="file" type="string"/>
@@ -1505,11 +1505,12 @@
15051505
<attribute name="rgba" type="array" array_type="float" array_size="4"/>
15061506
<attribute name="flatskin" type="int"/>
15071507
<attribute name="pos" type="array" array_type="float" array_size="3"/>
1508-
<attribute name="quat" type="array" array_type="int" array_size="4"/>
1508+
<attribute name="quat" type="array" array_type="float" array_size="4"/>
15091509
<attribute name="axisangle" type="array" array_type="float" array_size="4"/>
15101510
<attribute name="xyaxis" type="array" array_type="float" array_size="6"/>
15111511
<attribute name="zaxis" type="array" array_type="float" array_size="3"/>
15121512
<attribute name="euler" type="array" array_type="float" array_size="3"/>
1513+
<attribute name="dim" type="int" required="true"/>
15131514
</attributes>
15141515
<children>
15151516
<element name="plugin" repeated="true" namespace="flexcomp">
@@ -1548,7 +1549,7 @@
15481549
<attribute name="solimp" type="array" array_type="float" array_size="5"/>
15491550
<attribute name="margin" type="float"/>
15501551
<attribute name="gap" type="float"/>
1551-
<attribute name="internal" type="int"/>
1552+
<attribute name="internal" type="string" valid_values="true false"/>
15521553
<attribute name="selfcollide" type="string" valid_values="none narrow bvh sap auto"/>
15531554
<attribute name="activelayers" type="int"/>
15541555
</attributes>

0 commit comments

Comments
 (0)