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

Forward port 3 to 6, Jan 29 2023 #815

Merged
merged 13 commits into from
Feb 2, 2023
Merged

Conversation

nkoenig
Copy link
Contributor

@nkoenig nkoenig commented Jan 29, 2023

➡️ Forward port

Port ign-rendering3 to ign-rendering6

Branch comparison: https://github.com/gazebosim//compare/<TO_BRANCH>...<FROM_BRANCH>

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

mjcarroll and others added 8 commits October 26, 2022 18:18
Signed-off-by: Michael Carroll <[email protected]>
…oller, PixelFormat and ShadersParams (#748)

Signed-off-by: ahcorde <[email protected]>
* Migrate headers

Signed-off-by: methylDragon <[email protected]>

* Add redirection headers

Signed-off-by: methylDragon <[email protected]>

* Migrate include statements

Signed-off-by: methylDragon <[email protected]>

* Leave ignition as primary in headers to fix ABI

Signed-off-by: methylDragon <[email protected]>

* Fix test

Signed-off-by: Nate Koenig <[email protected]>

* Removed some gazeb classic code

Signed-off-by: Nate Koenig <[email protected]>

* Revert changes

Signed-off-by: Nate Koenig <[email protected]>

* revert to gazebo in gazebo scene viewer

Signed-off-by: Ian Chen <[email protected]>

* fix build errors

Signed-off-by: Ian Chen <[email protected]>

Signed-off-by: methylDragon <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
@nkoenig nkoenig requested a review from iche033 as a code owner January 29, 2023 18:35
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Jan 29, 2023
@iche033
Copy link
Contributor

iche033 commented Jan 30, 2023

Did a first pass review. Started fixing warnings and tests in #819

@codecov
Copy link

codecov bot commented Jan 31, 2023

Codecov Report

Merging #815 (7c11d83) into ign-rendering6 (17d0bd1) will increase coverage by 1.81%.
The diff coverage is 74.09%.

@@                Coverage Diff                 @@
##           ign-rendering6     #815      +/-   ##
==================================================
+ Coverage           77.83%   79.65%   +1.81%     
==================================================
  Files                 146      146              
  Lines               13432    13437       +5     
==================================================
+ Hits                10455    10703     +248     
+ Misses               2977     2734     -243     
Impacted Files Coverage Δ
include/gz/rendering/GizmoVisual.hh 0.00% <0.00%> (ø)
include/gz/rendering/Scene.hh 0.00% <0.00%> (ø)
include/gz/rendering/Text.hh 0.00% <0.00%> (ø)
include/gz/rendering/base/BaseDistortionPass.hh 0.00% <0.00%> (ø)
include/gz/rendering/base/BaseScene.hh 0.00% <ø> (ø)
...nclude/gz/rendering/base/BaseSegmentationCamera.hh 70.96% <ø> (ø)
include/gz/rendering/base/BaseSensor.hh 100.00% <ø> (ø)
include/gz/rendering/base/BaseStorage.hh 67.66% <ø> (ø)
include/gz/rendering/base/BaseText.hh 0.00% <ø> (ø)
include/gz/rendering/base/BaseThermalCamera.hh 94.44% <ø> (ø)
... and 155 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

conflicts

Changelog.md Outdated Show resolved Hide resolved
Copy link
Contributor

@iche033 iche033 left a comment

Choose a reason for hiding this comment

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

looks good to me. Demos are working fine

@iche033 iche033 requested a review from ahcorde February 2, 2023 18:15
@iche033 iche033 merged commit 82e35bb into ign-rendering6 Feb 2, 2023
@iche033 iche033 deleted the nkoenig/3-to-6-20230120 branch February 2, 2023 19:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants