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

3 to 6 #743

Merged
merged 12 commits into from
Oct 25, 2022
Merged

3 to 6 #743

merged 12 commits into from
Oct 25, 2022

Conversation

ahcorde
Copy link
Contributor

@ahcorde ahcorde commented Oct 14, 2022

➡️ Forward port

Port ign-rendering3 to ign-rendering6

Branch comparison: ign-rendering6...ign-rendering3

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

@ahcorde ahcorde self-assigned this Oct 14, 2022
@ahcorde ahcorde requested a review from iche033 as a code owner October 14, 2022 14:57
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Oct 14, 2022
@codecov
Copy link

codecov bot commented Oct 14, 2022

Codecov Report

Merging #743 (0410533) into ign-rendering6 (18e69f0) will increase coverage by 0.41%.
The diff coverage is 94.11%.

@@                Coverage Diff                 @@
##           ign-rendering6     #743      +/-   ##
==================================================
+ Coverage           77.41%   77.82%   +0.41%     
==================================================
  Files                 146      146              
  Lines               13397    13397              
==================================================
+ Hits                10371    10426      +55     
+ Misses               3026     2971      -55     
Impacted Files Coverage Δ
ogre2/src/Ogre2RayQuery.cc 60.55% <ø> (ø)
ogre2/src/Ogre2DynamicRenderable.cc 77.40% <50.00%> (+2.40%) ⬆️
ogre2/src/Ogre2Camera.cc 88.88% <100.00%> (ø)
ogre2/src/Ogre2DepthCamera.cc 88.37% <100.00%> (ø)
ogre2/src/Ogre2GaussianNoisePass.cc 90.19% <100.00%> (ø)
ogre2/src/Ogre2GpuRays.cc 95.51% <100.00%> (ø)
ogre2/src/Ogre2Marker.cc 77.16% <100.00%> (+3.08%) ⬆️
ogre2/src/Ogre2MaterialSwitcher.cc 80.24% <100.00%> (ø)
ogre2/src/Ogre2Mesh.cc 89.43% <100.00%> (+6.33%) ⬆️
ogre2/src/Ogre2RenderEngine.cc 78.82% <100.00%> (+0.90%) ⬆️
... and 12 more

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

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2020 Open Source Robotics Foundation
* Copyright (C) 2022 Open Source Robotics Foundation
Copy link
Contributor

Choose a reason for hiding this comment

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

how about keeping the original copyright year? I think #736 backported this class to citadel and changed to date to 2022. So we can just keep the original year when forward porting?

Copy link
Contributor

Choose a reason for hiding this comment

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

I had the same issue in common, though I don't think I fixed the copyright years...

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.

just one minor comment. Looks good.

@ahcorde ahcorde enabled auto-merge October 25, 2022 13:24
@ahcorde ahcorde merged commit b1e81b7 into ign-rendering6 Oct 25, 2022
@ahcorde ahcorde deleted the ahcorde/3_to_6_10142022 branch October 25, 2022 13:24
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