godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19654 from maksloboda/color-bug 

Invalid color picker values fixed
This commit is contained in:
Rémi Verschelde 2018-06-20 00:01:21 +02:00 committed by GitHub
parent ff01fd57bc 83b98785b3
commit fb5fc04230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/color.cpp
View File

@ -37,38 +37,38 @@
uint32_t Color::to_argb32() const { uint32_t Color::to_argb32() const {
uint32_t c = (uint8_t)(a * 255); uint32_t c = (uint8_t)Math::round(a * 255);
c <<= 8; c <<= 8;
c |= (uint8_t)(r * 255); c |= (uint8_t)Math::round(r * 255);
c <<= 8; c <<= 8;
c |= (uint8_t)(g * 255); c |= (uint8_t)Math::round(g * 255);
c <<= 8; c <<= 8;
c |= (uint8_t)(b * 255); c |= (uint8_t)Math::round(b * 255);
return c; return c;
} }
uint32_t Color::to_abgr32() const { uint32_t Color::to_abgr32() const {
uint32_t c = (uint8_t)(a * 255); uint32_t c = (uint8_t)Math::round(a * 255);
c <<= 8; c <<= 8;
c |= (uint8_t)(b * 255); c |= (uint8_t)Math::round(b * 255);
c <<= 8; c <<= 8;
c |= (uint8_t)(g * 255); c |= (uint8_t)Math::round(g * 255);
c <<= 8; c <<= 8;
c |= (uint8_t)(r * 255); c |= (uint8_t)Math::round(r * 255);
return c; return c;
} }
uint32_t Color::to_rgba32() const { uint32_t Color::to_rgba32() const {
uint32_t c = (uint8_t)(r * 255); uint32_t c = (uint8_t)Math::round(r * 255);
c <<= 8; c <<= 8;
c |= (uint8_t)(g * 255); c |= (uint8_t)Math::round(g * 255);
c <<= 8; c <<= 8;
c |= (uint8_t)(b * 255); c |= (uint8_t)Math::round(b * 255);
c <<= 8; c <<= 8;
c |= (uint8_t)(a * 255); c |= (uint8_t)Math::round(a * 255);
return c; return c;
} }
@ -368,7 +368,7 @@ Color Color::named(const String &p_name) {
String _to_hex(float p_val) { String _to_hex(float p_val) {
int v = p_val * 255; int v = Math::round(p_val * 255);
v = CLAMP(v, 0, 255); v = CLAMP(v, 0, 255);
String ret; String ret;