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 6 ➡️ 7 #592

Merged
merged 14 commits into from
Jan 26, 2024
Merged

Merge 6 ➡️ 7 #592

merged 14 commits into from
Jan 26, 2024

Conversation

caguero
Copy link
Contributor

@caguero caguero commented Jan 26, 2024

➡️ Forward port

Port gz-physics6 to gz-physics7

Branch comparison: gz-physics7...gz-physics6

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

scpeters and others added 14 commits November 13, 2023 13:32
When loading a model from SDF, the moment of inertia matrix
is currently applying any rotations in the //inertial/pose
two times, since the rotations are applied explicitly, but
they are already applied in math::Inertial::Moi.

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Louise Poubel <[email protected]>
* Use on `push` only on stable branches to avoid duplicate runs
* Update project automation

Signed-off-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
Merge ign-physics2 ➡️  ign-physics5

Signed-off-by: Michael Carroll <[email protected]>
Set collision spinning friction using on sdf's torsional coefficient value. If not specified in sdf, the default value of 1.0 is used. When 2 boxes penetrate, bullet pushes them apart. Without the spinning friction set, the boxes will continue to spin indefinitely or until it collides with another object. Setting the spinning friction prevents this from happening.

Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-physics2 ➡️  ign-physics5
Signed-off-by: Addisu Z. Taddese <[email protected]>
Adapted from #574 with acknowledgement to Ian Chen.

Signed-off-by: Steve Peters <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Merge ign-physics5 ➡️  gz-physics6
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Jan 26, 2024
Copy link

codecov bot commented Jan 26, 2024

Codecov Report

Attention: 5 lines in your changes are missing coverage. Please review.

Comparison is base (32bef6d) 77.91% compared to head (97d50cb) 77.83%.

Files Patch % Lines
bullet-featherstone/src/SDFFeatures.cc 58.33% 5 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff               @@
##           gz-physics7     #592      +/-   ##
===============================================
- Coverage        77.91%   77.83%   -0.09%     
===============================================
  Files              140      140              
  Lines             7766     7772       +6     
===============================================
- Hits              6051     6049       -2     
- Misses            1715     1723       +8     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@scpeters scpeters merged commit 5f73faf into gz-physics7 Jan 26, 2024
10 of 12 checks passed
@scpeters scpeters deleted the 6_to_7 branch January 26, 2024 21:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants