Remove "global" option from [compiler/coordinate](https://mujoco.readthedocs.io/en/latest/XMLreference.html#compiler-coordinate) attribute.

Keeping this rarely-used setting complicates the compiler logic and is blocking future improvements. In order to convert older models which used this option, load and save them in MuJoCo 2.3.3 or older.

PiperOrigin-RevId: 521739137
Change-Id: If0cb40d5db4879a4db9318cc2be258a7923e6e85
This commit is contained in:
Yuval Tassa
2023-04-04 05:58:53 -07:00
committed by Copybara-Service
parent b327058641
commit 7cc42ecf2a
14 changed files with 705 additions and 806 deletions
+59 -63
View File
@@ -1,72 +1,68 @@
<mujoco model="test">
<compiler coordinate="global"/>
<mujoco model="tendon">
<compiler autolimits="true"/>
<default>
<geom rgba=".9 .7 .1 1" size="0.01"/>
<site type="sphere" rgba=".9 .9 .9 1" size="0.005"/>
<joint type="hinge" axis="0 1 0" limited="true" range="0 60" solimplimit="0.95 0.95 0.1"/>
</default>
<visual>
<headlight diffuse="0.7 0.7 0.7"/>
</visual>
<visual>
<headlight diffuse=".7 .7 .7"/>
</visual>
<default class="main">
<joint axis="0 0 1" solimplimit="0.95 0.95 0.1 0.5 2" range="0 60"/>
<geom size="0.01 0 0" rgba="0.9 0.7 0.1 1"/>
<site rgba="0.9 0.9 0.9 1"/>
</default>
<worldbody>
<body>
<geom type="cylinder" fromto="-0.03 0 0.2 -0.03 0 0.15"
size="0.03" rgba=".2 .2 .5 1" density="5000"/>
<joint type="slide" pos="-0.03 0 0.2" axis="0 0 1" limited="false"/>
<site name="s1" pos="-0.03 0 0.2"/>
<worldbody>
<body pos="-0.03 0 0.175">
<joint pos="0 0 0.025" limited="false" type="slide"/>
<geom size="0.03 0.025" type="cylinder" density="5000" rgba="0.2 0.2 0.5 1"/>
<site name="s1" pos="0 0 0.025"/>
</body>
<site name="s2" pos="-0.03 0 0.32"/>
<body pos="0.0242857 0 0.3" quat="1 1 1 1">
<joint pos="0 0 -0.0242857"/>
<geom size="0.01 0.05" pos="0 0 0.0257143" quat="0 -1 -1 0" type="capsule"/>
<geom name="g1" size="0.02 0.015" pos="0 0 -0.0242857" quat="0 -1 0 -1" type="cylinder" rgba=".3 .9 .3 .4"/>
<site name="s3" pos="0 0.02 -0.00428571" quat="0.5 -0.5 -0.5 -0.5"/>
<body pos="0 0 0.1">
<joint pos="0 0 -0.0242857"/>
<geom size="0.01 0.05" pos="0 0 0.0257143" quat="0 -1 -1 0" type="capsule"/>
<geom name="g2" size="0.02 0.015" pos="0 0 -0.0242857" quat="0 -1 0 -1" type="cylinder" rgba=".3 .9 .3 .4"/>
<site name="s4" pos="0 0.01 0.00571429" quat="0.5 -0.5 -0.5 -0.5"/>
<site name="s5" pos="0 0.02 0.0257143" quat="0.5 -0.5 -0.5 -0.5"/>
<site name="side2" pos="0 0.03 -0.0242857" quat="0.5 -0.5 -0.5 -0.5"/>
<body pos="0 0 0.09">
<joint pos="0 0 -0.0143443"/>
<geom size="0.01 0.035" pos="0 0 0.0206557" quat="0 1 1 0" type="capsule"/>
<geom name="g3" size="0.02 0.015" pos="0 0 -0.0143443" quat="0 1 0 1" type="cylinder" rgba=".3 .9 .3 .4"/>
<site name="s6" pos="0 0.01 0.0156557" quat="1 -1 -1 -1"/>
<site name="side3" pos="0 0.03 -0.0143443" quat="1 -1 -1 -1"/>
</body>
<site name="s2" pos="-0.03 0 0.32"/>
<body>
<geom type="capsule" fromto="0 0 0.3 0.1 0 0.3"/>
<geom name="g1" type="cylinder" fromto="0.0 0.015 0.3 0.0 -0.015 0.3"
size="0.02" rgba=".3 .9 .3 .4"/>
<joint pos="0 0 0.3"/>
<site name="s3" pos="0.02 0 0.32"/>
<body>
<geom type="capsule" fromto="0.1 0 0.3 0.2 0 0.3"/>
<geom name="g2" type="cylinder" fromto="0.1 0.015 0.3 0.1 -0.015 0.3"
size="0.02" rgba=".3 .9 .3 .4"/>
<joint pos="0.1 0 0.3"/>
<site name="s4" pos="0.13 0 0.31"/>
<site name="s5" pos="0.15 0 0.32"/>
<site name="side2" pos="0.1 0 0.33"/>
<body>
<geom type="capsule" fromto="0.2 0 0.3 0.27 0 0.3"/>
<geom name="g3" type="cylinder" fromto="0.2 0.015 0.3 0.2 -0.015 0.3"
size="0.02" rgba=".3 .9 .3 .4"/>
<joint pos="0.2 0 0.3"/>
<site name="s6" pos="0.23 0 0.31"/>
<site name="side3" pos="0.2 0 0.33"/>
</body>
</body>
</body>
</worldbody>
</body>
</worldbody>
<tendon>
<spatial width="0.002" rgba=".95 .3 .3 1" limited="true" range="0 0.33">
<site site="s1"/>
<site site="s2"/>
<geom geom="g1"/>
<site site="s3"/>
<tendon>
<spatial range="0 0.33" width="0.002" rgba=".95 .3 .3 1">
<site site="s1"/>
<site site="s2"/>
<geom geom="g1"/>
<site site="s3"/>
<pulley divisor="2"/>
<site site="s3"/>
<geom geom="g2" sidesite="side2"/>
<site site="s4"/>
<pulley divisor="2"/>
<site site="s3"/>
<geom geom="g2" sidesite="side2"/>
<site site="s4"/>
<pulley divisor="2"/>
<site site="s3"/>
<geom geom="g2" sidesite="side2"/>
<site site="s5"/>
<geom geom="g3" sidesite="side3"/>
<site site="s6"/>
</spatial>
</tendon>
<pulley divisor="2"/>
<site site="s3"/>
<geom geom="g2" sidesite="side2"/>
<site site="s5"/>
<geom geom="g3" sidesite="side3"/>
<site site="s6"/>
</spatial>
</tendon>
</mujoco>