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

Merge pull request #21267 from akien-mga/color-grayscale 

Deprecate incorrect Color::gray()
This commit is contained in:
Rémi Verschelde 2018-08-21 20:29:56 +02:00 committed by GitHub
parent 44d75e3b6d 2969dffbe3
commit 28e9aedbdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/color.cpp
View File

@ -506,8 +506,11 @@ Color Color::from_hsv(float p_h, float p_s, float p_v, float p_a) {
return Color(m + r, m + g, m + b, p_a); return Color(m + r, m + g, m + b, p_a);
} }
// FIXME: Remove once Godot 3.1 has been released
float Color::gray() const { float Color::gray() const {
ERR_EXPLAIN("Color.gray() is deprecated and will be removed in a future version. Use Color.get_v() for a better grayscale approximation.");
WARN_DEPRECATED
return (r + g + b) / 3.0; return (r + g + b) / 3.0;
} }

4
core/image.cpp
View File

@ -2230,10 +2230,10 @@ void Image::set_pixel(int p_x, int p_y, const Color &p_color) {
switch (format) { switch (format) {
case FORMAT_L8: { case FORMAT_L8: {
ptr[ofs] = uint8_t(CLAMP(p_color.gray() * 255.0, 0, 255)); ptr[ofs] = uint8_t(CLAMP(p_color.get_v() * 255.0, 0, 255));
} break; } break;
case FORMAT_LA8: { case FORMAT_LA8: {
ptr[ofs * 2 + 0] = uint8_t(CLAMP(p_color.gray() * 255.0, 0, 255)); ptr[ofs * 2 + 0] = uint8_t(CLAMP(p_color.get_v() * 255.0, 0, 255));
ptr[ofs * 2 + 1] = uint8_t(CLAMP(p_color.a * 255.0, 0, 255)); ptr[ofs * 2 + 1] = uint8_t(CLAMP(p_color.a * 255.0, 0, 255));
} break; } break;
case FORMAT_R8: { case FORMAT_R8: {

5
modules/mono/glue/cs_files/Color.cs
View File

@ -258,11 +258,6 @@ namespace Godot
return res; return res;
} }
public float Gray()
{
return (r + g + b) / 3.0f;
}
public Color Inverted() public Color Inverted()
{ {
return new Color( return new Color(

2
scene/2d/collision_shape_2d.cpp
View File

@ -119,7 +119,7 @@ void CollisionShape2D::_notification(int p_what) {
Color draw_col = get_tree()->get_debug_collisions_color(); Color draw_col = get_tree()->get_debug_collisions_color();
if (disabled) { if (disabled) {
float g = draw_col.gray(); float g = draw_col.get_v();
draw_col.r = g; draw_col.r = g;
draw_col.g = g; draw_col.g = g;
draw_col.b = g; draw_col.b = g;