Skip to content

Commit 7b10246

Browse files
yuvaltassacopybara-github
authored andcommitted
Update mjcf/schema.xml
Fixes #460 PiperOrigin-RevId: 623475339 Change-Id: I65a41d55aa61c7a96c48dbd836a73a03aeff9bca
1 parent b72eaa4 commit 7b10246

1 file changed

Lines changed: 13 additions & 12 deletions

File tree

dm_control/mjcf/schema.xml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,7 @@
11011101
<attribute name="type" type="keyword" valid_values="grid box cylinder ellipsoid mesh gmsh direct"/>
11021102
<attribute name="count" type="array" array_type="int" array_size="3"/>
11031103
<attribute name="spacing" type="array" array_type="int" array_size="3"/>
1104-
<attribute name="scale" type="array" array_type="int" array_size="3"/>
1104+
<attribute name="scale" type="array" array_type="float" array_size="3"/>
11051105
<attribute name="radius" type="float"/>
11061106
<attribute name="rigid" type="int"/>
11071107
<attribute name="mass" type="float"/>
@@ -1111,14 +1111,15 @@
11111111
<attribute name="element" type="string"/>
11121112
<attribute name="texcoord" type="string"/>
11131113
<attribute name="material" type="string"/>
1114-
<attribute name="rgba" type="array" array_type="float" array_size="2"/>
1114+
<attribute name="rgba" type="array" array_type="float" array_size="4"/>
11151115
<attribute name="flatskin" type="int"/>
1116-
<attribute name="pos" type="array" array_type="int" array_size="3"/>
1116+
<attribute name="pos" type="array" array_type="float" array_size="3"/>
11171117
<attribute name="quat" type="array" array_type="int" array_size="4"/>
11181118
<attribute name="axisangle" type="array" array_type="float" array_size="4"/>
11191119
<attribute name="xyaxis" type="array" array_type="float" array_size="6"/>
11201120
<attribute name="zaxis" type="array" array_type="float" array_size="3"/>
11211121
<attribute name="euler" type="array" array_type="float" array_size="3"/>
1122+
<attribute name="dim" type="int" required="true"/>
11221123
</attributes>
11231124
<children>
11241125
<element name="plugin" repeated="true" namespace="flexcomp">
@@ -1138,7 +1139,7 @@
11381139
</element>
11391140
<element name="edge" repeated="true">
11401141
<attributes>
1141-
<attribute name="equality" type="int"/>
1142+
<attribute name="equality" type="string" valid_values="true false"/>
11421143
<attribute name="solref" type="array" array_type="float" array_size="2"/>
11431144
<attribute name="solimp" type="array" array_type="float" array_size="5"/>
11441145
<attribute name="stiffness" type="float"/>
@@ -1158,7 +1159,7 @@
11581159
<attribute name="margin" type="float"/>
11591160
<attribute name="gap" type="float"/>
11601161
<attribute name="internal" type="int"/>
1161-
<attribute name="selfcollide" type="int"/>
1162+
<attribute name="selfcollide" type="string" valid_values="none narrow bvh sap auto"/>
11621163
<attribute name="activelayers" type="int"/>
11631164
</attributes>
11641165
</element>
@@ -1486,7 +1487,7 @@
14861487
<attribute name="type" type="keyword" valid_values="grid box cylinder ellipsoid mesh gmsh direct"/>
14871488
<attribute name="count" type="array" array_type="int" array_size="3"/>
14881489
<attribute name="spacing" type="array" array_type="int" array_size="3"/>
1489-
<attribute name="scale" type="array" array_type="int" array_size="3"/>
1490+
<attribute name="scale" type="array" array_type="float" array_size="3"/>
14901491
<attribute name="radius" type="float"/>
14911492
<attribute name="rigid" type="int"/>
14921493
<attribute name="mass" type="float"/>
@@ -1496,9 +1497,9 @@
14961497
<attribute name="element" type="string"/>
14971498
<attribute name="texcoord" type="string"/>
14981499
<attribute name="material" type="string"/>
1499-
<attribute name="rgba" type="array" array_type="float" array_size="2"/>
1500+
<attribute name="rgba" type="array" array_type="float" array_size="4"/>
15001501
<attribute name="flatskin" type="int"/>
1501-
<attribute name="pos" type="array" array_type="int" array_size="3"/>
1502+
<attribute name="pos" type="array" array_type="float" array_size="3"/>
15021503
<attribute name="quat" type="array" array_type="int" array_size="4"/>
15031504
<attribute name="axisangle" type="array" array_type="float" array_size="4"/>
15041505
<attribute name="xyaxis" type="array" array_type="float" array_size="6"/>
@@ -1523,7 +1524,7 @@
15231524
</element>
15241525
<element name="edge" repeated="true">
15251526
<attributes>
1526-
<attribute name="equality" type="int"/>
1527+
<attribute name="equality" type="string" valid_values="true false"/>
15271528
<attribute name="solref" type="array" array_type="float" array_size="2"/>
15281529
<attribute name="solimp" type="array" array_type="float" array_size="5"/>
15291530
<attribute name="stiffness" type="float"/>
@@ -1543,7 +1544,7 @@
15431544
<attribute name="margin" type="float"/>
15441545
<attribute name="gap" type="float"/>
15451546
<attribute name="internal" type="int"/>
1546-
<attribute name="selfcollide" type="int"/>
1547+
<attribute name="selfcollide" type="string" valid_values="none narrow bvh sap auto"/>
15471548
<attribute name="activelayers" type="int"/>
15481549
</attributes>
15491550
</element>
@@ -1690,7 +1691,7 @@
16901691
<attribute name="dim" type="reference" required="true" reference_namespace="geom"/>
16911692
<attribute name="radius" type="reference" required="true" reference_namespace="geom"/>
16921693
<attribute name="material" type="int"/>
1693-
<attribute name="rgba" type="array" array_type="float" array_size="5"/>
1694+
<attribute name="rgba" type="array" array_type="float" array_size="4"/>
16941695
<attribute name="flatskin" type="array" array_type="float" array_size="2"/>
16951696
<attribute name="body" type="array" array_type="float" array_size="2"/>
16961697
<attribute name="vertex" type="array" array_type="float" array_size="5"/>
@@ -1717,7 +1718,7 @@
17171718
<attribute name="margin" type="float"/>
17181719
<attribute name="gap" type="float"/>
17191720
<attribute name="internal" type="int"/>
1720-
<attribute name="selfcollide" type="int"/>
1721+
<attribute name="selfcollide" type="string" valid_values="none narrow bvh sap auto"/>
17211722
<attribute name="activelayers" type="int"/>
17221723
</attributes>
17231724
</element>

0 commit comments

Comments
 (0)