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

6 -> main #480

Merged
merged 36 commits into from
Nov 2, 2021
Merged

6 -> main #480

merged 36 commits into from
Nov 2, 2021

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Oct 29, 2021

➡️ Forward port

Port ign-rendering6 to main

Branch comparison: main...ign-rendering6

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

iche033 and others added 30 commits September 28, 2021 14:28
* fix ray query dist calc

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

* disable test

Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
* Added macos instructions

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

* Fix

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

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

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

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Jose Luis Rivero <[email protected]>
…_buffer_range is not available (#462)

- The definition of bufferFetch1 was failing for OpenGL < 4.2 resulting in compile errors for lighting shaders

Signed-off-by: Rhys Mainwaring <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
* Avoid symbol redefiniition on armel builds

Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
- Fix a bug where the warning of an invalid anti-aliasing level in Ogre2RenderTarget was not being output
- Set the FSAA level to 0 if the target level is invalid
- Provide a list of valid options in the warning

Signed-off-by: Rhys Mainwaring <[email protected]>
* Fix logic on warning for ogre versions different than 1.9.x

Signed-off-by: Jose Luis Rivero <[email protected]>
* Fix ray query distance calculation (#438)

* fix ray query dist calc

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

* disable test

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

* ogre: Add missing required Paging component (#452)

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

* Fix selection buffer material script (#456)

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

Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: Silvio Traversaro <[email protected]>
iche033 and others added 3 commits October 18, 2021 22:49
* ogre: Do not assume that ogre plugins have lib prefix on macOS (#454)

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

* Fix compilation against Ogre 1.10.12 (#390)

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

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Jose Luis Rivero <[email protected]>

* Avoid symbol redefition to fix armel builds (#457)

* Avoid symbol redefiniition on armel builds

Signed-off-by: Jose Luis Rivero <[email protected]>

* Fix logic on warning for ogre versions different than 1.9.x (#465)

* Fix logic on warning for ogre versions different than 1.9.x

Signed-off-by: Jose Luis Rivero <[email protected]>

* Fix context attributes of glXCreateContextAttribsARB. (#460)

Signed-off-by: Hill Ma <[email protected]>

Co-authored-by: Silvio Traversaro <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Hill Ma <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@codecov
Copy link

codecov bot commented Oct 29, 2021

Codecov Report

Merging #480 (28c0ff2) into main (63264a9) will increase coverage by 0.03%.
The diff coverage is 80.00%.

❗ Current head 28c0ff2 differs from pull request most recent head 78180db. Consider uploading reports for the commit 78180db to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##             main     #480      +/-   ##
==========================================
+ Coverage   53.49%   53.52%   +0.03%     
==========================================
  Files         192      194       +2     
  Lines       19566    19655      +89     
==========================================
+ Hits        10466    10520      +54     
- Misses       9100     9135      +35     
Impacted Files Coverage Δ
include/ignition/rendering/Camera.hh 100.00% <ø> (ø)
include/ignition/rendering/RenderTarget.hh 66.66% <ø> (ø)
include/ignition/rendering/Storage.hh 25.00% <ø> (ø)
include/ignition/rendering/base/BaseCamera.hh 65.20% <0.00%> (-0.97%) ⬇️
...nclude/ignition/rendering/base/BaseRenderTarget.hh 60.22% <0.00%> (-1.41%) ⬇️
ogre/src/OgreGaussianNoisePass.cc 1.81% <ø> (ø)
ogre/src/OgreGpuRays.cc 0.00% <ø> (ø)
ogre/src/OgreMaterial.cc 40.92% <ø> (ø)
ogre/src/OgreMaterialSwitcher.cc 0.00% <ø> (ø)
ogre/src/OgreRTShaderSystem.cc 43.12% <ø> (ø)
... and 18 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8ea86c9...78180db. Read the comment docs.

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.

ClickToScene in ogre is failing

@iche033
Copy link
Contributor Author

iche033 commented Oct 29, 2021

that test is failing on ign-rendering6 as well. It's fixed as part of #446. I can separate the changes out to a separate PR.

@iche033
Copy link
Contributor Author

iche033 commented Oct 30, 2021

I can separate the changes out to a separate PR.

#481

* update scaling ratio

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

* update center click

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

* revert change

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

* sytle

Signed-off-by: Ian Chen <[email protected]>
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.

DCO is failing

@iche033
Copy link
Contributor Author

iche033 commented Nov 2, 2021

it always seems to be failing on forward ports. I haven't figured out the correct solution to it yet. I've manually set DCO to pass.

@iche033 iche033 merged commit 50410bf into main Nov 2, 2021
@iche033 iche033 deleted the merge_6_7_20211028 branch November 2, 2021 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants