Skip to content

Commit

Permalink
merging from public
Browse files Browse the repository at this point in the history
  • Loading branch information
yidingjiang committed Jul 18, 2019
2 parents 8ed78b0 + 9fafde4 commit d1ee5a6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions assets/clevr_default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
<joint name='obj3_slidex' type='slide' pos='0 0 0' axis='1 0 0' range='-10.3213 10.3' damping='0.5'/>
</body>

<body pos='-0.4793 -0.1582 -0.2228' name='obj3'>
<body pos='-0.4793 -0.1582 -0.2228' name='obj4'>
<geom size='0.1021 0.1021 0.1021' conaffinity='1' contype='1' density='1' rgba='0.2 1 0 1' type='box'/>
<joint pos='0 0 0' damping='0.75' type='free' limited='false' name='obj3_slide'/>
</body>

<body pos='0.3660 0.4967 -0.2166' name='obj4'>
<body pos='0.3660 0.4967 -0.2166' name='obj0'>
<geom size='0.1083 0.0902 0.05' conaffinity='1' contype='1' density='1' rgba='0.2 1 0 1' type='box'/>
<joint pos='0 0 0' damping='0.75' type='free' limited='false' name='obj4_slide'/>
</body>
Expand Down

0 comments on commit d1ee5a6

Please sign in to comment.