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

4 ➡️ 5 #264

Merged
merged 15 commits into from
Mar 19, 2021
Merged

4 ➡️ 5 #264

merged 15 commits into from
Mar 19, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-rendering4 to main

Branch comparison: main...ign-rendering4

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

🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸

srmainwaring and others added 5 commits March 1, 2021 10:29
* Examples: fix custom_scene_viewer for macOS

1. Add OpenGL context settings for macOS to the DemoWindow.
2. Move glutInit to main
3. Add command line option to set the ogre engine.

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>

* Examples: custom_scene_viewer ensure compliance with code standards

1. Use camel case for variables.

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
* increase nosie std based on particle emitter size

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* tuning particle noise in shaders

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* apply change to depth camera

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fix depth camera particle noise

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fix tests

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fix point cloud scattering

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
* changelog

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* update cmake version

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Rein Appeldoorn <reinzor@gmail.com>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>

Co-authored-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
@chapulina chapulina requested a review from iche033 as a code owner March 4, 2021 19:22
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Mar 4, 2021
srmainwaring and others added 4 commits March 8, 2021 15:44
* Examples: fix gazebo_scene_viewer for macOS and ensure exits cleanly

1. Add OpenGL context settings for macOS to the CameraWindow.
2. Move glutInit to main in GazeboDemo and GazeboWorldDemo
3. Update CMakeLists.txt to exclude libstdc++fs for macOS and add find_package for bullet.
4. Expose command line option to set either ogre or ogre2 as an engine.
5. Ensure gazebo::transport is stopped and cleaned up prior to exit.
6. Use std::unique_ptr to manage current and new scene manager lifetimes.
7. Disconnect pub/sub from transport on SceneManager Fini.
8. Add checks in pub/sub callbacks to ensure scene manager pointers are valid.

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>

* Examples: gazebo_scene_viewer ensure compliance with code standards

1. Place return in braces following if
2. Use camel case for variables.

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>

* Examples: revert addition of Bullet to CMakeLists.txt in gazebo_scene_viewer

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
* expose particle scatter ratio param

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* codecheck

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* test fix

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* address review comments

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* documentation tweaks

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* testing

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* testing particle depth on actions

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* testing

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* revert changes, fix test

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

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

codecov bot commented Mar 15, 2021

Codecov Report

Merging #264 (e66fbad) into main (8f738e4) will increase coverage by 0.15%.
The diff coverage is 87.87%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #264      +/-   ##
==========================================
+ Coverage   57.62%   57.77%   +0.15%     
==========================================
  Files         151      153       +2     
  Lines       15328    15411      +83     
==========================================
+ Hits         8833     8904      +71     
- Misses       6495     6507      +12     
Impacted Files Coverage Δ
ogre/src/OgreGpuRays.cc 0.00% <ø> (ø)
ogre2/src/Ogre2ThermalCamera.cc 89.28% <62.50%> (-1.48%) ⬇️
ogre2/src/Ogre2ParticleNoiseListener.cc 89.09% <89.09%> (ø)
include/ignition/rendering/base/BaseMaterial.hh 64.25% <100.00%> (ø)
ogre2/src/Ogre2DepthCamera.cc 91.38% <100.00%> (+0.31%) ⬆️
ogre2/src/Ogre2GpuRays.cc 94.77% <100.00%> (+0.02%) ⬆️
ogre2/src/Ogre2Material.cc 93.02% <100.00%> (-0.03%) ⬇️
ogre2/src/Ogre2ParticleEmitter.cc 78.00% <100.00%> (+0.22%) ⬆️
ogre2/src/Ogre2ParticleNoiseListener.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 8f738e4...e66fbad. Read the comment docs.

iche033 and others added 3 commits March 16, 2021 10:23
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@chapulina chapulina added the beta Targeting beta release of upcoming collection label Mar 17, 2021
chapulina and others added 2 commits March 17, 2021 11:31
* Master branch updates (#268)

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* Fix DepthGaussianNoise test (#271)

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

Co-authored-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
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.

Windows CI failed, is that expected for Edifice (main branch)? I believe that Windows is usually green for Dome. Clicking on the "details" button of Windows CI leads to a 404, so I can't get any more information about the failure.

Also, it looks like this forward port is out of date with the branch comparison. @chapulina, can you update this forward port to get the latest commits on ign-rendering4? I currently see 14 commits in the branch comparison (the last one being d98ea2a).

examples/gazebo_scene_viewer/SceneManager.cc Show resolved Hide resolved
src/ParticleEmitter_TEST.cc Show resolved Hide resolved
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Copy link
Contributor Author

@adlarkin , I addressed your comments and pushed, let's see if Windows CI comes back now.

@adlarkin
Copy link
Contributor

Windows already failed, it looks like there's an issue with getting dependencies for the build (https://build.osrfoundation.org/job/ign_rendering-pr-win/1442/consoleFull#1273209513aa60f765-a60a-427d-900c-dc128ab22287):

Missing: ignition-common4 (Components: graphics, events)

@chapulina
Copy link
Contributor Author

Ahhhh

-- Cannot build component [graphics] - Missing: ignition-utils1

Here we go: gazebo-tooling/gazebodistro#30

@adlarkin
Copy link
Contributor

adlarkin commented Mar 18, 2021

Nice catch, I missed that when scanning output in Windows CI. gazebo-tooling/gazebodistro#30 has been approved, so I think all we need to do now is merge that and then run Windows CI one last time 🤞

@chapulina
Copy link
Contributor Author

All 🟢

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.

🚢 it!

@chapulina chapulina merged commit 3584189 into main Mar 19, 2021
@chapulina chapulina deleted the chapulina/4_to_5 branch March 19, 2021 00:59
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.

5 participants