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

Merge gz-physics7 ➡️ main #624

Merged
merged 12 commits into from
Apr 19, 2024
Merged

Merge gz-physics7 ➡️ main #624

merged 12 commits into from
Apr 19, 2024

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port gz-physics7 ➡️ main

Branch comparison: main...gz-physics7

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

azeey and others added 11 commits March 14, 2024 23:43
Signed-off-by: Addisu Z. Taddese <[email protected]>
…ects with world joint (#611)

* ignore collision between static link and base link with world joint

Signed-off-by: Ian Chen <[email protected]>

* check link with zero dof

Signed-off-by: Ian Chen <[email protected]>

* update test

Signed-off-by: Ian Chen <[email protected]>

---------

Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
… for dartsim plugin on macOS (#613)" (#615)

This reverts commit d616379.

Signed-off-by: Steve Peters <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
@github-actions github-actions bot added the 🏛️ ionic Gazebo Ionic label Apr 17, 2024
@scpeters
Copy link
Member Author

there's a compiler warning at bullet/src/plugin.cc:59

/home/jenkins/workspace/gz_physics-ci-pr_any-jammy-amd64/gz-physics/bullet/src/plugin.cc: In member function ‘virtual gz::physics::Identity gz::physics::bullet::Plugin::InitiateEngine(std::size_t)’:
/home/jenkins/workspace/gz_physics-ci-pr_any-jammy-amd64/gz-physics/bullet/src/plugin.cc:59:16: warning: unused variable ‘id’ [-Wunused-variable]
   59 |     const auto id = this->GetNextEntity();
      |                ^~

@scpeters
Copy link
Member Author

there's a compiler warning at bullet/src/plugin.cc:59

/home/jenkins/workspace/gz_physics-ci-pr_any-jammy-amd64/gz-physics/bullet/src/plugin.cc: In member function ‘virtual gz::physics::Identity gz::physics::bullet::Plugin::InitiateEngine(std::size_t)’:
/home/jenkins/workspace/gz_physics-ci-pr_any-jammy-amd64/gz-physics/bullet/src/plugin.cc:59:16: warning: unused variable ‘id’ [-Wunused-variable]
   59 |     const auto id = this->GetNextEntity();
      |                ^~

I also noticed that dartsim and bullet call GetNextEntity() in InitiateEngine but bullet-featherstone and tpe do not

@scpeters
Copy link
Member Author

I also noticed that dartsim and bullet call GetNextEntity() in InitiateEngine but bullet-featherstone and tpe do not

I think this is fine; they all do it a little differently, but it's ok

@scpeters
Copy link
Member Author

there's a compiler warning at bullet/src/plugin.cc:59

/home/jenkins/workspace/gz_physics-ci-pr_any-jammy-amd64/gz-physics/bullet/src/plugin.cc: In member function ‘virtual gz::physics::Identity gz::physics::bullet::Plugin::InitiateEngine(std::size_t)’:
/home/jenkins/workspace/gz_physics-ci-pr_any-jammy-amd64/gz-physics/bullet/src/plugin.cc:59:16: warning: unused variable ‘id’ [-Wunused-variable]
   59 |     const auto id = this->GetNextEntity();
      |                ^~

compiler warning fixed in 1ad2a3e

Copy link
Contributor

@azeey azeey left a comment

Choose a reason for hiding this comment

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

I believe the new warning is due to gazebosim/gz-cmake#418

@scpeters scpeters merged commit dd18908 into main Apr 19, 2024
6 checks passed
@scpeters scpeters deleted the scpeters/merge_7_main branch April 19, 2024 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏛️ ionic Gazebo Ionic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants