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.

Sign up for GitHub

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

Jump to bottom

Merge gz-rendering8 ➡️ main #934

Merged
merged 45 commits into from
Oct 10, 2023
Merged

Merge gz-rendering8 ➡️ main #934

merged 45 commits into from
Oct 10, 2023

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Oct 10, 2023

➡️ Forward port

Port gz-rendering8 ➡️ main

Branch comparison: main...gz-rendering8

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

ahcorde and others added 30 commits June 12, 2023 17:48
@ahcorde
Fixed light visual in OGRE (#862) (#864)
6ea5ede 
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
@azeey
Fix Github project automation for new project board (#878)
6712d55 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey
Use pull_request_target for triage workflow (#879)
71765a0 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@iche033
Prepare for 7.4.1 release (#883)
a50cd70 
Signed-off-by: Ian Chen <[email protected]>
@azeey
Merge gz-rendering7 into gz-rendering8
8515267 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@iche033
Merge pull request #887 from azeey/7_to_8
ac83c54 
Merge gz-rendering7 ➡️  gz-rendering8
@iche033
remove bionic and focal apt (#888)
837b2fe 
Signed-off-by: Ian Chen <[email protected]>
@azeey
Prepare for 6.6.1 Release (#891)
c2c5fdf 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@iche033
Do not load optix engine in examples (#893)
2901ec2 

---------

Signed-off-by: Ian Chen <[email protected]>
@iche033
remove more references to optix (#895)
077e1e7 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Revert mesh viewer background color back to gray (#894)
9385897 
Signed-off-by: Ian Chen <[email protected]>
@iche033 @ahcorde
Fix arrow visual indexing (#889)
41f80fd 
* fix node indexing

---------

Signed-off-by: Ian Chen <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
@iche033
Fix typo in bounding box camera tutorial (#896)
b16a396 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Fix wide angle camera visibility flags (#900)
3c84ca4 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Minor updates to README file in the hello_world_plugin example (#892)
6fa1fc1 
---------

Signed-off-by: Ian Chen <[email protected]>
@iche033
Disable setting color range in particle emitter (#903)
59417ba 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Prepare from 8.0.0 pre2 release (#904)
890cc29 
Signed-off-by: Ian Chen <[email protected]>
@iche033 @mjcarroll @ahcorde
Update installation instructions (#906)
98c5978 
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
@peci1 @iche033 @mjcarroll
Fixed build on MSVC. (#897)
0795e09 
Signed-off-by: Martin Pecka <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
@iche033
Update README (#907)
c108afb
@scpeters
ogre2: use CMAKE_INSTALL_RPATH (#909)
8c1fd27 
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]>
@mjcarroll
Include the CGL header on macOS (#911)
9d524c2 
Signed-off-by: Michael Carroll <[email protected]>
@scpeters
ogre2: use CMAKE_INSTALL_RPATH (#909)
da675f6 
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]>
@iche033 @azeey
Fix projector FOV, orientation, and crashes (#913)
5655566 
* Fix FOV calculation, projected texture orientation, crash when heighmaps are present

Signed-off-by: Ian Chen <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
@iche033
Remove gazebo scene viewer example (#915)
4190ff6 
* remove gazebo scene viewer example

---------

Signed-off-by: Ian Chen <[email protected]>
@ahcorde @adityapande-1995
[backport fortress] Calculate camera intrinsics : Refactor (#905)
b6f5d22 
* 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]>
@azeey
Merge ign-rendering6 into gz-rendering7
c896a9a 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey
Merge pull request #921 from azeey/6_to_7
1876bc6 
Merge ign-rendering6 ➡️  gz-rendering7
@azeey
Prepare for 7.4.2 release (#922)
61bf635 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@iche033
Merge from gz-rendering7
62e45a2 
Signed-off-by: Ian Chen <[email protected]>
iche033 and others added 15 commits September 27, 2023 08:01
@iche033
Merge pull request #923 from gazebosim/merge_7_8_20230926
9e6d8ac 
Merge: 7 -> 8
@azeey
Update changelog and prepare for pre3 (#924)
d3807fe 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey
Prepare for 8.0.0 Release (#926)
dad0364 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@iche033
Fix float comparison warnings in test (#929)
4cf24f7 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Prepare for 6.6.2 release (#930)
4e49945 
Signed-off-by: Ian Chen <[email protected]>
@mosfet80
Update ci.yml (#925)
93841e1 
Updated actions/checkout to v4

Signed-off-by: mosfet80 <[email protected]>
@iche033
Fix use of srgb format for texture map data (#931)
5892355 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Minor fix for projector visibility flags (#920)
c1af6fd 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Support skybox in wide angle cam view (#901)
22b2bbf 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Extend ogre 1.x custom shaders support (#908)
70e2fe4 
* Extend ogre 1.x shaders to support constants and textures
* add waves integration test

---------

Signed-off-by: Ian Chen <[email protected]>
@iche033
Merge from ign-rendering6
9344fac 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Merge pull request #932 from gazebosim/merge_6_7_20231010
adb0f1c 
Merge: 6 -> 7
@iche033
merge from gz-rendering7
c27ebce 
Signed-off-by: Ian Chen <[email protected]>
@azeey
Merge pull request #933 from gazebosim/merge_7_8_20231010
c42123e 
Merge: 7 -> 8
@azeey
Merge gz-rendering8 into main
3637c76
@azeey azeey requested a review from iche033 as a code owner October 10, 2023 20:20
@codecov
Copy link

codecov bot commented Oct 10, 2023 •
edited
Loading

Codecov Report

Merging #934 (8fa62b1) into main (30ec9d4) will increase coverage by 0.40%.
The diff coverage is 64.70%.

❗ Current head 8fa62b1 differs from pull request most recent head 3637c76. Consider uploading reports for the commit 3637c76 to get more accurate results

@@            Coverage Diff             @@
##             main     #934      +/-   ##
==========================================
+ Coverage   75.26%   75.66%   +0.40%     
==========================================
  Files         176      177       +1     
  Lines       16853    16884      +31     
==========================================
+ Hits        12685    12776      +91     
+ Misses       4168     4108      -60
Files Coverage Δ
include/gz/rendering/base/BaseNativeWindow.hh 0.00% <ø> (ø)
ogre2/src/Ogre2Material.cc 84.76% <100.00%> (+8.68%) ⬆️
ogre2/src/Ogre2ParticleEmitter.cc 78.01% <100.00%> (-0.57%) ⬇️
ogre2/src/Ogre2RenderEngine.cc 68.18% <ø> (ø)
include/gz/rendering/base/BaseAxisVisual.hh 62.71% <0.00%> (ø)
ogre2/src/Ogre2Scene.cc 78.53% <83.33%> (+0.03%) ⬆️
ogre2/src/Ogre2GlobalIlluminationCiVct.cc 0.00% <0.00%> (ø)
src/GlobalIlluminationBase.cc 0.00% <0.00%> (ø)
src/GlobalIlluminationVct.cc 0.00% <0.00%> (ø)
src/NativeWindow.cc 0.00% <0.00%> (ø)
... and 5 more

... and 1 file with indirect coverage changes

@azeey azeey merged commit 9382513 into main Oct 10, 2023
6 of 7 checks passed
@azeey azeey deleted the azeey/8_to_main branch October 10, 2023 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iche033 iche033 iche033 approved these changes

@mjcarroll mjcarroll mjcarroll approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@azeey @mjcarroll @iche033 @ahcorde @peci1 @scpeters @mosfet80