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

Merge 4 -> 5 #424

Merged
merged 9 commits into from
Sep 24, 2021
Merged

Merge 4 -> 5 #424

merged 9 commits into from
Sep 24, 2021

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Sep 24, 2021

➡️ Forward port

Port ign-rendering4 to ign-rendering4

Branch comparison: ign-rendering5...ign-rendering4

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

iche033 and others added 9 commits September 15, 2021 11:35
* fix particle randomness

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

* fix for lidar

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

* pass rand to shaders

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

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
* testing using selection buffer for rayquery

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

* remove commented out code

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

* codecheck

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

* style

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

* Use selection buffer in ray question (ogre2) - part 2 (#383)

* extend selection buffer to return depth

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

* selection buffer depth working

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

* cleanup

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

* style

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

* add check for mac

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

* Add shaders

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

* enable mac test

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

* style

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

* fix bad merge

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

* fix drag and drop

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

* fix utils test

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

* fix doxy

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

* remove comment

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
* bump version and update changelog

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

* update changelog

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
* Avoid warning on missing components when detecting ogre 1.10

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Sep 24, 2021
@codecov
Copy link

codecov bot commented Sep 24, 2021

Codecov Report

Merging #424 (f118fc2) into ign-rendering5 (f83dc91) will decrease coverage by 1.68%.
The diff coverage is 8.48%.

Impacted file tree graph

@@                Coverage Diff                 @@
##           ign-rendering5     #424      +/-   ##
==================================================
- Coverage           57.77%   56.08%   -1.69%     
==================================================
  Files                 161      161              
  Lines               15947    16085     +138     
==================================================
- Hits                 9213     9021     -192     
- Misses               6734     7064     +330     
Impacted Files Coverage Δ
ogre2/src/Ogre2Camera.cc 71.32% <0.00%> (-15.25%) ⬇️
ogre2/src/Ogre2SelectionBuffer.cc 0.00% <0.00%> (-79.69%) ⬇️
ogre2/src/Ogre2RayQuery.cc 73.46% <37.50%> (-17.44%) ⬇️
ogre2/src/Ogre2ParticleNoiseListener.cc 93.18% <100.00%> (+0.32%) ⬆️
ogre2/src/Ogre2MaterialSwitcher.cc 0.00% <0.00%> (-90.00%) ⬇️
src/Utils.cc 74.73% <0.00%> (-10.53%) ⬇️
src/base/BaseScene.cc 72.78% <0.00%> (-2.18%) ⬇️
...e/ignition/rendering/base/BaseGaussianNoisePass.hh 100.00% <0.00%> (+3.33%) ⬆️

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 f83dc91...f118fc2. Read the comment docs.

@chapulina
Copy link
Contributor

I think the ABI checker failure is a mistake?

@iche033
Copy link
Contributor Author

iche033 commented Sep 24, 2021

It's complaining about IGN_RENDERING_RESOURCE_PATH which is not touched by this PR and it's also pointing to a path containing ign-rendering4 directory so it could be an issue with the abi checker CI machine. I just restarted another build

@iche033 iche033 merged commit 421f381 into ign-rendering5 Sep 24, 2021
@iche033 iche033 deleted the merge_4_5_09232021 branch September 24, 2021 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants