Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #738 from akien-mga/color-clarify-srgb-linear-conversions

pull/739/head
Rémi Verschelde 2022-04-13 14:41:29 +02:00 committed by GitHub
parent 60037decc3 24f5cd2d48
commit 6123a61a49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1474 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1516
godot-headers/extension_api.json
View File

File diff suppressed because it is too large Load Diff

4
include/godot_cpp/variant/color.hpp
View File

@ -171,14 +171,14 @@ public:
return res;
}
inline Color to_linear() const {
inline Color srgb_to_linear() const {
return Color(
r < (real_t)0.04045 ? r * (real_t)(1.0 / 12.92) : Math::pow((r + (real_t)0.055) * (real_t)(1.0 / (1.0 + 0.055)), (real_t)2.4),
g < (real_t)0.04045 ? g * (real_t)(1.0 / 12.92) : Math::pow((g + (real_t)0.055) * (real_t)(1.0 / (1.0 + 0.055)), (real_t)2.4),
b < (real_t)0.04045 ? b * (real_t)(1.0 / 12.92) : Math::pow((b + (real_t)0.055) * (real_t)(1.0 / (1.0 + 0.055)), (real_t)2.4),
a);
}
inline Color to_srgb() const {
inline Color linear_to_srgb() const {
return Color(
r < (real_t)0.0031308 ? (real_t)12.92 * r : (real_t)(1.0 + 0.055) * Math::pow(r, (real_t)(1.0 / 2.4)) - (real_t)0.055,
g < (real_t)0.0031308 ? (real_t)12.92 * g : (real_t)(1.0 + 0.055) * Math::pow(g, (real_t)(1.0 / 2.4)) - (real_t)0.055,