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

Particle system - Part 1 #516

Merged
merged 18 commits into from
Feb 18, 2021
Merged

Particle system - Part 1 #516

merged 18 commits into from
Feb 18, 2021

Conversation

caguero
Copy link
Contributor

@caguero caguero commented Dec 23, 2020

It depends on gazebosim/gz-msgs#127 .

The goal is to integrate a particle system that can use the particle emitters available in Ignition Rendering.

This patch focuses on the creation of a new ParticleEmitter component.

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
@caguero caguero requested a review from chapulina as a code owner December 23, 2020 21:28
@github-actions github-actions bot added the 🔮 dome Ignition Dome label Dec 23, 2020
@chapulina chapulina added the rendering Involves Ignition Rendering label Dec 23, 2020
@codecov
Copy link

codecov bot commented Dec 23, 2020

Codecov Report

Merging #516 (a830b44) into ign-gazebo4 (302f5ed) will increase coverage by 0.23%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##           ign-gazebo4     #516      +/-   ##
===============================================
+ Coverage        77.37%   77.61%   +0.23%     
===============================================
  Files              217      213       -4     
  Lines            12217    11624     -593     
===============================================
- Hits              9453     9022     -431     
+ Misses            2764     2602     -162     
Impacted Files Coverage Δ
src/systems/user_commands/UserCommands.cc 77.86% <0.00%> (-1.81%) ⬇️
src/EntityComponentManager.cc 84.49% <0.00%> (-1.54%) ⬇️
src/systems/diff_drive/DiffDrive.cc 84.10% <0.00%> (-1.00%) ⬇️
src/network/NetworkManagerSecondary.cc 80.64% <0.00%> (-0.90%) ⬇️
src/systems/velocity_control/VelocityControl.cc 83.01% <0.00%> (-0.62%) ⬇️
src/gui/PathManager.cc 88.88% <0.00%> (-0.59%) ⬇️
src/systems/logical_camera/LogicalCamera.cc 77.77% <0.00%> (-0.31%) ⬇️
src/Util.cc 95.15% <0.00%> (-0.31%) ⬇️
src/Conversions.cc 81.63% <0.00%> (-0.26%) ⬇️
.../systems/triggered_publisher/TriggeredPublisher.cc 81.97% <0.00%> (-0.16%) ⬇️
... and 38 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 44a6713...04721d3. Read the comment docs.

@caguero caguero requested a review from iche033 January 4, 2021 16:20
caguero and others added 3 commits January 7, 2021 17:37
…ter.

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
caguero and others added 2 commits January 29, 2021 16:53
@chapulina chapulina added the needs upstream release Blocked by a release of an upstream library label Jan 29, 2021
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.

Thanks for iterating!

@chapulina
Copy link
Contributor

chapulina commented Jan 30, 2021

@caguero , would you prefer merging these PRs as they are approved, or should we wait until all the functionality is working and approved before merging all PRs? Note that this is targeting a stable release branch, and whatever is merged in an intermediary state may be released at any point.

@caguero
Copy link
Contributor Author

caguero commented Jan 30, 2021

@caguero , would you prefer merging these PRs as they are approved, or should we wait until all the functionality is working and approved before merging all tutorials? Note that this is targeting a stable release branch, and whatever is merged in an intermediary state may be released at any point.

We can review part1, part2 and part3 and merge them all at once when we're happy with it. These three PRs offer the basic integration. Part4 (coming up) is more independent.

@chapulina chapulina marked this pull request as draft February 1, 2021 18:21
@chapulina
Copy link
Contributor

We can review part1, part2 and part3 and merge them all at once when we're happy with it.

Got it. I converted this to draft so that we don't merge it by mistake.

@adlarkin
Copy link
Contributor

adlarkin commented Feb 8, 2021

I'm noticing the following error in CI:

  /github/workspace/include/ignition/gazebo/components/ParticleEmitter.hh:20:10: fatal error: ignition/msgs/particle_emitter.pb.h: No such file or directory
   #include <ignition/msgs/particle_emitter.pb.h>

I believe that we need to make an ign-msgs6 release. cc @chapulina @iche033 let me know if you'd like for me to make an ign-msgs6 release

@chapulina
Copy link
Contributor

chapulina commented Feb 9, 2021

ign-msgs6 release.

I'm fine with a release, my only request is that we make sure the current particle message has all we need, because this will go into a stable release, and we won't be able to tweak any fields afterwards. So maybe it's best to wait until all parts are out beforehand. But if @iche033 thinks the implementation is already settled, then go for it.

@adlarkin
Copy link
Contributor

adlarkin commented Feb 9, 2021

my only request is that we make sure the current particle message has all we need, because this will go into a stable release, and we won't be able to tweak any fields afterwards.

Good point. I am still reviewing the other particle system PRs, so I will make a release once we know all of the other PRs are good to go 👍

@iche033
Copy link
Contributor

iche033 commented Feb 9, 2021

yeah let's hold off until we have everything reviewed and ready to go. There's still some work left that need to be on on particles this week.

@iche033 iche033 marked this pull request as ready for review February 17, 2021 05:01
@nkoenig nkoenig mentioned this pull request Feb 17, 2021
7 tasks
@adlarkin adlarkin mentioned this pull request Feb 17, 2021
7 tasks
Signed-off-by: Carlos Agüero <caguero@osrfoundation.org>

Co-authored-by: Ashton Larkin <ashton@openrobotics.org>
Co-authored-by: Ian Chen <ichen@osrfoundation.org>
@adlarkin
Copy link
Contributor

@iche033 there was a merge conflict in 5885e45 that I resolved. It looks like #482 added some code to RenderUtil::UpdateECM to update lights, so I kept that addition along with the additions we made to RenderUtil::UpdateECM.

Copy link
Contributor

@adlarkin adlarkin left a comment

Choose a reason for hiding this comment

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

A few minor comments that would be nice to address before merging, but I'm fine with merging this PR as-is.

test/integration/particle_emitter.cc Show resolved Hide resolved
test/integration/particle_emitter.cc Show resolved Hide resolved
test/integration/particle_emitter.cc Outdated Show resolved Hide resolved
iche033 and others added 4 commits February 17, 2021 18:28
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
@nkoenig nkoenig merged commit deddb6f into ign-gazebo4 Feb 18, 2021
@nkoenig nkoenig deleted the particle_system branch February 18, 2021 05:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🔮 dome Ignition Dome needs upstream release Blocked by a release of an upstream library rendering Involves Ignition Rendering
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants