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

5 ➡️ 6 (main) #401

Merged
merged 20 commits into from
Sep 10, 2021
Merged

5 ➡️ 6 (main) #401

merged 20 commits into from
Sep 10, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-rendering5 to main

Branch comparison: main...ign-rendering5

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

chapulina and others added 19 commits June 22, 2021 17:26
Signed-off-by: Louise Poubel <[email protected]>
…363)

* Moved ScreenToPlane and ScreenToScene from ign-gui to ign-rendering

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

* added plane offset

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

* Added new signature

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

* Fix doxygen

Signed-off-by: Steven Peters <[email protected]>

* Add const version of RayQueryResult bool operator

Signed-off-by: Steven Peters <[email protected]>

* Improvements to Utils_TEST

* Use tighter tolerances in expectations
* Use IGN_PI/2 instead of 1.57 to tighten X tolerance
* Clarify comments about max distance, which is only used
  when the ray does not intersect an object
* Add expectations on RayQueryResult values
* Add test of API without RayQueryResult

Signed-off-by: Steven Peters <[email protected]>

* Test ScreenToPlane with non-zero offset

Signed-off-by: Steven Peters <[email protected]>

Co-authored-by: Steven Peters <[email protected]>
- OpenGL < 4.2 does not support swizzling built in types (e.g. float).
- Update the definition of @piece( maxR1F0 ) to work in OpenGL 4.1

Signed-off-by: Rhys Mainwaring <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
…rendering3) (#376)

* Set OGRE minimal version to 1.8. Warn on versions not supported.
 Flag USE_UNOFFICIAL_OGRE_VERSIONS to disable the warning for the
 experienced users.

Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
* fix 0 hfov angle

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

* use ignerr

Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@chapulina chapulina requested a review from iche033 as a code owner September 9, 2021 21:25
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Sep 9, 2021
@chapulina chapulina added the beta Targeting beta release of upcoming collection label Sep 9, 2021
@codecov
Copy link

codecov bot commented Sep 9, 2021

Codecov Report

Merging #401 (5070c5f) into main (7def756) will decrease coverage by 0.03%.
The diff coverage is 56.66%.

❗ Current head 5070c5f differs from pull request most recent head fa91583. Consider uploading reports for the commit fa91583 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##             main     #401      +/-   ##
==========================================
- Coverage   58.70%   58.67%   -0.04%     
==========================================
  Files         174      174              
  Lines       17184    17276      +92     
==========================================
+ Hits        10088    10136      +48     
- Misses       7096     7140      +44     
Impacted Files Coverage Δ
include/ignition/rendering/Camera.hh 100.00% <ø> (ø)
include/ignition/rendering/Geometry.hh 100.00% <ø> (ø)
include/ignition/rendering/GpuRays.hh 0.00% <ø> (ø)
include/ignition/rendering/HeightmapDescriptor.hh 100.00% <ø> (ø)
include/ignition/rendering/Light.hh 100.00% <ø> (ø)
include/ignition/rendering/LightVisual.hh 100.00% <ø> (ø)
include/ignition/rendering/Material.hh 100.00% <ø> (ø)
include/ignition/rendering/Mesh.hh 100.00% <ø> (ø)
include/ignition/rendering/RenderEngine.hh 100.00% <ø> (ø)
include/ignition/rendering/Scene.hh 0.00% <ø> (ø)
... and 25 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 7def756...fa91583. Read the comment docs.

@iche033
Copy link
Contributor

iche033 commented Sep 10, 2021

I made some changes in fa91583 to address a todo note about merging to main. It's to revert an ABI workaround done in b52af92

@chapulina chapulina merged commit 55a3e43 into main Sep 10, 2021
@chapulina chapulina deleted the chapulina/5_to_6 branch September 10, 2021 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta Targeting beta release of upcoming collection 🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants