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

Added Ellipsoid and Capsule geometries #581

Merged
merged 44 commits into from
Mar 25, 2021
Merged

Conversation

ahcorde
Copy link
Contributor

@ahcorde ahcorde commented Jan 25, 2021

This PR allows to visualize in Gazebo capsules and ellipsoides.

As you can see in the images I still have some issues with the collisions:

Selección_096

Related with

Signed-off-by: ahcorde [email protected]

jennuine and others added 17 commits January 6, 2021 09:22
Signed-off-by: Jenn Nguyen <[email protected]>
Signed-off-by: Jenn Nguyen <[email protected]>
Signed-off-by: Jenn Nguyen <[email protected]>
Signed-off-by: Jenn Nguyen <[email protected]>
Signed-off-by: Jenn Nguyen <[email protected]>
@ahcorde ahcorde added the 🏢 edifice Ignition Edifice label Jan 25, 2021
@ahcorde ahcorde self-assigned this Jan 25, 2021
@chapulina chapulina added the needs upstream release Blocked by a release of an upstream library label Jan 27, 2021
@chapulina
Copy link
Contributor

@ahcorde , I pushed commit ac55ced directly to this branch to add an ellipsoid and a capsule to the markers example. It works for me with gazebosim/gz-rendering#276:

ellipse_marker
capsule_marker

Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Copy link
Contributor

The capsule is currently rotated 90 degrees, this fixes it: gazebosim/gz-common#186

@chapulina chapulina marked this pull request as ready for review March 20, 2021 00:32
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

Working well! I think the only thing left to solve is not requiring that all physics engines support these shapes. I think we may be able to separate the features on ign-physics and add some logic here to conditionally support these features.

shapes_new

rolling_new

@chapulina
Copy link
Contributor

the only thing left to solve is not requiring that all physics engines support these shapes

Looking into it again now, I see that the current implementation doesn't prevent physics engines that don't support capsules and ellipsoids from being loaded. So I think this is good for now. We can always come back and move these shapes into a separate feature if we see the need.

Just pending the ign-physics PR 👍

Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Copy link
Contributor

We're running out of space for so many features! I updated the top toolbar to look like this:

image

@chapulina chapulina removed the needs upstream release Blocked by a release of an upstream library label Mar 25, 2021
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@codecov
Copy link

codecov bot commented Mar 25, 2021

Codecov Report

Merging #581 (e01fa3a) into main (84ae007) will decrease coverage by 0.02%.
The diff coverage is 70.43%.

❗ Current head e01fa3a differs from pull request most recent head 3386838. Consider uploading reports for the commit 3386838 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##             main     #581      +/-   ##
==========================================
- Coverage   65.36%   65.34%   -0.03%     
==========================================
  Files         240      240              
  Lines       17514    17601      +87     
==========================================
+ Hits        11448    11501      +53     
- Misses       6066     6100      +34     
Impacted Files Coverage Δ
include/ignition/gazebo/SdfEntityCreator.hh 100.00% <ø> (ø)
src/ServerConfig.cc 89.68% <ø> (ø)
src/gui/plugins/shapes/Shapes.cc 22.72% <0.00%> (-5.06%) ⬇️
src/rendering/MarkerManager.cc 13.02% <0.00%> (-0.12%) ⬇️
src/rendering/RenderUtil.cc 42.14% <0.00%> (-0.32%) ⬇️
src/systems/physics/Physics.hh 100.00% <ø> (ø)
src/rendering/SceneManager.cc 25.00% <20.00%> (-0.06%) ⬇️
src/systems/physics/Physics.cc 69.40% <78.18%> (+0.36%) ⬆️
src/SdfEntityCreator.cc 87.22% <79.31%> (-1.02%) ⬇️
...nclude/ignition/gazebo/components/CanonicalLink.hh 100.00% <100.00%> (ø)
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5d3970a...3386838. Read the comment docs.

@chapulina
Copy link
Contributor

There are no related failures on CI, merging!

@chapulina chapulina merged commit 2bf29c2 into main Mar 25, 2021
@chapulina chapulina deleted the ahcorde/geom/capsule_ellipsoid branch March 25, 2021 16:57
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 🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants