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

Port: 7 to main #564

Merged
merged 4 commits into from
Aug 23, 2023
Merged

Port: 7 to main #564

merged 4 commits into from
Aug 23, 2023

Conversation

mjcarroll
Copy link
Contributor

➡️ Forward port

Port gz-gui7 to main

Branch comparison: main...gz-gui7

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

azeey and others added 4 commits August 1, 2023 16:25
* Break scene3d test apart into component tests

Signed-off-by: Michael Carroll <[email protected]>

* Fix include paths

Signed-off-by: Michael Carroll <[email protected]>

* Remove scene3d as it is deprecated

Signed-off-by: Michael Carroll <[email protected]>

* Remove message header

Signed-off-by: Michael Carroll <[email protected]>

* Bump everything to ogre2 by default

Signed-off-by: Michael Carroll <[email protected]>

* line order

Signed-off-by: Louise Poubel <[email protected]>

* Fix tests by delaying get render engine calls  (#535)



---------

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

* revert default engine

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

* Fix rendering tests (#561)

* debugging

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

* reset cam

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

* more testing

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

* no unload

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

* more testing with no unload

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

* unload engine in gzrenderer

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

* unload engine in gzrenderer debugging

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

* unload engine in gzrenderer reset scene

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

* comment out unload

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

* increase timeout

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

* test timing

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

* cleanup

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

* cleanup

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

* more cleanup

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

---------

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

* Suppress warnings in metal

Signed-off-by: Michael Carroll <[email protected]>

* Incorrect args

Signed-off-by: Michael Carroll <[email protected]>

---------

Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
@mjcarroll mjcarroll changed the title Ports/7 to main Port: 7 to main Aug 22, 2023
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Aug 22, 2023
@codecov
Copy link

codecov bot commented Aug 22, 2023

Codecov Report

Merging #564 (aae5778) into main (82aa5b1) will decrease coverage by 2.04%.
Report is 3 commits behind head on main.
The diff coverage is 100.00%.

❗ Current head aae5778 differs from pull request most recent head d8d76d3. Consider uploading reports for the commit d8d76d3 to get more accurate results

@@            Coverage Diff             @@
##             main     #564      +/-   ##
==========================================
- Coverage   70.09%   68.05%   -2.04%     
==========================================
  Files          46       38       -8     
  Lines        5062     5394     +332     
==========================================
+ Hits         3548     3671     +123     
- Misses       1514     1723     +209     
Files Changed Coverage Δ
src/plugins/world_control/WorldControl.cc 72.66% <ø> (+0.06%) ⬆️
src/plugins/minimal_scene/MinimalScene.cc 57.67% <100.00%> (-4.93%) ⬇️

... and 38 files with indirect coverage changes

@mjcarroll mjcarroll merged commit 974957f into main Aug 23, 2023
6 of 7 checks passed
@mjcarroll mjcarroll deleted the ports/7_to_main branch August 23, 2023 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants