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 5 -> main #584

Merged
merged 26 commits into from
Mar 13, 2024
Merged

Merge 5 -> main #584

merged 26 commits into from
Mar 13, 2024

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Mar 13, 2024

➡️ Forward port

Port gz-common5 to main

Branch comparison: main...gz-common5

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

zaidhaan and others added 26 commits May 22, 2023 08:42
Signed-off-by: Angelo Elias Dal Zotto <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
* fix: Don't recursively call init if log directories can not be created.

If there is no permission to create the log directories, the FileLogger
will call itself recutsive, as is used ignerr for logging the error,
which will call FileLogger::Init again.

This commit fixed this, by using std::cerr for the log output in
FileLogger::Init.


Signed-off-by: Janosch Machowinski <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
* Use on `push` only on stable branches to avoid duplicate runs
* Update project automation

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
* Backwards compatible assimp texture name fix

Signed-off-by: Luca Della Vedova <[email protected]>

* Fix test

Signed-off-by: Luca Della Vedova <[email protected]>

---------

Signed-off-by: Luca Della Vedova <[email protected]>
Merge ign-common3 ➡️  ign-common4
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-common3 ➡️  ign-common4
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-common4 ➡️  gz-common5
The default behavior of pkg-config seems to be an exact version match.

Signed-off-by: Scott K Logan <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
The issue is that if a pixel's color value in 8 bit format is close
1 (out of 255), when assigned to `math::Color`, `math::Color::Clamp`
assumes it to be in the floating point range [0.0 - 1.0] instead of
8 bit unsigned range of [0 - 255]. The fix here is to convert colors
to floating point at the source instead of relying on `Color::Clamp`.

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Copy link

codecov bot commented Mar 13, 2024

Codecov Report

Attention: Patch coverage is 92.20779% with 6 lines in your changes are missing coverage. Please review.

Project coverage is 83.66%. Comparing base (37d6360) to head (38dd565).

Files Patch % Lines
graphics/src/AssimpLoader.cc 89.18% 4 Missing ⚠️
graphics/src/Image.cc 90.90% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #584      +/-   ##
==========================================
+ Coverage   83.64%   83.66%   +0.02%     
==========================================
  Files          79       79              
  Lines       10214    10264      +50     
==========================================
+ Hits         8543     8587      +44     
- Misses       1671     1677       +6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@iche033 iche033 merged commit e390fff into main Mar 13, 2024
11 checks passed
@iche033 iche033 deleted the merge_5_main_20240313 branch March 13, 2024 22:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

10 participants