godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add a square fill mode to GradientTexture2D

Browse Source
This commit is contained in:
VolTer
2023-04-17 02:56:25 +02:00
parent 68b8156fe3
commit 0a4a1bc4b8
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/classes/GradientTexture2D.xml
View File

@@ -42,6 +42,9 @@
<constant name="FILL_RADIAL" value="1" enum="Fill"> <constant name="FILL_RADIAL" value="1" enum="Fill">
The colors are linearly interpolated in a circular pattern. The colors are linearly interpolated in a circular pattern.
</constant> </constant>
<constant name="FILL_SQUARE" value="2" enum="Fill">
The colors are linearly interpolated in a square pattern.
</constant>
<constant name="REPEAT_NONE" value="0" enum="Repeat"> <constant name="REPEAT_NONE" value="0" enum="Repeat">
The gradient fill is restricted to the range defined by [member fill_from] to [member fill_to] offsets. The gradient fill is restricted to the range defined by [member fill_from] to [member fill_to] offsets.
</constant> </constant>

5
scene/resources/texture.cpp
View File

@@ -2427,6 +2427,8 @@ float GradientTexture2D::_get_gradient_offset_at(int x, int y) const {
} }
} else if (fill == Fill::FILL_RADIAL) { } else if (fill == Fill::FILL_RADIAL) {
ofs = (pos - fill_from).length() / (fill_to - fill_from).length(); ofs = (pos - fill_from).length() / (fill_to - fill_from).length();
} else if (fill == Fill::FILL_SQUARE) {
ofs = MAX(Math::abs(pos.x - fill_from.x), Math::abs(pos.y - fill_from.y)) / MAX(Math::abs(fill_to.x - fill_from.x), Math::abs(fill_to.y - fill_from.y));
} }
if (repeat == Repeat::REPEAT_NONE) { if (repeat == Repeat::REPEAT_NONE) {
ofs = CLAMP(ofs, 0.0, 1.0); ofs = CLAMP(ofs, 0.0, 1.0);
@@ -2555,7 +2557,7 @@ void GradientTexture2D::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_hdr"), "set_use_hdr", "is_using_hdr"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_hdr"), "set_use_hdr", "is_using_hdr");
ADD_GROUP("Fill", "fill_"); ADD_GROUP("Fill", "fill_");
ADD_PROPERTY(PropertyInfo(Variant::INT, "fill", PROPERTY_HINT_ENUM, "Linear,Radial"), "set_fill", "get_fill"); ADD_PROPERTY(PropertyInfo(Variant::INT, "fill", PROPERTY_HINT_ENUM, "Linear,Radial,Square"), "set_fill", "get_fill");
ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "fill_from"), "set_fill_from", "get_fill_from"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "fill_from"), "set_fill_from", "get_fill_from");
ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "fill_to"), "set_fill_to", "get_fill_to"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "fill_to"), "set_fill_to", "get_fill_to");
@@ -2564,6 +2566,7 @@ void GradientTexture2D::_bind_methods() {
BIND_ENUM_CONSTANT(FILL_LINEAR); BIND_ENUM_CONSTANT(FILL_LINEAR);
BIND_ENUM_CONSTANT(FILL_RADIAL); BIND_ENUM_CONSTANT(FILL_RADIAL);
BIND_ENUM_CONSTANT(FILL_SQUARE);
BIND_ENUM_CONSTANT(REPEAT_NONE); BIND_ENUM_CONSTANT(REPEAT_NONE);
BIND_ENUM_CONSTANT(REPEAT); BIND_ENUM_CONSTANT(REPEAT);

1
scene/resources/texture.h
View File

@@ -829,6 +829,7 @@ public:
enum Fill { enum Fill {
FILL_LINEAR, FILL_LINEAR,
FILL_RADIAL, FILL_RADIAL,
FILL_SQUARE,
}; };
enum Repeat { enum Repeat {
REPEAT_NONE, REPEAT_NONE,