godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Relax the range hint for canvas layer properties

Browse Source
This commit is contained in:
Haoyu Qiu
2025-04-10 23:50:02 +08:00
parent 819bb61710
commit b2bd8e4d06
6 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/classes/CanvasLayer.xml
View File

@@ -54,6 +54,7 @@
<member name="layer" type="int" setter="set_layer" getter="get_layer" default="1"> <member name="layer" type="int" setter="set_layer" getter="get_layer" default="1">
Layer index for draw order. Lower values are drawn behind higher values. Layer index for draw order. Lower values are drawn behind higher values.
[b]Note:[/b] If multiple CanvasLayers have the same layer index, [CanvasItem] children of one CanvasLayer are drawn behind the [CanvasItem] children of the other CanvasLayer. Which CanvasLayer is drawn in front is non-deterministic. [b]Note:[/b] If multiple CanvasLayers have the same layer index, [CanvasItem] children of one CanvasLayer are drawn behind the [CanvasItem] children of the other CanvasLayer. Which CanvasLayer is drawn in front is non-deterministic.
[b]Note:[/b] The layer index should be between [constant RenderingServer.CANVAS_LAYER_MIN] and [constant RenderingServer.CANVAS_LAYER_MAX] (inclusive). Any other value will wrap around.
</member> </member>
<member name="offset" type="Vector2" setter="set_offset" getter="get_offset" default="Vector2(0, 0)"> <member name="offset" type="Vector2" setter="set_offset" getter="get_offset" default="Vector2(0, 0)">
The layer's base offset. The layer's base offset.

7
doc/classes/RenderingServer.xml
View File

@@ -3969,6 +3969,7 @@
<description> <description>
Sets the stacking order for a viewport's canvas. Sets the stacking order for a viewport's canvas.
[param layer] is the actual canvas layer, while [param sublayer] specifies the stacking order of the canvas among those in the same layer. [param layer] is the actual canvas layer, while [param sublayer] specifies the stacking order of the canvas among those in the same layer.
[b]Note:[/b] [param layer] should be between [constant CANVAS_LAYER_MIN] and [constant CANVAS_LAYER_MAX] (inclusive). Any other value will wrap around.
</description> </description>
</method> </method>
<method name="viewport_set_canvas_transform"> <method name="viewport_set_canvas_transform">
@@ -4466,6 +4467,12 @@
<constant name="CANVAS_ITEM_Z_MAX" value="4096"> <constant name="CANVAS_ITEM_Z_MAX" value="4096">
The maximum Z-layer for canvas items. The maximum Z-layer for canvas items.
</constant> </constant>
<constant name="CANVAS_LAYER_MIN" value="-2147483648">
The minimum canvas layer.
</constant>
<constant name="CANVAS_LAYER_MAX" value="2147483647">
The maximum canvas layer.
</constant>
<constant name="MAX_GLOW_LEVELS" value="7"> <constant name="MAX_GLOW_LEVELS" value="7">
The maximum number of glow levels that can be used with the glow post-processing effect. The maximum number of glow levels that can be used with the glow post-processing effect.
</constant> </constant>

4
scene/2d/light_2d.cpp
View File

@@ -310,8 +310,8 @@ void Light2D::_bind_methods() {
ADD_GROUP("Range", "range_"); ADD_GROUP("Range", "range_");
ADD_PROPERTY(PropertyInfo(Variant::INT, "range_z_min", PROPERTY_HINT_RANGE, itos(RS::CANVAS_ITEM_Z_MIN) + "," + itos(RS::CANVAS_ITEM_Z_MAX) + ",1"), "set_z_range_min", "get_z_range_min"); ADD_PROPERTY(PropertyInfo(Variant::INT, "range_z_min", PROPERTY_HINT_RANGE, itos(RS::CANVAS_ITEM_Z_MIN) + "," + itos(RS::CANVAS_ITEM_Z_MAX) + ",1"), "set_z_range_min", "get_z_range_min");
ADD_PROPERTY(PropertyInfo(Variant::INT, "range_z_max", PROPERTY_HINT_RANGE, itos(RS::CANVAS_ITEM_Z_MIN) + "," + itos(RS::CANVAS_ITEM_Z_MAX) + ",1"), "set_z_range_max", "get_z_range_max"); ADD_PROPERTY(PropertyInfo(Variant::INT, "range_z_max", PROPERTY_HINT_RANGE, itos(RS::CANVAS_ITEM_Z_MIN) + "," + itos(RS::CANVAS_ITEM_Z_MAX) + ",1"), "set_z_range_max", "get_z_range_max");
ADD_PROPERTY(PropertyInfo(Variant::INT, "range_layer_min", PROPERTY_HINT_RANGE, "-512,512,1"), "set_layer_range_min", "get_layer_range_min"); ADD_PROPERTY(PropertyInfo(Variant::INT, "range_layer_min", PROPERTY_HINT_RANGE, itos(RS::CANVAS_LAYER_MIN) + "," + itos(RS::CANVAS_LAYER_MAX) + ",1"), "set_layer_range_min", "get_layer_range_min");
ADD_PROPERTY(PropertyInfo(Variant::INT, "range_layer_max", PROPERTY_HINT_RANGE, "-512,512,1"), "set_layer_range_max", "get_layer_range_max"); ADD_PROPERTY(PropertyInfo(Variant::INT, "range_layer_max", PROPERTY_HINT_RANGE, itos(RS::CANVAS_LAYER_MIN) + "," + itos(RS::CANVAS_LAYER_MAX) + ",1"), "set_layer_range_max", "get_layer_range_max");
ADD_PROPERTY(PropertyInfo(Variant::INT, "range_item_cull_mask", PROPERTY_HINT_LAYERS_2D_RENDER), "set_item_cull_mask", "get_item_cull_mask"); ADD_PROPERTY(PropertyInfo(Variant::INT, "range_item_cull_mask", PROPERTY_HINT_LAYERS_2D_RENDER), "set_item_cull_mask", "get_item_cull_mask");
ADD_GROUP("Shadow", "shadow_"); ADD_GROUP("Shadow", "shadow_");

2
scene/main/canvas_layer.cpp
View File

@@ -344,7 +344,7 @@ void CanvasLayer::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_canvas"), &CanvasLayer::get_canvas); ClassDB::bind_method(D_METHOD("get_canvas"), &CanvasLayer::get_canvas);
ADD_GROUP("Layer", ""); ADD_GROUP("Layer", "");
ADD_PROPERTY(PropertyInfo(Variant::INT, "layer", PROPERTY_HINT_RANGE, "-128,128,1"), "set_layer", "get_layer"); ADD_PROPERTY(PropertyInfo(Variant::INT, "layer", PROPERTY_HINT_RANGE, itos(RS::CANVAS_LAYER_MIN) + "," + itos(RS::CANVAS_LAYER_MAX) + ",1"), "set_layer", "get_layer");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "visible"), "set_visible", "is_visible"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "visible"), "set_visible", "is_visible");
ADD_GROUP("Transform", ""); ADD_GROUP("Transform", "");
ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "offset", PROPERTY_HINT_NONE, "suffix:px"), "set_offset", "get_offset"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "offset", PROPERTY_HINT_NONE, "suffix:px"), "set_offset", "get_offset");

2
servers/rendering_server.cpp
View File

@@ -2243,6 +2243,8 @@ void RenderingServer::_bind_methods() {
BIND_CONSTANT(ARRAY_WEIGHTS_SIZE); BIND_CONSTANT(ARRAY_WEIGHTS_SIZE);
BIND_CONSTANT(CANVAS_ITEM_Z_MIN); BIND_CONSTANT(CANVAS_ITEM_Z_MIN);
BIND_CONSTANT(CANVAS_ITEM_Z_MAX); BIND_CONSTANT(CANVAS_ITEM_Z_MAX);
BIND_CONSTANT(CANVAS_LAYER_MIN);
BIND_CONSTANT(CANVAS_LAYER_MAX);
BIND_CONSTANT(MAX_GLOW_LEVELS); BIND_CONSTANT(MAX_GLOW_LEVELS);
BIND_CONSTANT(MAX_CURSORS); BIND_CONSTANT(MAX_CURSORS);
BIND_CONSTANT(MAX_2D_DIRECTIONAL_LIGHTS); BIND_CONSTANT(MAX_2D_DIRECTIONAL_LIGHTS);

2
servers/rendering_server.h
View File

@@ -100,6 +100,8 @@ public:
ARRAY_WEIGHTS_SIZE = 4, ARRAY_WEIGHTS_SIZE = 4,
CANVAS_ITEM_Z_MIN = -4096, CANVAS_ITEM_Z_MIN = -4096,
CANVAS_ITEM_Z_MAX = 4096, CANVAS_ITEM_Z_MAX = 4096,
CANVAS_LAYER_MIN = -2147483648,
CANVAS_LAYER_MAX = 2147483647,
MAX_GLOW_LEVELS = 7, MAX_GLOW_LEVELS = 7,
MAX_CURSORS = 8, MAX_CURSORS = 8,
MAX_2D_DIRECTIONAL_LIGHTS = 8, MAX_2D_DIRECTIONAL_LIGHTS = 8,