Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
cf153f6
Add Hopper and Walker2D models for v5
Kallinteris-Andreas May 2, 2023
bc92449
Merge branch 'Farama-Foundation:main' into main
Kallinteris-Andreas May 9, 2023
0cbdd72
Delete hopper_v5.xml
Kallinteris-Andreas May 9, 2023
db3734e
Delete walker2d_v5.xml
Kallinteris-Andreas May 9, 2023
a2d2e64
General MuJoCo Env Documention Cleanup
Kallinteris-Andreas May 9, 2023
f58bb5e
typofix
Kallinteris-Andreas May 9, 2023
7a4bc32
typo fix
Kallinteris-Andreas May 9, 2023
2418631
update following @pseudo-rnd-thoughts reviews
Kallinteris-Andreas May 9, 2023
3b9080b
Merge branch 'Farama-Foundation:main' into main
Kallinteris-Andreas Jun 5, 2023
77bcb8b
Merge branch 'Farama-Foundation:main' into main
Kallinteris-Andreas Jun 16, 2023
7639d18
refactor `tests/env/test_mojoco.py` ->
Kallinteris-Andreas Jun 16, 2023
8eb1b11
Merge branch 'Farama-Foundation:main' into main
Kallinteris-Andreas Jun 27, 2023
ab931b7
add files
Kallinteris-Andreas Jun 27, 2023
c3077ef
`pre-commit`
Kallinteris-Andreas Jun 27, 2023
52fbae6
remove old v4 doc
Kallinteris-Andreas Jun 27, 2023
25fe2c3
fix `test_make_erros()`
Kallinteris-Andreas Jun 27, 2023
43c25c6
cleanup tests
Kallinteris-Andreas Jun 27, 2023
2602a04
ant cleanup
Kallinteris-Andreas Jun 27, 2023
79c8fa9
fix mjc-py error
Kallinteris-Andreas Jun 28, 2023
a8af4f5
update tests
Kallinteris-Andreas Jun 29, 2023
edd839a
Merge branch 'Farama-Foundation:main' into mujoco-v5
Kallinteris-Andreas Jun 30, 2023
071d3a1
cleanup
Kallinteris-Andreas Jun 30, 2023
3b90221
remove old file
Kallinteris-Andreas Jun 30, 2023
13bc8ad
Merge branch 'Farama-Foundation:main' into mujoco-v5
Kallinteris-Andreas Jul 1, 2023
ee571a6
use `env_match.py`
Kallinteris-Andreas Jul 1, 2023
676bf0f
doc typo fixes
Kallinteris-Andreas Jul 1, 2023
4088d6c
typo
Kallinteris-Andreas Jul 1, 2023
8ce48de
typo
Kallinteris-Andreas Jul 1, 2023
6f8f012
typo
Kallinteris-Andreas Jul 1, 2023
215f0d3
doc
Kallinteris-Andreas Jul 1, 2023
8016f40
typo
Kallinteris-Andreas Jul 1, 2023
640eeca
doc
Kallinteris-Andreas Jul 1, 2023
26672f9
cleanup
Kallinteris-Andreas Jul 1, 2023
33d62fa
update based on @pseudo-rnd-thoughts review
Kallinteris-Andreas Jul 3, 2023
4184838
typo fix
Kallinteris-Andreas Jul 3, 2023
c4b3d4a
cleanup tests
Kallinteris-Andreas Jul 3, 2023
d6c1e11
Merge branch 'Farama-Foundation:main' into mujoco-v5
Kallinteris-Andreas Jul 3, 2023
6edadfa
black
Kallinteris-Andreas Jul 4, 2023
f9a3533
Merge branch 'Farama-Foundation:main' into mujoco-v5
Kallinteris-Andreas Jul 6, 2023
4defe7a
fix typing issues
Kallinteris-Andreas Jul 7, 2023
925ffc7
fix (most) `pyright.TypeIssues`
Kallinteris-Andreas Jul 9, 2023
fd3a4fc
`pre-commit`
Kallinteris-Andreas Jul 9, 2023
0192681
cleanup
Kallinteris-Andreas Jul 9, 2023
bd719e7
`hopper` revert change to model
Kallinteris-Andreas Jul 9, 2023
5b6efe8
add `test_dt`
Kallinteris-Andreas Jul 10, 2023
0a74e96
cleanup
Kallinteris-Andreas Jul 10, 2023
b15031c
Merge branch 'Farama-Foundation:main' into mujoco-v5
Kallinteris-Andreas Jul 10, 2023
c103054
Add version to CITATION
Kallinteris-Andreas Jul 10, 2023
021ce51
undo
Kallinteris-Andreas Jul 10, 2023
2dff912
undo
Kallinteris-Andreas Jul 10, 2023
0466100
undo
Kallinteris-Andreas Jul 10, 2023
7e8a4d6
fix test_dt typing
Kallinteris-Andreas Jul 10, 2023
ee66207
undo mujoco env changes
Kallinteris-Andreas Jul 10, 2023
525af00
Merge branch 'Farama-Foundation:main' into mujoco-v5
Kallinteris-Andreas Jul 10, 2023
a5da62b
a
Kallinteris-Andreas Jul 10, 2023
f6fba95
`pre-commit`
Kallinteris-Andreas Jul 10, 2023
eaf4664
@pseudo-rnd-thoughts 2nd review comments
Kallinteris-Andreas Jul 14, 2023
2bb1687
add `test_reset_noise_scale`
Kallinteris-Andreas Jul 14, 2023
0c2c45b
cleanup `humanoidstandup`
Kallinteris-Andreas Jul 14, 2023
cc65b42
add changelog in "Version History"
Kallinteris-Andreas Jul 15, 2023
ff65f7d
typo fix
Kallinteris-Andreas Jul 17, 2023
148d662
Merge branch 'Farama-Foundation:main' into mujoco-v5
Kallinteris-Andreas Jul 17, 2023
3bd9263
`ant` fix root obs name in DOCs
Kallinteris-Andreas Jul 18, 2023
f559bb3
@pseudo-rnd-thoughts 3rd review comments resolve
Kallinteris-Andreas Jul 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add Hopper and Walker2D models for v5
  • Loading branch information
Kallinteris-Andreas authored May 2, 2023
commit cf153f66ad14ac83d1ae997e9dc12acf2d3c618a
53 changes: 53 additions & 0 deletions gymnasium/envs/mujoco/assets/hopper_v5.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<!--
Hopper model for `Hopper-v5`, based on openai/Hopper
modified by @kallinteris-Andreas
- To not require `coordinate="global"`
-->
<mujoco model="hopper">
<compiler angle="degree" coordinate="local" inertiafromgeom="true"/>
<default>
<joint armature="1" damping="1" limited="true"/>
<geom conaffinity="1" condim="1" contype="1" margin="0.001" material="geom" rgba="0.8 0.6 .4 1" solimp=".8 .8 .01" solref=".02 1"/>
<motor ctrllimited="true" ctrlrange="-.4 .4"/>
</default>
<option integrator="RK4" timestep="0.002"/>
<visual>
<map znear="0.02"/>
</visual>
<worldbody>
<light cutoff="100" diffuse="1 1 1" dir="-0 0 -1.3" directional="true" exponent="1" pos="0 0 1.3" specular=".1 .1 .1"/>
<geom conaffinity="1" condim="3" name="floor" pos="0 0 0" rgba="0.8 0.9 0.8 1" size="20 20 .125" type="plane" material="MatPlane"/>
<body name="torso" pos="0 0 1.25">
<camera name="track" mode="trackcom" pos="0 -3 -0.25"/>
<joint armature="0" axis="1 0 0" damping="0" limited="false" name="rootx" pos="0 0 -1.25" stiffness="0" type="slide"/>
<joint armature="0" axis="0 0 1" damping="0" limited="false" name="rootz" pos="0 0 -1.25" ref="1.25" stiffness="0" type="slide"/>
<joint armature="0" axis="0 1 0" damping="0" limited="false" name="rooty" pos="0 0 0" stiffness="0" type="hinge"/>
<geom friction="0.9" name="torso_geom" size="0.05 0.2" type="capsule"/>
<body name="thigh" pos="0 0 -0.2">
<joint axis="0 -1 0" name="thigh_joint" pos="0 0 0" range="-150 0" type="hinge"/>
<geom friction="0.9" name="thigh_geom" size="0.05 0.225" pos="0 0 -0.225" type="capsule"/>
<body name="leg" pos="0 0 -0.7">
<joint axis="0 -1 0" name="leg_joint" pos="0 0 0.25" range="-150 0" type="hinge"/>
<geom friction="0.9" name="leg_geom" size="0.04 0.25" type="capsule"/>
<body name="foot" pos="0.13 0 -0.35">
<joint axis="0 -1 0" name="foot_joint" pos="-0.13 0 0.1" range="-45 45" type="hinge"/>
<geom friction="2.0" name="foot_geom" size="0.06 0.195" pos="-0.065 0 0.1" quat="0.707107 0 -0.707107 0" type="capsule"/>
</body>
</body>
</body>
</body>
</worldbody>
<actuator>
<motor ctrllimited="true" ctrlrange="-1.0 1.0" gear="200.0" joint="thigh_joint"/>
<motor ctrllimited="true" ctrlrange="-1.0 1.0" gear="200.0" joint="leg_joint"/>
<motor ctrllimited="true" ctrlrange="-1.0 1.0" gear="200.0" joint="foot_joint"/>
</actuator>
<asset>
<texture type="skybox" builtin="gradient" rgb1=".4 .5 .6" rgb2="0 0 0"
width="100" height="600"/>
<texture builtin="flat" height="762" mark="cross" markrgb="1 1 1" name="texgeom" rgb1="0.8 0.6 0.4" rgb2="0.8 0.6 0.4" type="cube" width="127"/>
<texture builtin="checker" height="100" name="texplane" rgb1="0 0 0" rgb2="0.8 0.8 0.8" type="2d" width="100"/>
<material name="MatPlane" reflectance="0.5" shininess="1" specular="1" texrepeat="60 60" texture="texplane"/>
<material name="geom" texture="texgeom" texuniform="true"/>
</asset>
</mujoco>
68 changes: 68 additions & 0 deletions gymnasium/envs/mujoco/assets/walker2d_v5.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<!--
Walker2D model for `Walker2d-v5`, based on openai/gym/Walker2d
modified by @kallinteris-Andreas
- To not require `coordinate="global"`
- Set feet friction to 2.0
-->
<mujoco model="walker2d">
<compiler angle="degree" coordinate="local" inertiafromgeom="true"/>
<default>
<joint armature="0.01" damping=".1" limited="true"/>
<geom conaffinity="0" condim="3" contype="1" density="1000" friction=".7 .1 .1" rgba="0.8 0.6 .4 1"/>
</default>
<option integrator="RK4" timestep="0.002"/>
<worldbody>
<light cutoff="100" diffuse="1 1 1" dir="-0 0 -1.3" directional="true" exponent="1" pos="0 0 1.3" specular=".1 .1 .1"/>
<geom conaffinity="1" condim="3" name="floor" pos="0 0 0" rgba="0.8 0.9 0.8 1" size="40 40 40" type="plane" material="MatPlane"/>
<body name="torso" pos="0 0 1.25">
<camera name="track" mode="trackcom" pos="0 -3 -0.25"/>
<joint armature="0" axis="1 0 0" damping="0" limited="false" name="rootx" pos="0 0 -1.25" stiffness="0" type="slide"/>
<joint armature="0" axis="0 0 1" damping="0" limited="false" name="rootz" pos="0 0 -1.25" ref="1.25" stiffness="0" type="slide"/>
<joint armature="0" axis="0 1 0" damping="0" limited="false" name="rooty" pos="0 0 0" stiffness="0" type="hinge"/>
<geom friction="0.9" name="torso_geom" size="0.05 0.2" type="capsule"/>
<body name="thigh" pos="0 0 -0.2">
<joint axis="0 -1 0" name="thigh_joint" pos="0 0 0" range="-150 0" type="hinge"/>
<geom friction="0.9" name="thigh_geom" size="0.05 0.225" pos="0 0 -0.225" type="capsule"/>
<body name="leg" pos="0 0 -0.7">
<joint axis="0 -1 0" name="leg_joint" pos="0 0 0.25" range="-150 0" type="hinge"/>
<geom friction="0.9" name="leg_geom" size="0.04 0.25" type="capsule"/>
<body name="foot" pos="0.2 0 -0.35">
<joint axis="0 -1 0" name="foot_joint" pos="-0.2 0 0.1" range="-45 45" type="hinge"/>
<geom friction="2.0" name="foot_geom" size="0.06 0.1" pos="-0.1 0 0.1" quat="0.707107 0 -0.707107 0" type="capsule"/>
</body>
</body>
</body>
<!-- copied and then replace thigh->thigh_left, leg->leg_left, foot->foot_right -->
<body name="thigh_left" pos="0 0 -0.2">
<joint axis="0 -1 0" name="thigh_left_joint" pos="0 0 0" range="-150 0" type="hinge"/>
<geom friction="0.9" name="thigh_left_geom" rgba=".7 .3 .6 1" size="0.05 0.225" pos="0 0 -0.225" type="capsule"/>
<body name="leg_left" pos="0 0 -0.7">
<joint axis="0 -1 0" name="leg_left_joint" pos="0 0 0.25" range="-150 0" type="hinge"/>
<geom friction="0.9" name="leg_left_geom" rgba=".7 .3 .6 1" size="0.04 0.25" type="capsule" />
<body name="foot_left" pos="0.2 0 -0.35">
<joint axis="0 -1 0" name="foot_left_joint" pos="-0.2 0 0.1" range="-45 45" type="hinge"/>
<geom friction="2.0" name="foot_left_geom" rgba=".7 .3 .6 1" size="0.06 0.1" pos="-0.1 0 0.1" quat="0.707107 0 -0.707107 0" type="capsule"/>
</body>
</body>
</body>
</body>
</worldbody>
<actuator>
<!-- <motor joint="torso_joint" ctrlrange="-100.0 100.0" isctrllimited="true"/>-->
<motor ctrllimited="true" ctrlrange="-1.0 1.0" gear="100" joint="thigh_joint"/>
<motor ctrllimited="true" ctrlrange="-1.0 1.0" gear="100" joint="leg_joint"/>
<motor ctrllimited="true" ctrlrange="-1.0 1.0" gear="100" joint="foot_joint"/>
<motor ctrllimited="true" ctrlrange="-1.0 1.0" gear="100" joint="thigh_left_joint"/>
<motor ctrllimited="true" ctrlrange="-1.0 1.0" gear="100" joint="leg_left_joint"/>
<motor ctrllimited="true" ctrlrange="-1.0 1.0" gear="100" joint="foot_left_joint"/>
<!-- <motor joint="finger2_rot" ctrlrange="-20.0 20.0" isctrllimited="true"/>-->
</actuator>
<asset>
<texture type="skybox" builtin="gradient" rgb1=".4 .5 .6" rgb2="0 0 0"
width="100" height="100"/>
<texture builtin="flat" height="1278" mark="cross" markrgb="1 1 1" name="texgeom" random="0.01" rgb1="0.8 0.6 0.4" rgb2="0.8 0.6 0.4" type="cube" width="127"/>
<texture builtin="checker" height="100" name="texplane" rgb1="0 0 0" rgb2="0.8 0.8 0.8" type="2d" width="100"/>
<material name="MatPlane" reflectance="0.5" shininess="1" specular="1" texrepeat="60 60" texture="texplane"/>
<material name="geom" texture="texgeom" texuniform="true"/>
</asset>
</mujoco>