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

Merge: 7 -> 8 #923

Merged
merged 12 commits into from
Sep 27, 2023
Merged

Merge: 7 -> 8 #923

merged 12 commits into from
Sep 27, 2023

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Sep 26, 2023

➡️ Forward port

Port gz-rendering7 to gz-rendering8

Branch comparison: gz-rendering8...gz-rendering7

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

ahcorde and others added 12 commits June 12, 2023 17:48
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Sets the ogre2 target INSTALL_RPATH to a copy of
CMAKE_INSTALL_RPATH with OGRE_LIBRARY_DIRS
appended, instead of just the latter path. This
helps with packaging on macOS.

Signed-off-by: Steve Peters <[email protected]>
* Calculate camera intrinsics : Refactor #700 (#755)


Signed-off-by: Alejandro Hernández Cordero <[email protected]>

---------

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Aditya Pande <[email protected]>
Merge ign-rendering6 ➡️  gz-rendering7
Signed-off-by: Addisu Z. Taddese <[email protected]>
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Sep 26, 2023
@codecov
Copy link

codecov bot commented Sep 26, 2023

Codecov Report

Merging #923 (598cd41) into gz-rendering8 (4190ff6) will decrease coverage by 0.02%.
The diff coverage is 100.00%.

❗ Current head 598cd41 differs from pull request most recent head 62e45a2. Consider uploading reports for the commit 62e45a2 to get more accurate results

@@                Coverage Diff                @@
##           gz-rendering8     #923      +/-   ##
=================================================
- Coverage          75.16%   75.15%   -0.02%     
=================================================
  Files                177      177              
  Lines              16849    16830      -19     
=================================================
- Hits               12665    12649      -16     
+ Misses              4184     4181       -3     
Files Coverage Δ
ogre2/src/Ogre2ParticleEmitter.cc 78.01% <100.00%> (-0.57%) ⬇️

@iche033 iche033 merged commit 9e6d8ac into gz-rendering8 Sep 27, 2023
6 of 7 checks passed
@iche033 iche033 deleted the merge_7_8_20230926 branch September 27, 2023 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants