maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove deprecated Color::gray

Browse source 
It was marked to be removed in Godot 3.1.

Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
This commit is contained in:
Hanif Bin Ariffin 2019-09-23 20:01:26 -04:00 committed by Rémi Verschelde
parent 0c7fc80cc1
commit 7bc1dc828f
8 changed files with 1 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/color.cpp
View file

@ -508,13 +508,6 @@ Color Color::from_hsv(float p_h, float p_s, float p_v, float p_a) const {
return Color(m + r, m + g, m + b, p_a);
}
// FIXME: Remove once Godot 3.1 has been released
float Color::gray() const {
WARN_DEPRECATED_MSG("'Color.gray()' is deprecated and will be removed in a future version. Use 'Color.v' for a better grayscale approximation.");
return (r + g + b) / 3.0;
}
Color::operator String() const {
return rtos(r) + ", " + rtos(g) + ", " + rtos(b) + ", " + rtos(a);

1
core/color.h
View file

@ -56,7 +56,6 @@ struct Color {
uint64_t to_rgba64() const;
uint64_t to_argb64() const;
uint64_t to_abgr64() const;
float gray() const;
float get_h() const;
float get_s() const;
float get_v() const;

2
core/image.cpp
View file

@ -1715,7 +1715,7 @@ Error Image::generate_mipmap_roughness(RoughnessChannel p_roughness_channel, con
roughness = c.b;
} break;
case ROUGHNESS_CHANNEL_L: {
roughness = c.gray();
roughness = c.get_v();
} break;
case ROUGHNESS_CHANNEL_A: {
roughness = c.a;

2
core/variant_call.cpp
View file

@ -488,7 +488,6 @@ struct _VariantCall {
VCALL_LOCALMEM0R(Color, to_argb64);
VCALL_LOCALMEM0R(Color, to_abgr64);
VCALL_LOCALMEM0R(Color, to_rgba64);
VCALL_LOCALMEM0R(Color, gray);
VCALL_LOCALMEM0R(Color, inverted);
VCALL_LOCALMEM0R(Color, contrasted);
VCALL_LOCALMEM2R(Color, linear_interpolate);
@ -1737,7 +1736,6 @@ void register_variant_methods() {
ADDFUNC0R(COLOR, INT, Color, to_argb64, varray());
ADDFUNC0R(COLOR, INT, Color, to_abgr64, varray());
ADDFUNC0R(COLOR, INT, Color, to_rgba64, varray());
ADDFUNC0R(COLOR, REAL, Color, gray, varray());
ADDFUNC0R(COLOR, COLOR, Color, inverted, varray());
ADDFUNC0R(COLOR, COLOR, Color, contrasted, varray());
ADDFUNC2R(COLOR, COLOR, Color, linear_interpolate, COLOR, "b", REAL, "t", varray());

12
doc/classes/Color.xml
View file

@ -128,18 +128,6 @@
[/codeblock]
</description>
</method>
<method name="gray">
<return type="float">
</return>
<description>
Returns the color's grayscale representation.
The gray value is calculated as [code](r + g + b) / 3[/code].
[codeblock]
var c = Color(0.2, 0.45, 0.82)
var gray = c.gray() # A value of 0.466667
[/codeblock]
</description>
</method>
<method name="inverted">
<return type="Color">
</return>

5
modules/gdnative/gdnative/color.cpp
View file

@ -141,11 +141,6 @@ godot_int GDAPI godot_color_to_argb32(const godot_color *p_self) {
return self->to_argb32();
}
godot_real GDAPI godot_color_gray(const godot_color *p_self) {
const Color *self = (const Color *)p_self;
return self->gray();
}
godot_color GDAPI godot_color_inverted(const godot_color *p_self) {
godot_color dest;
const Color *self = (const Color *)p_self;

7
modules/gdnative/gdnative_api.json
View file

@ -578,13 +578,6 @@
["const godot_color *", "p_self"]
]
},
{
"name": "godot_color_gray",
"return_type": "godot_real",
"arguments": [
["const godot_color *", "p_self"]
]
},
{
"name": "godot_color_inverted",
"return_type": "godot_color",

2
modules/gdnative/include/gdnative/color.h
View file

@ -91,8 +91,6 @@ godot_int GDAPI godot_color_to_rgba64(const godot_color *p_self);
godot_int GDAPI godot_color_to_argb32(const godot_color *p_self);
godot_real GDAPI godot_color_gray(const godot_color *p_self);
godot_color GDAPI godot_color_inverted(const godot_color *p_self);
godot_color GDAPI godot_color_contrasted(const godot_color *p_self);