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: part 1 #669

Merged
merged 10 commits into from
Jul 30, 2024
Merged

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port gz-physics7 as of 6bcf1af to main

The conflicts were difficult to resolve, due to some changes in a1cb989, so I'm splitting this merge into two parts, first merging with the commit just before that one.

Branch comparison: main...6bcf1af

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

iche033 and others added 9 commits April 23, 2024 18:33
Supports convex decomposition on meshes. Bullet-featherstone implementation will parse the new mesh optimization attribute, decompose the mesh into convex meshes, and builds btConvexHullShape collision shapes.

Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Øystein Sture <[email protected]>
* bullet-featherstone fixed joint implementation now calls setMaxAppliedImpulse to enforce fixed constraint.
*When the pose of the parent body of a fixed constraint is changed by FreeGroupSetWorldPose, the child pose is updated to enforce pose transform relative to the parent
* prevent collision between parent and child link if parent is static

Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
…#647)

Currently if a collision has a pose offset, the bullet-featherstone plugin returns an incorrect axis aligned bounding box for the link containing the collision. This is found to be caused by incorrect frame data pose computed for collisions - It currently ignores the collision pose offset.

This PR makes a few changes to KinematicsFeatures::FrameDataRelativeToWorld in bullet-featherstone plugin:

- fixed getting collision pose relative to world
- fixed getting model pose relative to world
- minor refactoring
The link_features's bounding box test was previously skipped for bullet-featherstone plugin. This PR enables this test for bullet-featherstone by requiring only a minimal set of features needed to run the test.

---------

Signed-off-by: Ian Chen <[email protected]>
dartsim does support ray-based collisions via Bullet backend, which is also supported by gz-physics.

This PR creates a simulation feature to compute and retrieve ray castings. Also, it updates dartsim version >= 6.10, which fixes the issues when no ray hit.

This addition is useful for range-based applications (e.g. laser, altimeter etc.).

---------

Signed-off-by: Rômulo Cerqueira <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
…ertial pose offset (#653)

When creating a fixed constraint between links, the SetJointTransformFromParent currently does not take into account the inertial pose. If an inertial pose offset exists, the fixed constraint causes the 2 models to be displaced from their original position. This PR updates the calculation in SetJointTransformFromParent to include inertial pose offset.

The detachable_joint.world test world is updated to use a model with inertial pose offset - this world is used by the CorrectAttachmentPoints test in detachable_joint common test. The test fails without the changes in this PR.
---------

Signed-off-by: Ian Chen <[email protected]>
@scpeters scpeters requested a review from iche033 July 29, 2024 22:55
@github-actions github-actions bot added the 🏛️ ionic Gazebo Ionic label Jul 29, 2024
@scpeters scpeters force-pushed the scpeters/merge_7_main_part1 branch from a8af794 to fb18484 Compare July 29, 2024 22:57
@scpeters
Copy link
Member Author

force-pushed to fix package.xml version numbers

@azeey azeey added the beta Targeting beta release of upcoming collection label Jul 30, 2024
@scpeters scpeters merged commit 9edf65b into main Jul 30, 2024
8 checks passed
@scpeters scpeters deleted the scpeters/merge_7_main_part1 branch July 30, 2024 22:53
@scpeters
Copy link
Member Author

part 2 is in #670

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta Targeting beta release of upcoming collection 🏛️ ionic Gazebo Ionic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants