diff options
author | Danil Alexeev <danil@alexeev.xyz> | 2021-04-08 17:41:33 +0300 |
---|---|---|
committer | Danil Alexeev <danil@alexeev.xyz> | 2021-04-09 16:11:02 +0300 |
commit | e63976d4b2183388d488ae6e05f02f68f5ab04f4 (patch) | |
tree | a921e166925fe8df37399e55909c545be11d2368 /core | |
parent | 35066f39ff111ee0e9d4aba534bb08fc2d686156 (diff) |
Fix `Color::get_{r,g,b,a}8`
Closes #47022.
Diffstat (limited to 'core')
-rw-r--r-- | core/math/color.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/math/color.h b/core/math/color.h index 5eb8b1119a..e404d80c8a 100644 --- a/core/math/color.h +++ b/core/math/color.h @@ -197,13 +197,13 @@ struct Color { // For the binder. _FORCE_INLINE_ void set_r8(int32_t r8) { r = (CLAMP(r8, 0, 255) / 255.0); } - _FORCE_INLINE_ int32_t get_r8() const { return int32_t(CLAMP(r * 255.0, 0.0, 255.0)); } + _FORCE_INLINE_ int32_t get_r8() const { return int32_t(CLAMP(Math::round(r * 255.0f), 0.0f, 255.0f)); } _FORCE_INLINE_ void set_g8(int32_t g8) { g = (CLAMP(g8, 0, 255) / 255.0); } - _FORCE_INLINE_ int32_t get_g8() const { return int32_t(CLAMP(g * 255.0, 0.0, 255.0)); } + _FORCE_INLINE_ int32_t get_g8() const { return int32_t(CLAMP(Math::round(g * 255.0f), 0.0f, 255.0f)); } _FORCE_INLINE_ void set_b8(int32_t b8) { b = (CLAMP(b8, 0, 255) / 255.0); } - _FORCE_INLINE_ int32_t get_b8() const { return int32_t(CLAMP(b * 255.0, 0.0, 255.0)); } + _FORCE_INLINE_ int32_t get_b8() const { return int32_t(CLAMP(Math::round(b * 255.0f), 0.0f, 255.0f)); } _FORCE_INLINE_ void set_a8(int32_t a8) { a = (CLAMP(a8, 0, 255) / 255.0); } - _FORCE_INLINE_ int32_t get_a8() const { return int32_t(CLAMP(a * 255.0, 0.0, 255.0)); } + _FORCE_INLINE_ int32_t get_a8() const { return int32_t(CLAMP(Math::round(a * 255.0f), 0.0f, 255.0f)); } _FORCE_INLINE_ void set_h(float p_h) { set_hsv(p_h, get_s(), get_v()); } _FORCE_INLINE_ void set_s(float p_s) { set_hsv(get_h(), p_s, get_v()); } |