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 ➡️ 7 (main) #507

Merged
merged 5 commits into from
Dec 8, 2021
Merged

6 ➡️ 7 (main) #507

merged 5 commits into from
Dec 8, 2021

Conversation

chapulina
Copy link
Contributor

➡️ 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 5 commits November 30, 2021 17:05
* fix selection buffer crash due to resize and incorrect selections

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* test updating full selection buffer texture

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* reenable visual at test

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fix codecheck

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* testing rgb no depth, full buffer

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* use 1x1 buffer, still no depth data

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* prnt scaling factor

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* disable device ratio

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* reenable depth and utils test

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* disable utils test, add visual at test after resize

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* test texelfetch

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* back to full buffer

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* print ogre log

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* codecheck

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fixing selection buffer mat script

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* try 1x1 buffer again

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* revert some test changes

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* uncomment tests

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* update scaling factor

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fix removing selection mat

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* update screenScalingFactor

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* minor tweak

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
#498)

- Add new param colorTexResolution to the selection buffer shader
- Implement the Metal equivalent of texelFetch in the shaders

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
* partial fix for emissive map

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* convert grayscale emissive to rgb

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* testing upload

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* upload data to gpu working

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* remove unused code

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* fix loading

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* style

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Dec 8, 2021
@chapulina chapulina changed the title 6 ➡️ 7 6 ➡️ 7 (main) Dec 8, 2021
@codecov
Copy link

codecov bot commented Dec 8, 2021

Codecov Report

Merging #507 (d9341b8) into main (66b565d) will decrease coverage by 0.07%.
The diff coverage is 19.04%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #507      +/-   ##
==========================================
- Coverage   54.16%   54.08%   -0.08%     
==========================================
  Files         203      203              
  Lines       20227    20266      +39     
==========================================
+ Hits        10955    10960       +5     
- Misses       9272     9306      +34     
Impacted Files Coverage Δ
ogre2/src/Ogre2Material.cc 84.30% <19.04%> (-7.84%) ⬇️

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 66b565d...d9341b8. Read the comment docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants