diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-07 20:52:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-07 20:52:32 +0200 |
| commit | d52a79ad2288f815f935f40a089b5fe0887188a6 (patch) | |
| tree | 6ce9c2bd823999d92b5e51f91b787a4e170da2d4 /core/variant | |
| parent | 28cf97746f7fbf3e2bf6bb96c1b48a72f2d738d2 (diff) | |
| parent | 1b776a6e7a5046d337933f8504699d1c4244289e (diff) | |
Merge pull request #59786 from V-Sekai/ok_color
Allow picking similar colours using OKHSL.
Diffstat (limited to 'core/variant')
| -rw-r--r-- | core/variant/variant_call.cpp | 2 | ||||
| -rw-r--r-- | core/variant/variant_setget.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp index 027517f8dc..741d3e5b8f 100644 --- a/core/variant/variant_call.cpp +++ b/core/variant/variant_call.cpp @@ -1675,6 +1675,8 @@ static void _register_variant_builtin_methods() { bind_static_method(Color, get_named_color, sarray("idx"), varray()); bind_static_method(Color, from_string, sarray("str", "default"), varray()); bind_static_method(Color, from_hsv, sarray("h", "s", "v", "alpha"), varray(1.0)); + bind_static_method(Color, from_ok_hsl, sarray("h", "s", "l", "alpha"), varray(1.0)); + bind_static_method(Color, from_rgbe9995, sarray("rgbe"), varray()); /* RID */ diff --git a/core/variant/variant_setget.h b/core/variant/variant_setget.h index 3b95f0531b..bc4dc4b408 100644 --- a/core/variant/variant_setget.h +++ b/core/variant/variant_setget.h @@ -329,4 +329,8 @@ SETGET_NUMBER_STRUCT_FUNC(Color, double, h, set_h, get_h) SETGET_NUMBER_STRUCT_FUNC(Color, double, s, set_s, get_s) SETGET_NUMBER_STRUCT_FUNC(Color, double, v, set_v, get_v) +SETGET_NUMBER_STRUCT_FUNC(Color, double, ok_hsl_h, set_ok_hsl_h, get_ok_hsl_h) +SETGET_NUMBER_STRUCT_FUNC(Color, double, ok_hsl_s, set_ok_hsl_s, get_ok_hsl_s) +SETGET_NUMBER_STRUCT_FUNC(Color, double, ok_hsl_l, set_ok_hsl_l, get_ok_hsl_l) + #endif // VARIANT_SETGET_H |