Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Add stairs terrain #797

Merged
merged 8 commits into from
May 22, 2024
Merged

[core] Add stairs terrain #797

merged 8 commits into from
May 22, 2024

Conversation

mwulfman
Copy link
Contributor

@mwulfman mwulfman commented May 17, 2024

I am proposing to add a terrain with alternating up and down staircases illustrated on the screenshot below.

stairs_ground

@mwulfman mwulfman changed the title [core] Add stairs terrain [core] WIP: Add stairs terrain May 17, 2024
@duburcqa
Copy link
Owner

You can move it in core/utilities/geometry.h.

core/src/utilities/random.cc Outdated Show resolved Hide resolved
core/src/utilities/random.cc Outdated Show resolved Hide resolved
core/src/utilities/random.cc Outdated Show resolved Hide resolved
core/src/utilities/random.cc Outdated Show resolved Hide resolved
core/src/utilities/random.cc Outdated Show resolved Hide resolved
python/jiminy_pywrap/src/generators.cc Outdated Show resolved Hide resolved
core/include/jiminy/core/utilities/random.h Outdated Show resolved Hide resolved
@duburcqa

This comment was marked as outdated.

@mwulfman

This comment was marked as outdated.

@duburcqa

This comment was marked as outdated.

@mwulfman
Copy link
Contributor Author

Ok perfect. I've taken into account the review, added documentation and ASCII art. Waiting for potential new remarks.

Copy link
Owner

@duburcqa duburcqa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job ! Almost there !

core/src/utilities/geometry.cc Outdated Show resolved Hide resolved
core/src/utilities/geometry.cc Outdated Show resolved Hide resolved
core/src/utilities/geometry.cc Outdated Show resolved Hide resolved
@duburcqa duburcqa enabled auto-merge (squash) May 21, 2024 16:22
@duburcqa duburcqa changed the title [core] WIP: Add stairs terrain [core] Add stairs terrain May 21, 2024
@duburcqa
Copy link
Owner

CI is failing. You must replace "playwright!=1.43" by "playwright<1.43" in setup.py.

auto-merge was automatically disabled May 21, 2024 18:55

Head branch was pushed to by a user without write access

@mwulfman
Copy link
Contributor Author

There's a Python linter issue now.

@duburcqa
Copy link
Owner

Yes. No big deal. Merging.

@duburcqa duburcqa merged commit 87352fe into duburcqa:dev May 22, 2024
30 of 32 checks passed
@duburcqa duburcqa mentioned this pull request May 24, 2024
duburcqa added a commit that referenced this pull request May 24, 2024
* [core] Make 'jiminy::Model' and 'jiminy::Robot' copyable. (#791)
* [core] Add stairs terrain (#797)
* [core] Define position, velocity and effort limits at motor level. (#798)
* [core] Implement velocity limits at motor-level. (#798)
* [core] Allow direct access to all motors / sensors attached to a robot. (#798)
* [core] Remove spring-damper position bounds dynamics to always use constraints. (#798)
* [core] Remove damper velocity bounds dynamics. (#798)
* [core] Define motor armature option at motor-side. (#798)
* [core] Remove dedicated robot attributes for position, velocity and effort limits. (#798)
* [core] Remove inefficient motor / sensor convenience helpers of 'Robot'. (#798)
* [core] Log total joint effort instead of confusing motor effort on joint side. (#798)
* [core] Enable attaching encoders either on motor or joint side. (#798)
* [core] Mechanical reduction is now fully supported. (#798)
* [core] Fix adding flexibility frame on root joint of fixed-base robot. (#798)
* [core] Move 'enable(Velocity|Effort)Limit' options from AbstractMotor to SimpleMotor. (#798)
* [core] Add velocity-torque slope when approaching maximum torque. (#798)
* [core] Keep track of motor efforts both on motor and joint sides. (#801)
* [core] Effort sensors now measure motor effort before transmission. (#801)
* [core|python] Various cleanup. (#790)
* [python] Introduce first-class trajectory object. (#790)
* [python/log] Fix trajectory and sensor data extraction and replay from log. (#800)
* [python/plot] Get around tabbed figure hanging for 'matplotlib>=3.8'. (#795)
* [python/viewer] Add missing documentation. (#790)
* [python/replay] Make specifying 'robot' optional in most helpers. (#800)
* [gym/common] Add generic stacked quantity wrapper. (#783)
* [gym/common] Do NOT pass 'truncated' argument to 'compute_reward'. (#783)
* [gym/common] More generic quantity batching. (#783)
* [gym/common] Pass 'info' in argument of 'has_terminated' for consistency. (#783)
* [gym/common] Remove BaseJiminyEnv 'enforce_bounded_spaces' option by lack of use-case. (#783)
* [gym/common] Add masked quantity. (#784)
* [gym/common] Add average odometry velocity quantity. (#784)
* [gym/common] Introduce reward objects. (#784)
* [gym/common] Add locomotion rewards. (#784)
* [gym/common] Add base reward mixture class to ease pipeline instantiation. (#786)
* [gym/common] Add basic survive reward. (#786)
* [gym/common] Increase timeout ratio from 10 to 15 to avoid Mac OS CI failure. (#786)
* [gym/common] Add compose reward pipeline wrapper. (#787)
* [gym/common] Support specifying reward in pipeline config. (#787)
* [gym/common] Add simulation vs trajectory quantity evaluation mode. (#791)
* [gym/common] Expose trajectory database in quantity manager. (#792)
* [gym/common] Expose interpolate mode for trajectories. (#792)
* [gym/common] Add support of trajectory reference in reward computation. (#792)
* [gym/common] Enable specifying reference trajectories in pipeline config. (#792)
* [gym/common] Get around some memory alignment issue with Boost < 1.78. (#794)
* [gym/zoo] Update Atlas learning environment. (#800)
* [gym/zoo] Update all robotic environments so that random actions do not trigger truncation. (#801)
* [gym/rllib] Add symmetry surrogate loss in rllib custom ppo (#780)
* [gym/rllib] Fix checkpoint save location. (#788)
* [gym/rllib] Update checkpoint_dir so it is dependant on iteration number (#789)
* [misc] Update install instructions on windows. (#787)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants