Skip to content

feat: integrate collision detection feature into robot model#163

Merged
yrh012 merged 57 commits into
developfrom
feat/collision-detection-robot
Apr 3, 2024
Merged

feat: integrate collision detection feature into robot model#163
yrh012 merged 57 commits into
developfrom
feat/collision-detection-robot

Conversation

@yrh012

@yrh012 yrh012 commented Mar 13, 2024

Copy link
Copy Markdown

Description

This PR solves the issue by implementing 3 new attributes to the robot::Model class, namely check_collision and get_number_of_collision_pairs and is_geometry_model_initialized. These new attributes along with the default new parameter in the constructor allows for self-collision checking based on the URDF and geometries of the robot.

Accordingly by providing paths to the URDF and it's corresponding collision meshes when initializing/creating robot::Model class, a user can allow for collision checking given a certain joint positions configuration.

One possible improvement yet to consider is the paths of the meshes inside the URDFs used in the test.

Review guidelines

Estimated Time of Review: 15 minutes

Checklist before merging:

  • Confirm that the relevant changelog(s) are up-to-date in case of any user-facing changes

@yrh012 yrh012 self-assigned this Mar 13, 2024
@github-actions

github-actions Bot commented Mar 13, 2024

Copy link
Copy Markdown

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@yrh012 yrh012 linked an issue Mar 13, 2024 that may be closed by this pull request
@yrh012

yrh012 commented Mar 13, 2024

Copy link
Copy Markdown
Author

I have read and understood the Contributor License Agreement and hereby sign it

@domire8

domire8 commented Mar 13, 2024

Copy link
Copy Markdown
Member

recheck

1 similar comment
@yrh012

yrh012 commented Mar 13, 2024

Copy link
Copy Markdown
Author

recheck

github-actions Bot added a commit that referenced this pull request Mar 13, 2024
Comment thread source/robot_model/include/robot_model/Model.hpp Outdated
Comment thread source/robot_model/include/robot_model/Model.hpp Outdated
Comment thread source/robot_model/include/robot_model/Model.hpp Outdated
Comment thread source/robot_model/include/robot_model/Model.hpp Outdated
Comment thread source/robot_model/src/Model.cpp Outdated
Comment thread source/robot_model/src/Model.cpp Outdated
Comment thread source/robot_model/test/fixtures/ur5e.urdf Outdated
Comment thread source/robot_model/test/tests/test_collisions.cpp Outdated
Comment thread source/robot_model/include/robot_model/Model.hpp
yrh012 and others added 3 commits March 13, 2024 17:12
Co-authored-by: Dominic Reber <71256590+domire8@users.noreply.github.com>
…nology/control-libraries into feat/collision-detection-robot

@domire8 domire8 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks better, would like to leave that here for more reviews

Comment thread python/source/robot_model/bind_model.cpp Outdated
Comment thread source/robot_model/include/robot_model/Model.hpp Outdated

@domire8 domire8 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hold on a sec, how do we use these new constructors now?
The existing one is unchanged, clear to me. The new one has an std::optional function, so what if you want to load the collision but you already know that the URDF has correct absolute paths? Do you do provide a nullptr to the constructor?

Comment thread source/robot_model/src/Model.cpp
Comment thread source/robot_model/src/Model.cpp
yrh012 and others added 3 commits March 27, 2024 08:38
Co-authored-by: Enrico Eberhard <32450951+eeberhard@users.noreply.github.com>

@domire8 domire8 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Almost good to go, thanks for the patience here!

Comment thread source/robot_model/include/robot_model/Model.hpp Outdated
Comment thread source/robot_model/src/Model.cpp Outdated
Comment thread source/robot_model/src/Model.cpp Outdated
Comment thread source/robot_model/src/Model.cpp Outdated
Comment thread source/robot_model/src/Model.cpp Outdated
Comment thread source/robot_model/src/Model.cpp
Comment thread python/source/robot_model/bind_model.cpp Outdated
yrh012 and others added 4 commits March 28, 2024 10:00
Co-authored-by: Dominic Reber <71256590+domire8@users.noreply.github.com>
@eeberhard eeberhard changed the title feat: integrating collision detection feature into robot model feat: integrate collision detection feature into robot model Mar 28, 2024
Comment thread python/source/robot_model/bind_model.cpp Outdated
yrh012 and others added 3 commits March 28, 2024 15:19
domire8
domire8 previously approved these changes Mar 28, 2024

@domire8 domire8 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Great piece of work

@domire8 domire8 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

You need to set version 7.3.10 manually now

./update_version --version 7.3.10 --commit

Comment thread python/setup.py Outdated
Co-authored-by: Dominic Reber <71256590+domire8@users.noreply.github.com>
@domire8

domire8 commented Apr 2, 2024

Copy link
Copy Markdown
Member

You need to set version 7.3.10 manually now

./update_version --version 7.3.10 --commit

This still

@yrh012

yrh012 commented Apr 2, 2024

Copy link
Copy Markdown
Author

You need to set version 7.3.10 manually now

./update_version --version 7.3.10 --commit

This still

done!

@eeberhard eeberhard left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Amazing work and thanks for the patience!

@yrh012 yrh012 merged commit 852f164 into develop Apr 3, 2024
@yrh012 yrh012 deleted the feat/collision-detection-robot branch April 3, 2024 09:05
@github-actions github-actions Bot locked and limited conversation to collaborators Apr 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Integrate Collision Detection into robot_model::Model Class

4 participants