From cf1ae1b8a11628f095455545b2cbff17c574ac5c Mon Sep 17 00:00:00 2001 From: RedMser Date: Wed, 5 Jul 2023 15:41:44 +0200 Subject: [PATCH] Update Node::get_configuration_warnings signature --- modules/multiplayer/multiplayer_spawner.cpp | 4 ++-- modules/multiplayer/multiplayer_spawner.h | 2 +- modules/multiplayer/multiplayer_synchronizer.cpp | 4 ++-- modules/multiplayer/multiplayer_synchronizer.h | 2 +- scene/2d/animated_sprite_2d.cpp | 4 ++-- scene/2d/animated_sprite_2d.h | 2 +- scene/2d/canvas_modulate.cpp | 4 ++-- scene/2d/canvas_modulate.h | 2 +- scene/2d/collision_object_2d.cpp | 4 ++-- scene/2d/collision_object_2d.h | 2 +- scene/2d/collision_polygon_2d.cpp | 4 ++-- scene/2d/collision_polygon_2d.h | 2 +- scene/2d/collision_shape_2d.cpp | 4 ++-- scene/2d/collision_shape_2d.h | 2 +- scene/2d/cpu_particles_2d.cpp | 4 ++-- scene/2d/cpu_particles_2d.h | 2 +- scene/2d/gpu_particles_2d.cpp | 4 ++-- scene/2d/gpu_particles_2d.h | 2 +- scene/2d/joint_2d.cpp | 4 ++-- scene/2d/joint_2d.h | 2 +- scene/2d/light_2d.cpp | 9 ++++++--- scene/2d/light_2d.h | 2 +- scene/2d/light_occluder_2d.cpp | 4 ++-- scene/2d/light_occluder_2d.h | 2 +- scene/2d/navigation_agent_2d.cpp | 4 ++-- scene/2d/navigation_agent_2d.h | 2 +- scene/2d/navigation_link_2d.cpp | 4 ++-- scene/2d/navigation_link_2d.h | 2 +- scene/2d/navigation_region_2d.cpp | 4 ++-- scene/2d/navigation_region_2d.h | 2 +- scene/2d/parallax_layer.cpp | 4 ++-- scene/2d/parallax_layer.h | 2 +- scene/2d/path_2d.cpp | 4 ++-- scene/2d/path_2d.h | 2 +- scene/2d/physical_bone_2d.cpp | 4 ++-- scene/2d/physical_bone_2d.h | 2 +- scene/2d/physics_body_2d.cpp | 4 ++-- scene/2d/physics_body_2d.h | 2 +- scene/2d/remote_transform_2d.cpp | 4 ++-- scene/2d/remote_transform_2d.h | 2 +- scene/2d/shape_cast_2d.cpp | 4 ++-- scene/2d/shape_cast_2d.h | 2 +- scene/2d/skeleton_2d.cpp | 4 ++-- scene/2d/skeleton_2d.h | 2 +- scene/2d/tile_map.cpp | 4 ++-- scene/2d/tile_map.h | 2 +- scene/3d/bone_attachment_3d.cpp | 4 ++-- scene/3d/bone_attachment_3d.h | 2 +- scene/3d/collision_object_3d.cpp | 4 ++-- scene/3d/collision_object_3d.h | 2 +- scene/3d/collision_polygon_3d.cpp | 4 ++-- scene/3d/collision_polygon_3d.h | 2 +- scene/3d/collision_shape_3d.cpp | 4 ++-- scene/3d/collision_shape_3d.h | 2 +- scene/3d/cpu_particles_3d.cpp | 4 ++-- scene/3d/cpu_particles_3d.h | 2 +- scene/3d/decal.cpp | 4 ++-- scene/3d/decal.h | 2 +- scene/3d/fog_volume.cpp | 4 ++-- scene/3d/fog_volume.h | 2 +- scene/3d/gpu_particles_3d.cpp | 4 ++-- scene/3d/gpu_particles_3d.h | 2 +- scene/3d/gpu_particles_collision_3d.cpp | 4 ++-- scene/3d/gpu_particles_collision_3d.h | 2 +- scene/3d/joint_3d.cpp | 4 ++-- scene/3d/joint_3d.h | 2 +- scene/3d/light_3d.cpp | 12 ++++++------ scene/3d/light_3d.h | 6 +++--- scene/3d/lightmap_gi.cpp | 4 ++-- scene/3d/lightmap_gi.h | 2 +- scene/3d/navigation_agent_3d.cpp | 4 ++-- scene/3d/navigation_agent_3d.h | 2 +- scene/3d/navigation_link_3d.cpp | 4 ++-- scene/3d/navigation_link_3d.h | 2 +- scene/3d/navigation_region_3d.cpp | 4 ++-- scene/3d/navigation_region_3d.h | 2 +- scene/3d/occluder_instance_3d.cpp | 4 ++-- scene/3d/occluder_instance_3d.h | 2 +- scene/3d/path_3d.cpp | 4 ++-- scene/3d/path_3d.h | 2 +- scene/3d/physics_body_3d.cpp | 4 ++-- scene/3d/physics_body_3d.h | 2 +- scene/3d/reflection_probe.cpp | 4 ++-- scene/3d/reflection_probe.h | 2 +- scene/3d/remote_transform_3d.cpp | 4 ++-- scene/3d/remote_transform_3d.h | 2 +- scene/3d/shape_cast_3d.cpp | 4 ++-- scene/3d/shape_cast_3d.h | 2 +- scene/3d/soft_body_3d.cpp | 4 ++-- scene/3d/soft_body_3d.h | 2 +- scene/3d/sprite_3d.cpp | 4 ++-- scene/3d/sprite_3d.h | 2 +- scene/3d/vehicle_body_3d.cpp | 4 ++-- scene/3d/vehicle_body_3d.h | 2 +- scene/3d/visible_on_screen_notifier_3d.cpp | 4 ++-- scene/3d/visible_on_screen_notifier_3d.h | 2 +- scene/3d/visual_instance_3d.cpp | 4 ++-- scene/3d/visual_instance_3d.h | 2 +- scene/3d/voxel_gi.cpp | 4 ++-- scene/3d/voxel_gi.h | 2 +- scene/3d/world_environment.cpp | 4 ++-- scene/3d/world_environment.h | 2 +- scene/3d/xr_nodes.cpp | 12 ++++++------ scene/3d/xr_nodes.h | 6 +++--- scene/animation/animation_tree.cpp | 4 ++-- scene/animation/animation_tree.h | 2 +- scene/gui/base_button.cpp | 4 ++-- scene/gui/base_button.h | 2 +- scene/gui/container.cpp | 4 ++-- scene/gui/container.h | 2 +- scene/gui/control.cpp | 6 +++--- scene/gui/control.h | 2 +- scene/gui/graph_edit.cpp | 4 ++-- scene/gui/graph_edit.h | 2 +- scene/gui/label.cpp | 4 ++-- scene/gui/label.h | 2 +- scene/gui/range.cpp | 4 ++-- scene/gui/range.h | 2 +- scene/gui/scroll_container.cpp | 4 ++-- scene/gui/scroll_container.h | 2 +- scene/gui/subviewport_container.cpp | 4 ++-- scene/gui/subviewport_container.h | 2 +- scene/main/missing_node.cpp | 4 ++-- scene/main/missing_node.h | 2 +- scene/main/shader_globals_override.cpp | 4 ++-- scene/main/shader_globals_override.h | 2 +- scene/main/timer.cpp | 4 ++-- scene/main/timer.h | 2 +- scene/main/viewport.cpp | 6 +++--- scene/main/viewport.h | 2 +- 130 files changed, 213 insertions(+), 210 deletions(-) diff --git a/modules/multiplayer/multiplayer_spawner.cpp b/modules/multiplayer/multiplayer_spawner.cpp index 6c6aa283447154..666a3baadcc1ca 100644 --- a/modules/multiplayer/multiplayer_spawner.cpp +++ b/modules/multiplayer/multiplayer_spawner.cpp @@ -87,8 +87,8 @@ void MultiplayerSpawner::_get_property_list(List *p_list) const { } #endif -PackedStringArray MultiplayerSpawner::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array MultiplayerSpawner::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (spawn_path.is_empty() || !has_node(spawn_path)) { warnings.push_back(RTR("A valid NodePath must be set in the \"Spawn Path\" property in order for MultiplayerSpawner to be able to spawn Nodes.")); diff --git a/modules/multiplayer/multiplayer_spawner.h b/modules/multiplayer/multiplayer_spawner.h index 0e94b781eaae2b..6cd2946df78ec2 100644 --- a/modules/multiplayer/multiplayer_spawner.h +++ b/modules/multiplayer/multiplayer_spawner.h @@ -91,7 +91,7 @@ class MultiplayerSpawner : public Node { void _get_property_list(List *p_list) const; #endif public: - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; Node *get_spawn_node() const { return spawn_node.is_valid() ? Object::cast_to(ObjectDB::get_instance(spawn_node)) : nullptr; diff --git a/modules/multiplayer/multiplayer_synchronizer.cpp b/modules/multiplayer/multiplayer_synchronizer.cpp index e5207fdae2579d..0b4c674b865ee9 100644 --- a/modules/multiplayer/multiplayer_synchronizer.cpp +++ b/modules/multiplayer/multiplayer_synchronizer.cpp @@ -138,8 +138,8 @@ bool MultiplayerSynchronizer::update_inbound_sync_time(uint16_t p_network_time) return true; } -PackedStringArray MultiplayerSynchronizer::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array MultiplayerSynchronizer::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (root_path.is_empty() || !has_node(root_path)) { warnings.push_back(RTR("A valid NodePath must be set in the \"Root Path\" property in order for MultiplayerSynchronizer to be able to synchronize properties.")); diff --git a/modules/multiplayer/multiplayer_synchronizer.h b/modules/multiplayer/multiplayer_synchronizer.h index 7b77e691d16d92..859e3006f829aa 100644 --- a/modules/multiplayer/multiplayer_synchronizer.h +++ b/modules/multiplayer/multiplayer_synchronizer.h @@ -90,7 +90,7 @@ class MultiplayerSynchronizer : public Node { bool update_outbound_sync_time(uint64_t p_usec); bool update_inbound_sync_time(uint16_t p_network_time); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; void set_replication_interval(double p_interval); double get_replication_interval() const; diff --git a/scene/2d/animated_sprite_2d.cpp b/scene/2d/animated_sprite_2d.cpp index 7de6219b10397a..2cb0b7f80e80b0 100644 --- a/scene/2d/animated_sprite_2d.cpp +++ b/scene/2d/animated_sprite_2d.cpp @@ -552,8 +552,8 @@ StringName AnimatedSprite2D::get_animation() const { return animation; } -PackedStringArray AnimatedSprite2D::get_configuration_warnings() const { - PackedStringArray warnings = Node2D::get_configuration_warnings(); +Array AnimatedSprite2D::get_configuration_warnings() const { + Array warnings = Node2D::get_configuration_warnings(); if (frames.is_null()) { warnings.push_back(RTR("A SpriteFrames resource must be created or set in the \"Frames\" property in order for AnimatedSprite2D to display frames.")); } diff --git a/scene/2d/animated_sprite_2d.h b/scene/2d/animated_sprite_2d.h index ac53bd26eede86..1f70f1af81cce1 100644 --- a/scene/2d/animated_sprite_2d.h +++ b/scene/2d/animated_sprite_2d.h @@ -125,7 +125,7 @@ class AnimatedSprite2D : public Node2D { void set_flip_v(bool p_flip); bool is_flipped_v() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; virtual void get_argument_options(const StringName &p_function, int p_idx, List *r_options) const override; AnimatedSprite2D(); diff --git a/scene/2d/canvas_modulate.cpp b/scene/2d/canvas_modulate.cpp index 7dd2e75f097421..65bf3b328a8c8a 100644 --- a/scene/2d/canvas_modulate.cpp +++ b/scene/2d/canvas_modulate.cpp @@ -78,8 +78,8 @@ Color CanvasModulate::get_color() const { return color; } -PackedStringArray CanvasModulate::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array CanvasModulate::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (is_visible_in_tree() && is_inside_tree()) { List nodes; diff --git a/scene/2d/canvas_modulate.h b/scene/2d/canvas_modulate.h index 3b11cf71f1903d..46adf4a19b9b0c 100644 --- a/scene/2d/canvas_modulate.h +++ b/scene/2d/canvas_modulate.h @@ -46,7 +46,7 @@ class CanvasModulate : public Node2D { void set_color(const Color &p_color); Color get_color() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; CanvasModulate(); ~CanvasModulate(); diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp index ab42c52913b484..197e917f42d0d7 100644 --- a/scene/2d/collision_object_2d.cpp +++ b/scene/2d/collision_object_2d.cpp @@ -582,8 +582,8 @@ void CollisionObject2D::_update_pickable() { } } -PackedStringArray CollisionObject2D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array CollisionObject2D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (shapes.is_empty()) { warnings.push_back(RTR("This node has no shape, so it can't collide or interact with other objects.\nConsider adding a CollisionShape2D or CollisionPolygon2D as a child to define its shape.")); diff --git a/scene/2d/collision_object_2d.h b/scene/2d/collision_object_2d.h index 88429b145d05a5..50512f3cd553de 100644 --- a/scene/2d/collision_object_2d.h +++ b/scene/2d/collision_object_2d.h @@ -164,7 +164,7 @@ class CollisionObject2D : public Node2D { void set_pickable(bool p_enabled); bool is_pickable() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; _FORCE_INLINE_ RID get_rid() const { return rid; } diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index d2f71eca9d614c..cfbdf65776b002 100644 --- a/scene/2d/collision_polygon_2d.cpp +++ b/scene/2d/collision_polygon_2d.cpp @@ -232,8 +232,8 @@ bool CollisionPolygon2D::_edit_is_selected_on_click(const Point2 &p_point, doubl } #endif -PackedStringArray CollisionPolygon2D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array CollisionPolygon2D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!Object::cast_to(get_parent())) { warnings.push_back(RTR("CollisionPolygon2D only serves to provide a collision shape to a CollisionObject2D derived node. Please only use it as a child of Area2D, StaticBody2D, RigidBody2D, CharacterBody2D, etc. to give them a shape.")); diff --git a/scene/2d/collision_polygon_2d.h b/scene/2d/collision_polygon_2d.h index f1ee30babeb637..cbedc718d88eb0 100644 --- a/scene/2d/collision_polygon_2d.h +++ b/scene/2d/collision_polygon_2d.h @@ -77,7 +77,7 @@ class CollisionPolygon2D : public Node2D { void set_polygon(const Vector &p_polygon); Vector get_polygon() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; void set_disabled(bool p_disabled); bool is_disabled() const; diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp index 10fc7ef5b2d893..3700c4b1f508dd 100644 --- a/scene/2d/collision_shape_2d.cpp +++ b/scene/2d/collision_shape_2d.cpp @@ -173,8 +173,8 @@ bool CollisionShape2D::_edit_is_selected_on_click(const Point2 &p_point, double return shape->_edit_is_selected_on_click(p_point, p_tolerance); } -PackedStringArray CollisionShape2D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array CollisionShape2D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); CollisionObject2D *col_object = Object::cast_to(get_parent()); if (col_object == nullptr) { diff --git a/scene/2d/collision_shape_2d.h b/scene/2d/collision_shape_2d.h index 3e13dd698c19cf..18f16269c0f637 100644 --- a/scene/2d/collision_shape_2d.h +++ b/scene/2d/collision_shape_2d.h @@ -80,7 +80,7 @@ class CollisionShape2D : public Node2D { void set_debug_color(const Color &p_color); Color get_debug_color() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; CollisionShape2D(); }; diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp index 115104adff8b87..d3d6d9c7063011 100644 --- a/scene/2d/cpu_particles_2d.cpp +++ b/scene/2d/cpu_particles_2d.cpp @@ -242,8 +242,8 @@ bool CPUParticles2D::get_fractional_delta() const { return fractional_delta; } -PackedStringArray CPUParticles2D::get_configuration_warnings() const { - PackedStringArray warnings = Node2D::get_configuration_warnings(); +Array CPUParticles2D::get_configuration_warnings() const { + Array warnings = Node2D::get_configuration_warnings(); CanvasItemMaterial *mat = Object::cast_to(get_material().ptr()); diff --git a/scene/2d/cpu_particles_2d.h b/scene/2d/cpu_particles_2d.h index d4ff999459476a..2fe0352d87ea4d 100644 --- a/scene/2d/cpu_particles_2d.h +++ b/scene/2d/cpu_particles_2d.h @@ -282,7 +282,7 @@ class CPUParticles2D : public Node2D { void set_gravity(const Vector2 &p_gravity); Vector2 get_gravity() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; void restart(); diff --git a/scene/2d/gpu_particles_2d.cpp b/scene/2d/gpu_particles_2d.cpp index 078a73c5836943..642ca1269d4bdf 100644 --- a/scene/2d/gpu_particles_2d.cpp +++ b/scene/2d/gpu_particles_2d.cpp @@ -297,8 +297,8 @@ bool GPUParticles2D::get_interpolate() const { return interpolate; } -PackedStringArray GPUParticles2D::get_configuration_warnings() const { - PackedStringArray warnings = Node2D::get_configuration_warnings(); +Array GPUParticles2D::get_configuration_warnings() const { + Array warnings = Node2D::get_configuration_warnings(); if (process_material.is_null()) { warnings.push_back(RTR("A material to process the particles is not assigned, so no behavior is imprinted.")); diff --git a/scene/2d/gpu_particles_2d.h b/scene/2d/gpu_particles_2d.h index e518ffec6f1ee5..e78da36c280a3e 100644 --- a/scene/2d/gpu_particles_2d.h +++ b/scene/2d/gpu_particles_2d.h @@ -145,7 +145,7 @@ class GPUParticles2D : public Node2D { void set_texture(const Ref &p_texture); Ref get_texture() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; void set_sub_emitter(const NodePath &p_path); NodePath get_sub_emitter() const; diff --git a/scene/2d/joint_2d.cpp b/scene/2d/joint_2d.cpp index ce427d47aa9191..06afb324bda5f0 100644 --- a/scene/2d/joint_2d.cpp +++ b/scene/2d/joint_2d.cpp @@ -212,8 +212,8 @@ bool Joint2D::get_exclude_nodes_from_collision() const { return exclude_from_collision; } -PackedStringArray Joint2D::get_configuration_warnings() const { - PackedStringArray warnings = Node2D::get_configuration_warnings(); +Array Joint2D::get_configuration_warnings() const { + Array warnings = Node2D::get_configuration_warnings(); if (!warning.is_empty()) { warnings.push_back(warning); diff --git a/scene/2d/joint_2d.h b/scene/2d/joint_2d.h index b23fd8028d493b..f1caa30f35c0fd 100644 --- a/scene/2d/joint_2d.h +++ b/scene/2d/joint_2d.h @@ -62,7 +62,7 @@ class Joint2D : public Node2D { _FORCE_INLINE_ bool is_configured() const { return configured; } public: - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; void set_node_a(const NodePath &p_node_a); NodePath get_node_a() const; diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp index 15b638ed92d4b4..e2e995608f832f 100644 --- a/scene/2d/light_2d.cpp +++ b/scene/2d/light_2d.cpp @@ -401,11 +401,14 @@ Vector2 PointLight2D::get_texture_offset() const { return texture_offset; } -PackedStringArray PointLight2D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array PointLight2D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!texture.is_valid()) { - warnings.push_back(RTR("A texture with the shape of the light must be supplied to the \"Texture\" property.")); + Dictionary texture_warning; + texture_warning["message"] = RTR("A texture with the shape of the light must be supplied."); + texture_warning["property"] = "texture"; + warnings.push_back(texture_warning); } return warnings; diff --git a/scene/2d/light_2d.h b/scene/2d/light_2d.h index 6a454a421ee576..77fe92449ac108 100644 --- a/scene/2d/light_2d.h +++ b/scene/2d/light_2d.h @@ -171,7 +171,7 @@ class PointLight2D : public Light2D { void set_texture_scale(real_t p_scale); real_t get_texture_scale() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; PointLight2D(); }; diff --git a/scene/2d/light_occluder_2d.cpp b/scene/2d/light_occluder_2d.cpp index 4c3161d049b688..c5614a67728858 100644 --- a/scene/2d/light_occluder_2d.cpp +++ b/scene/2d/light_occluder_2d.cpp @@ -247,8 +247,8 @@ int LightOccluder2D::get_occluder_light_mask() const { return mask; } -PackedStringArray LightOccluder2D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array LightOccluder2D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!occluder_polygon.is_valid()) { warnings.push_back(RTR("An occluder polygon must be set (or drawn) for this occluder to take effect.")); diff --git a/scene/2d/light_occluder_2d.h b/scene/2d/light_occluder_2d.h index dd3130394e495a..b8add2e498edf0 100644 --- a/scene/2d/light_occluder_2d.h +++ b/scene/2d/light_occluder_2d.h @@ -105,7 +105,7 @@ class LightOccluder2D : public Node2D { void set_as_sdf_collision(bool p_enable); bool is_set_as_sdf_collision() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; LightOccluder2D(); ~LightOccluder2D(); diff --git a/scene/2d/navigation_agent_2d.cpp b/scene/2d/navigation_agent_2d.cpp index 6aeaf300d1181b..fb340123b8707a 100644 --- a/scene/2d/navigation_agent_2d.cpp +++ b/scene/2d/navigation_agent_2d.cpp @@ -615,8 +615,8 @@ void NavigationAgent2D::_avoidance_done(Vector3 p_new_velocity) { emit_signal(SNAME("velocity_computed"), safe_velocity); } -PackedStringArray NavigationAgent2D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array NavigationAgent2D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!Object::cast_to(get_parent())) { warnings.push_back(RTR("The NavigationAgent2D can be used only under a Node2D inheriting parent node.")); diff --git a/scene/2d/navigation_agent_2d.h b/scene/2d/navigation_agent_2d.h index 10c703168b3c23..8399363cb8acc5 100644 --- a/scene/2d/navigation_agent_2d.h +++ b/scene/2d/navigation_agent_2d.h @@ -199,7 +199,7 @@ class NavigationAgent2D : public Node { void _avoidance_done(Vector3 p_new_velocity); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; void set_avoidance_layers(uint32_t p_layers); uint32_t get_avoidance_layers() const; diff --git a/scene/2d/navigation_link_2d.cpp b/scene/2d/navigation_link_2d.cpp index 3664040e7be394..1056481d5179ca 100644 --- a/scene/2d/navigation_link_2d.cpp +++ b/scene/2d/navigation_link_2d.cpp @@ -339,8 +339,8 @@ void NavigationLink2D::set_travel_cost(real_t p_travel_cost) { NavigationServer2D::get_singleton()->link_set_travel_cost(link, travel_cost); } -PackedStringArray NavigationLink2D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array NavigationLink2D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (start_position.is_equal_approx(end_position)) { warnings.push_back(RTR("NavigationLink2D start position should be different than the end position to be useful.")); diff --git a/scene/2d/navigation_link_2d.h b/scene/2d/navigation_link_2d.h index 4259740c900c51..1b48f12d746b8a 100644 --- a/scene/2d/navigation_link_2d.h +++ b/scene/2d/navigation_link_2d.h @@ -92,7 +92,7 @@ class NavigationLink2D : public Node2D { void set_travel_cost(real_t p_travel_cost); real_t get_travel_cost() const { return travel_cost; } - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; NavigationLink2D(); ~NavigationLink2D(); diff --git a/scene/2d/navigation_region_2d.cpp b/scene/2d/navigation_region_2d.cpp index 693e03e1d4e170..e671638edc2c99 100644 --- a/scene/2d/navigation_region_2d.cpp +++ b/scene/2d/navigation_region_2d.cpp @@ -258,8 +258,8 @@ void NavigationRegion2D::_navigation_map_changed(RID p_map) { } #endif // DEBUG_ENABLED -PackedStringArray NavigationRegion2D::get_configuration_warnings() const { - PackedStringArray warnings = Node2D::get_configuration_warnings(); +Array NavigationRegion2D::get_configuration_warnings() const { + Array warnings = Node2D::get_configuration_warnings(); if (is_visible_in_tree() && is_inside_tree()) { if (!navigation_polygon.is_valid()) { diff --git a/scene/2d/navigation_region_2d.h b/scene/2d/navigation_region_2d.h index 642f1663cd4082..3147698c7a22bb 100644 --- a/scene/2d/navigation_region_2d.h +++ b/scene/2d/navigation_region_2d.h @@ -108,7 +108,7 @@ class NavigationRegion2D : public Node2D { void set_avoidance_layer_value(int p_layer_number, bool p_value); bool get_avoidance_layer_value(int p_layer_number) const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; NavigationRegion2D(); ~NavigationRegion2D(); diff --git a/scene/2d/parallax_layer.cpp b/scene/2d/parallax_layer.cpp index 3dd0d7b61cd2dd..44cfc1deb2c3a0 100644 --- a/scene/2d/parallax_layer.cpp +++ b/scene/2d/parallax_layer.cpp @@ -137,8 +137,8 @@ void ParallaxLayer::set_base_offset_and_scale(const Point2 &p_offset, real_t p_s _update_mirroring(); } -PackedStringArray ParallaxLayer::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array ParallaxLayer::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!Object::cast_to(get_parent())) { warnings.push_back(RTR("ParallaxLayer node only works when set as child of a ParallaxBackground node.")); diff --git a/scene/2d/parallax_layer.h b/scene/2d/parallax_layer.h index 22fa0dd51c1e00..dbf93861989f62 100644 --- a/scene/2d/parallax_layer.h +++ b/scene/2d/parallax_layer.h @@ -59,7 +59,7 @@ class ParallaxLayer : public Node2D { void set_base_offset_and_scale(const Point2 &p_offset, real_t p_scale); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; ParallaxLayer(); }; diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp index 3e6a484e7264ed..eb42833b1a63b9 100644 --- a/scene/2d/path_2d.cpp +++ b/scene/2d/path_2d.cpp @@ -287,8 +287,8 @@ void PathFollow2D::_validate_property(PropertyInfo &p_property) const { } } -PackedStringArray PathFollow2D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array PathFollow2D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (is_visible_in_tree() && is_inside_tree()) { if (!Object::cast_to(get_parent())) { diff --git a/scene/2d/path_2d.h b/scene/2d/path_2d.h index bfd5cde5e9cb89..616903c7887de3 100644 --- a/scene/2d/path_2d.h +++ b/scene/2d/path_2d.h @@ -106,7 +106,7 @@ class PathFollow2D : public Node2D { void set_cubic_interpolation_enabled(bool p_enabled); bool is_cubic_interpolation_enabled() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; PathFollow2D() {} }; diff --git a/scene/2d/physical_bone_2d.cpp b/scene/2d/physical_bone_2d.cpp index efffa56f176a65..6b5cd9813f06e6 100644 --- a/scene/2d/physical_bone_2d.cpp +++ b/scene/2d/physical_bone_2d.cpp @@ -106,8 +106,8 @@ void PhysicalBone2D::_find_joint_child() { } } -PackedStringArray PhysicalBone2D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array PhysicalBone2D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!parent_skeleton) { warnings.push_back(RTR("A PhysicalBone2D only works with a Skeleton2D or another PhysicalBone2D as a parent node!")); diff --git a/scene/2d/physical_bone_2d.h b/scene/2d/physical_bone_2d.h index e585f2c0ede421..1930ce1aba4557 100644 --- a/scene/2d/physical_bone_2d.h +++ b/scene/2d/physical_bone_2d.h @@ -79,7 +79,7 @@ class PhysicalBone2D : public RigidBody2D { void set_follow_bone_when_simulating(bool p_follow); bool get_follow_bone_when_simulating() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; PhysicalBone2D(); ~PhysicalBone2D(); diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index b3acc1849bec8e..691e89d7627013 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -912,10 +912,10 @@ void RigidBody2D::_notification(int p_what) { #endif } -PackedStringArray RigidBody2D::get_configuration_warnings() const { +Array RigidBody2D::get_configuration_warnings() const { Transform2D t = get_transform(); - PackedStringArray warnings = CollisionObject2D::get_configuration_warnings(); + Array warnings = CollisionObject2D::get_configuration_warnings(); if (ABS(t.columns[0].length() - 1.0) > 0.05 || ABS(t.columns[1].length() - 1.0) > 0.05) { warnings.push_back(RTR("Size changes to RigidBody2D will be overridden by the physics engine when running.\nChange the size in children collision shapes instead.")); diff --git a/scene/2d/physics_body_2d.h b/scene/2d/physics_body_2d.h index c4eb77d86130c3..73fe10535cafc0 100644 --- a/scene/2d/physics_body_2d.h +++ b/scene/2d/physics_body_2d.h @@ -309,7 +309,7 @@ class RigidBody2D : public PhysicsBody2D { TypedArray get_colliding_bodies() const; //function for script - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; RigidBody2D(); ~RigidBody2D(); diff --git a/scene/2d/remote_transform_2d.cpp b/scene/2d/remote_transform_2d.cpp index cd0d9f37505515..7853a43e0f622f 100644 --- a/scene/2d/remote_transform_2d.cpp +++ b/scene/2d/remote_transform_2d.cpp @@ -180,8 +180,8 @@ void RemoteTransform2D::force_update_cache() { _update_cache(); } -PackedStringArray RemoteTransform2D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array RemoteTransform2D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!has_node(remote_node) || !Object::cast_to(get_node(remote_node))) { warnings.push_back(RTR("Path property must point to a valid Node2D node to work.")); diff --git a/scene/2d/remote_transform_2d.h b/scene/2d/remote_transform_2d.h index 997fd8fc6942f7..fe7289380a55a8 100644 --- a/scene/2d/remote_transform_2d.h +++ b/scene/2d/remote_transform_2d.h @@ -70,7 +70,7 @@ class RemoteTransform2D : public Node2D { void force_update_cache(); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; RemoteTransform2D(); }; diff --git a/scene/2d/shape_cast_2d.cpp b/scene/2d/shape_cast_2d.cpp index f1a9119458c0e9..8ea38acc915208 100644 --- a/scene/2d/shape_cast_2d.cpp +++ b/scene/2d/shape_cast_2d.cpp @@ -403,8 +403,8 @@ Array ShapeCast2D::_get_collision_result() const { return ret; } -PackedStringArray ShapeCast2D::get_configuration_warnings() const { - PackedStringArray warnings = Node2D::get_configuration_warnings(); +Array ShapeCast2D::get_configuration_warnings() const { + Array warnings = Node2D::get_configuration_warnings(); if (shape.is_null()) { warnings.push_back(RTR("This node cannot interact with other objects unless a Shape2D is assigned.")); diff --git a/scene/2d/shape_cast_2d.h b/scene/2d/shape_cast_2d.h index a577c351fd7a08..da7c58baccba01 100644 --- a/scene/2d/shape_cast_2d.h +++ b/scene/2d/shape_cast_2d.h @@ -118,7 +118,7 @@ class ShapeCast2D : public Node2D { void remove_exception(const CollisionObject2D *p_node); void clear_exceptions(); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; ShapeCast2D(); }; diff --git a/scene/2d/skeleton_2d.cpp b/scene/2d/skeleton_2d.cpp index c31b42bebaf255..822bdf6c8bad93 100644 --- a/scene/2d/skeleton_2d.cpp +++ b/scene/2d/skeleton_2d.cpp @@ -411,8 +411,8 @@ int Bone2D::get_index_in_skeleton() const { return skeleton_index; } -PackedStringArray Bone2D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array Bone2D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!skeleton) { if (parent_bone) { warnings.push_back(RTR("This Bone2D chain should end at a Skeleton2D node.")); diff --git a/scene/2d/skeleton_2d.h b/scene/2d/skeleton_2d.h index 6a36a3155293af..1128ebb7c6597f 100644 --- a/scene/2d/skeleton_2d.h +++ b/scene/2d/skeleton_2d.h @@ -78,7 +78,7 @@ class Bone2D : public Node2D { void apply_rest(); Transform2D get_skeleton_rest() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; void set_autocalculate_length_and_angle(bool p_autocalculate); bool get_autocalculate_length_and_angle() const; diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 5ea751f089ae35..712e46c3c646c8 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -4070,8 +4070,8 @@ void TileMap::draw_cells_outline(Control *p_control, const RBSet &p_ce #undef DRAW_SIDE_IF_NEEDED } -PackedStringArray TileMap::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array TileMap::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); // Retrieve the set of Z index values with a Y-sorted layer. RBSet y_sorted_z_index; diff --git a/scene/2d/tile_map.h b/scene/2d/tile_map.h index 3c135d1317af63..f5541bee8dfa8d 100644 --- a/scene/2d/tile_map.h +++ b/scene/2d/tile_map.h @@ -420,7 +420,7 @@ class TileMap : public Node2D { GDVIRTUAL3(_tile_data_runtime_update, int, Vector2i, TileData *); // Configuration warnings. - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; TileMap(); ~TileMap(); diff --git a/scene/3d/bone_attachment_3d.cpp b/scene/3d/bone_attachment_3d.cpp index 261bd401d4b363..660471057c624a 100644 --- a/scene/3d/bone_attachment_3d.cpp +++ b/scene/3d/bone_attachment_3d.cpp @@ -87,8 +87,8 @@ void BoneAttachment3D::_get_property_list(List *p_list) const { } } -PackedStringArray BoneAttachment3D::get_configuration_warnings() const { - PackedStringArray warnings = Node3D::get_configuration_warnings(); +Array BoneAttachment3D::get_configuration_warnings() const { + Array warnings = Node3D::get_configuration_warnings(); if (use_external_skeleton) { if (external_skeleton_node_cache.is_null()) { diff --git a/scene/3d/bone_attachment_3d.h b/scene/3d/bone_attachment_3d.h index 327cbaa0ab2021..f8aa7b2105e9ed 100644 --- a/scene/3d/bone_attachment_3d.h +++ b/scene/3d/bone_attachment_3d.h @@ -70,7 +70,7 @@ class BoneAttachment3D : public Node3D { #endif // TOOLS_ENABLED public: - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; void set_bone_name(const String &p_name); String get_bone_name() const; diff --git a/scene/3d/collision_object_3d.cpp b/scene/3d/collision_object_3d.cpp index 6d8d60dcaa8032..23d396c3f9f9c5 100644 --- a/scene/3d/collision_object_3d.cpp +++ b/scene/3d/collision_object_3d.cpp @@ -726,8 +726,8 @@ bool CollisionObject3D::get_capture_input_on_drag() const { return capture_input_on_drag; } -PackedStringArray CollisionObject3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array CollisionObject3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (shapes.is_empty()) { warnings.push_back(RTR("This node has no shape, so it can't collide or interact with other objects.\nConsider adding a CollisionShape3D or CollisionPolygon3D as a child to define its shape.")); diff --git a/scene/3d/collision_object_3d.h b/scene/3d/collision_object_3d.h index ebcbb39e0db96e..31ebdf68961d0f 100644 --- a/scene/3d/collision_object_3d.h +++ b/scene/3d/collision_object_3d.h @@ -171,7 +171,7 @@ class CollisionObject3D : public Node3D { _FORCE_INLINE_ RID get_rid() const { return rid; } - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; CollisionObject3D(); ~CollisionObject3D(); diff --git a/scene/3d/collision_polygon_3d.cpp b/scene/3d/collision_polygon_3d.cpp index 9c1a7181aa50b6..29cec430119edf 100644 --- a/scene/3d/collision_polygon_3d.cpp +++ b/scene/3d/collision_polygon_3d.cpp @@ -168,8 +168,8 @@ void CollisionPolygon3D::set_margin(real_t p_margin) { } } -PackedStringArray CollisionPolygon3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array CollisionPolygon3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!Object::cast_to(get_parent())) { warnings.push_back(RTR("CollisionPolygon3D only serves to provide a collision shape to a CollisionObject3D derived node.\nPlease only use it as a child of Area3D, StaticBody3D, RigidBody3D, CharacterBody3D, etc. to give them a shape.")); diff --git a/scene/3d/collision_polygon_3d.h b/scene/3d/collision_polygon_3d.h index 61290a7947ff77..715ea721cf871d 100644 --- a/scene/3d/collision_polygon_3d.h +++ b/scene/3d/collision_polygon_3d.h @@ -74,7 +74,7 @@ class CollisionPolygon3D : public Node3D { real_t get_margin() const; void set_margin(real_t p_margin); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; CollisionPolygon3D(); }; diff --git a/scene/3d/collision_shape_3d.cpp b/scene/3d/collision_shape_3d.cpp index 10eefc784d73d6..3a3b54a972ee5e 100644 --- a/scene/3d/collision_shape_3d.cpp +++ b/scene/3d/collision_shape_3d.cpp @@ -116,8 +116,8 @@ void CollisionShape3D::resource_changed(Ref res) { update_gizmos(); } -PackedStringArray CollisionShape3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array CollisionShape3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); CollisionObject3D *col_object = Object::cast_to(get_parent()); if (col_object == nullptr) { diff --git a/scene/3d/collision_shape_3d.h b/scene/3d/collision_shape_3d.h index 74928bad6d39a0..2bb19ed8bf4cb1 100644 --- a/scene/3d/collision_shape_3d.h +++ b/scene/3d/collision_shape_3d.h @@ -62,7 +62,7 @@ class CollisionShape3D : public Node3D { void set_disabled(bool p_disabled); bool is_disabled() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; CollisionShape3D(); ~CollisionShape3D(); diff --git a/scene/3d/cpu_particles_3d.cpp b/scene/3d/cpu_particles_3d.cpp index 405d478a4759d6..3cf591f47f2dda 100644 --- a/scene/3d/cpu_particles_3d.cpp +++ b/scene/3d/cpu_particles_3d.cpp @@ -188,8 +188,8 @@ bool CPUParticles3D::get_fractional_delta() const { return fractional_delta; } -PackedStringArray CPUParticles3D::get_configuration_warnings() const { - PackedStringArray warnings = GeometryInstance3D::get_configuration_warnings(); +Array CPUParticles3D::get_configuration_warnings() const { + Array warnings = GeometryInstance3D::get_configuration_warnings(); bool mesh_found = false; bool anim_material_found = false; diff --git a/scene/3d/cpu_particles_3d.h b/scene/3d/cpu_particles_3d.h index 40ea4e8cdfbff3..0dddf02b560685 100644 --- a/scene/3d/cpu_particles_3d.h +++ b/scene/3d/cpu_particles_3d.h @@ -302,7 +302,7 @@ class CPUParticles3D : public GeometryInstance3D { void set_gravity(const Vector3 &p_gravity); Vector3 get_gravity() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; void restart(); diff --git a/scene/3d/decal.cpp b/scene/3d/decal.cpp index 50a5b2da707ef5..3d72a43b30b957 100644 --- a/scene/3d/decal.cpp +++ b/scene/3d/decal.cpp @@ -162,8 +162,8 @@ void Decal::_validate_property(PropertyInfo &p_property) const { } } -PackedStringArray Decal::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array Decal::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") { warnings.push_back(RTR("Decals are only available when using the Forward+ or Mobile rendering backends.")); diff --git a/scene/3d/decal.h b/scene/3d/decal.h index 171b52815ad314..3bc6664afdbc29 100644 --- a/scene/3d/decal.h +++ b/scene/3d/decal.h @@ -69,7 +69,7 @@ class Decal : public VisualInstance3D { #endif // DISABLE_DEPRECATED public: - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; void set_size(const Vector3 &p_size); Vector3 get_size() const; diff --git a/scene/3d/fog_volume.cpp b/scene/3d/fog_volume.cpp index 12ca1888c47faf..1c17a733e9392c 100644 --- a/scene/3d/fog_volume.cpp +++ b/scene/3d/fog_volume.cpp @@ -117,8 +117,8 @@ AABB FogVolume::get_aabb() const { return AABB(); } -PackedStringArray FogVolume::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array FogVolume::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); Ref environment = get_viewport()->find_world_3d()->get_environment(); diff --git a/scene/3d/fog_volume.h b/scene/3d/fog_volume.h index f7e861e3d05394..a185cdbd94d9c5 100644 --- a/scene/3d/fog_volume.h +++ b/scene/3d/fog_volume.h @@ -66,7 +66,7 @@ class FogVolume : public VisualInstance3D { Ref get_material() const; virtual AABB get_aabb() const override; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; FogVolume(); ~FogVolume(); diff --git a/scene/3d/gpu_particles_3d.cpp b/scene/3d/gpu_particles_3d.cpp index 4ac81d63b6ec8c..fc80d98dc4e62c 100644 --- a/scene/3d/gpu_particles_3d.cpp +++ b/scene/3d/gpu_particles_3d.cpp @@ -269,8 +269,8 @@ bool GPUParticles3D::get_interpolate() const { return interpolate; } -PackedStringArray GPUParticles3D::get_configuration_warnings() const { - PackedStringArray warnings = GeometryInstance3D::get_configuration_warnings(); +Array GPUParticles3D::get_configuration_warnings() const { + Array warnings = GeometryInstance3D::get_configuration_warnings(); bool meshes_found = false; bool anim_material_found = false; diff --git a/scene/3d/gpu_particles_3d.h b/scene/3d/gpu_particles_3d.h index 474f5500f8cd6c..ac701f4b606651 100644 --- a/scene/3d/gpu_particles_3d.h +++ b/scene/3d/gpu_particles_3d.h @@ -147,7 +147,7 @@ class GPUParticles3D : public GeometryInstance3D { void set_draw_pass_mesh(int p_pass, const Ref &p_mesh); Ref get_draw_pass_mesh(int p_pass) const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; void set_sub_emitter(const NodePath &p_path); NodePath get_sub_emitter() const; diff --git a/scene/3d/gpu_particles_collision_3d.cpp b/scene/3d/gpu_particles_collision_3d.cpp index cbc75801b0a98b..f5d5795a27b692 100644 --- a/scene/3d/gpu_particles_collision_3d.cpp +++ b/scene/3d/gpu_particles_collision_3d.cpp @@ -527,8 +527,8 @@ Ref GPUParticlesCollisionSDF3D::bake() { return ret; } -PackedStringArray GPUParticlesCollisionSDF3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array GPUParticlesCollisionSDF3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (bake_mask == 0) { warnings.push_back(RTR("The Bake Mask has no bits enabled, which means baking will not produce any collision for this GPUParticlesCollisionSDF3D.\nTo resolve this, enable at least one bit in the Bake Mask property.")); diff --git a/scene/3d/gpu_particles_collision_3d.h b/scene/3d/gpu_particles_collision_3d.h index 16493200691fc3..a4d8b15f9f3c95 100644 --- a/scene/3d/gpu_particles_collision_3d.h +++ b/scene/3d/gpu_particles_collision_3d.h @@ -170,7 +170,7 @@ class GPUParticlesCollisionSDF3D : public GPUParticlesCollision3D { #endif // DISABLE_DEPRECATED public: - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; void set_thickness(float p_thickness); float get_thickness() const; diff --git a/scene/3d/joint_3d.cpp b/scene/3d/joint_3d.cpp index 61f89648eeee8a..ea47bed5bb560f 100644 --- a/scene/3d/joint_3d.cpp +++ b/scene/3d/joint_3d.cpp @@ -198,8 +198,8 @@ bool Joint3D::get_exclude_nodes_from_collision() const { return exclude_from_collision; } -PackedStringArray Joint3D::get_configuration_warnings() const { - PackedStringArray warnings = Node3D::get_configuration_warnings(); +Array Joint3D::get_configuration_warnings() const { + Array warnings = Node3D::get_configuration_warnings(); if (!warning.is_empty()) { warnings.push_back(warning); diff --git a/scene/3d/joint_3d.h b/scene/3d/joint_3d.h index cadd6171536610..bdcd689ba10d3d 100644 --- a/scene/3d/joint_3d.h +++ b/scene/3d/joint_3d.h @@ -63,7 +63,7 @@ class Joint3D : public Node3D { _FORCE_INLINE_ bool is_configured() const { return configured; } public: - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; void set_node_a(const NodePath &p_node_a); NodePath get_node_a() const; diff --git a/scene/3d/light_3d.cpp b/scene/3d/light_3d.cpp index 18198b566e1430..f8b0470668edf9 100644 --- a/scene/3d/light_3d.cpp +++ b/scene/3d/light_3d.cpp @@ -169,8 +169,8 @@ AABB Light3D::get_aabb() const { return AABB(); } -PackedStringArray Light3D::get_configuration_warnings() const { - PackedStringArray warnings = VisualInstance3D::get_configuration_warnings(); +Array Light3D::get_configuration_warnings() const { + Array warnings = VisualInstance3D::get_configuration_warnings(); if (has_shadow() && OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") { warnings.push_back(RTR("Shadows are not supported when using the GL Compatibility backend yet. Support will be added in a future release.")); @@ -600,8 +600,8 @@ OmniLight3D::ShadowMode OmniLight3D::get_shadow_mode() const { return shadow_mode; } -PackedStringArray OmniLight3D::get_configuration_warnings() const { - PackedStringArray warnings = Light3D::get_configuration_warnings(); +Array OmniLight3D::get_configuration_warnings() const { + Array warnings = Light3D::get_configuration_warnings(); if (!has_shadow() && get_projector().is_valid()) { warnings.push_back(RTR("Projector texture only works with shadows active.")); @@ -632,8 +632,8 @@ OmniLight3D::OmniLight3D() : set_shadow_mode(SHADOW_CUBE); } -PackedStringArray SpotLight3D::get_configuration_warnings() const { - PackedStringArray warnings = Light3D::get_configuration_warnings(); +Array SpotLight3D::get_configuration_warnings() const { + Array warnings = Light3D::get_configuration_warnings(); if (has_shadow() && get_param(PARAM_SPOT_ANGLE) >= 90.0) { warnings.push_back(RTR("A SpotLight3D with an angle wider than 90 degrees cannot cast shadows.")); diff --git a/scene/3d/light_3d.h b/scene/3d/light_3d.h index d6eca8d8b6e4dc..b242493c28f566 100644 --- a/scene/3d/light_3d.h +++ b/scene/3d/light_3d.h @@ -147,7 +147,7 @@ class Light3D : public VisualInstance3D { Color get_correlated_color() const; virtual AABB get_aabb() const override; - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; Light3D(); ~Light3D(); @@ -217,7 +217,7 @@ class OmniLight3D : public Light3D { void set_shadow_mode(ShadowMode p_mode); ShadowMode get_shadow_mode() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; OmniLight3D(); }; @@ -231,7 +231,7 @@ class SpotLight3D : public Light3D { static void _bind_methods(); public: - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; SpotLight3D(); }; diff --git a/scene/3d/lightmap_gi.cpp b/scene/3d/lightmap_gi.cpp index 3ee08fd5485fdb..f23eb2d9a85a4d 100644 --- a/scene/3d/lightmap_gi.cpp +++ b/scene/3d/lightmap_gi.cpp @@ -1458,8 +1458,8 @@ Ref LightmapGI::get_camera_attributes() const { return camera_attributes; } -PackedStringArray LightmapGI::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array LightmapGI::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") { warnings.push_back(RTR("LightmapGI nodes are not supported when using the GL Compatibility backend yet. Support will be added in a future release.")); diff --git a/scene/3d/lightmap_gi.h b/scene/3d/lightmap_gi.h index b9e33cf30044c3..3d377a19935e01 100644 --- a/scene/3d/lightmap_gi.h +++ b/scene/3d/lightmap_gi.h @@ -275,7 +275,7 @@ class LightmapGI : public VisualInstance3D { BakeError bake(Node *p_from_node, String p_image_data_path = "", Lightmapper::BakeStepFunc p_bake_step = nullptr, void *p_bake_userdata = nullptr); - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; LightmapGI(); }; diff --git a/scene/3d/navigation_agent_3d.cpp b/scene/3d/navigation_agent_3d.cpp index 93acf38fa8e2c3..34a347d30fd183 100644 --- a/scene/3d/navigation_agent_3d.cpp +++ b/scene/3d/navigation_agent_3d.cpp @@ -659,8 +659,8 @@ void NavigationAgent3D::_avoidance_done(Vector3 p_new_velocity) { emit_signal(SNAME("velocity_computed"), safe_velocity); } -PackedStringArray NavigationAgent3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array NavigationAgent3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!Object::cast_to(get_parent())) { warnings.push_back(RTR("The NavigationAgent3D can be used only under a Node3D inheriting parent node.")); diff --git a/scene/3d/navigation_agent_3d.h b/scene/3d/navigation_agent_3d.h index 3032942cddc88b..bbccfd43add77c 100644 --- a/scene/3d/navigation_agent_3d.h +++ b/scene/3d/navigation_agent_3d.h @@ -215,7 +215,7 @@ class NavigationAgent3D : public Node { void _avoidance_done(Vector3 p_new_velocity); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; void set_avoidance_layers(uint32_t p_layers); uint32_t get_avoidance_layers() const; diff --git a/scene/3d/navigation_link_3d.cpp b/scene/3d/navigation_link_3d.cpp index 2263d38d6ce572..12c9f22af3dd26 100644 --- a/scene/3d/navigation_link_3d.cpp +++ b/scene/3d/navigation_link_3d.cpp @@ -454,8 +454,8 @@ void NavigationLink3D::set_travel_cost(real_t p_travel_cost) { NavigationServer3D::get_singleton()->link_set_travel_cost(link, travel_cost); } -PackedStringArray NavigationLink3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array NavigationLink3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (start_position.is_equal_approx(end_position)) { warnings.push_back(RTR("NavigationLink3D start position should be different than the end position to be useful.")); diff --git a/scene/3d/navigation_link_3d.h b/scene/3d/navigation_link_3d.h index ec92fb9dd939dc..b21fd2c0f1d521 100644 --- a/scene/3d/navigation_link_3d.h +++ b/scene/3d/navigation_link_3d.h @@ -97,7 +97,7 @@ class NavigationLink3D : public Node3D { void set_travel_cost(real_t p_travel_cost); real_t get_travel_cost() const { return travel_cost; } - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; }; #endif // NAVIGATION_LINK_3D_H diff --git a/scene/3d/navigation_region_3d.cpp b/scene/3d/navigation_region_3d.cpp index 4c2f56b7b3bca6..8e00412891387b 100644 --- a/scene/3d/navigation_region_3d.cpp +++ b/scene/3d/navigation_region_3d.cpp @@ -311,8 +311,8 @@ void NavigationRegion3D::_bake_finished(Ref p_nav_mesh) { emit_signal(SNAME("bake_finished")); } -PackedStringArray NavigationRegion3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array NavigationRegion3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (is_visible_in_tree() && is_inside_tree()) { if (!navigation_mesh.is_valid()) { diff --git a/scene/3d/navigation_region_3d.h b/scene/3d/navigation_region_3d.h index 84b57d064f1e35..588ae63996b705 100644 --- a/scene/3d/navigation_region_3d.h +++ b/scene/3d/navigation_region_3d.h @@ -102,7 +102,7 @@ class NavigationRegion3D : public Node3D { void bake_navigation_mesh(bool p_on_thread); void _bake_finished(Ref p_navigation_mesh); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; NavigationRegion3D(); ~NavigationRegion3D(); diff --git a/scene/3d/occluder_instance_3d.cpp b/scene/3d/occluder_instance_3d.cpp index 8fd1df372b8148..5b2dabd4b31fdf 100644 --- a/scene/3d/occluder_instance_3d.cpp +++ b/scene/3d/occluder_instance_3d.cpp @@ -694,8 +694,8 @@ OccluderInstance3D::BakeError OccluderInstance3D::bake_scene(Node *p_from_node, return BAKE_ERROR_OK; } -PackedStringArray OccluderInstance3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array OccluderInstance3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!bool(GLOBAL_GET("rendering/occlusion_culling/use_occlusion_culling"))) { warnings.push_back(RTR("Occlusion culling is disabled in the Project Settings, which means occlusion culling won't be performed in the root viewport.\nTo resolve this, open the Project Settings and enable Rendering > Occlusion Culling > Use Occlusion Culling.")); diff --git a/scene/3d/occluder_instance_3d.h b/scene/3d/occluder_instance_3d.h index f607877e8f2451..cf20655c2cdf16 100644 --- a/scene/3d/occluder_instance_3d.h +++ b/scene/3d/occluder_instance_3d.h @@ -181,7 +181,7 @@ class OccluderInstance3D : public VisualInstance3D { static void _bind_methods(); public: - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; enum BakeError { BAKE_ERROR_OK, diff --git a/scene/3d/path_3d.cpp b/scene/3d/path_3d.cpp index 9516973ae2a1a9..07ba19d7faa2a0 100644 --- a/scene/3d/path_3d.cpp +++ b/scene/3d/path_3d.cpp @@ -252,8 +252,8 @@ void PathFollow3D::_validate_property(PropertyInfo &p_property) const { } } -PackedStringArray PathFollow3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array PathFollow3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (is_visible_in_tree() && is_inside_tree()) { if (!Object::cast_to(get_parent())) { diff --git a/scene/3d/path_3d.h b/scene/3d/path_3d.h index 6116e98054094d..fe44b73e14e423 100644 --- a/scene/3d/path_3d.h +++ b/scene/3d/path_3d.h @@ -122,7 +122,7 @@ class PathFollow3D : public Node3D { void set_cubic_interpolation_enabled(bool p_enabled); bool is_cubic_interpolation_enabled() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; PathFollow3D() {} }; diff --git a/scene/3d/physics_body_3d.cpp b/scene/3d/physics_body_3d.cpp index 6b31aa0a3c35cd..3c17f7ac60402b 100644 --- a/scene/3d/physics_body_3d.cpp +++ b/scene/3d/physics_body_3d.cpp @@ -978,8 +978,8 @@ TypedArray RigidBody3D::get_colliding_bodies() const { return ret; } -PackedStringArray RigidBody3D::get_configuration_warnings() const { - PackedStringArray warnings = CollisionObject3D::get_configuration_warnings(); +Array RigidBody3D::get_configuration_warnings() const { + Array warnings = CollisionObject3D::get_configuration_warnings(); Vector3 scale = get_transform().get_basis().get_scale(); if (ABS(scale.x - 1.0) > 0.05 || ABS(scale.y - 1.0) > 0.05 || ABS(scale.z - 1.0) > 0.05) { diff --git a/scene/3d/physics_body_3d.h b/scene/3d/physics_body_3d.h index d141c1aaa202a4..3673491cbbbf11 100644 --- a/scene/3d/physics_body_3d.h +++ b/scene/3d/physics_body_3d.h @@ -325,7 +325,7 @@ class RigidBody3D : public PhysicsBody3D { void set_constant_torque(const Vector3 &p_torque); Vector3 get_constant_torque() const; - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; RigidBody3D(); ~RigidBody3D(); diff --git a/scene/3d/reflection_probe.cpp b/scene/3d/reflection_probe.cpp index e533f08861ba81..3a39418dc5d5c5 100644 --- a/scene/3d/reflection_probe.cpp +++ b/scene/3d/reflection_probe.cpp @@ -180,8 +180,8 @@ AABB ReflectionProbe::get_aabb() const { return aabb; } -PackedStringArray ReflectionProbe::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array ReflectionProbe::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") { warnings.push_back(RTR("ReflectionProbes are not supported when using the GL Compatibility backend yet. Support will be added in a future release.")); diff --git a/scene/3d/reflection_probe.h b/scene/3d/reflection_probe.h index 5438219d5e7904..726a5161ef92ec 100644 --- a/scene/3d/reflection_probe.h +++ b/scene/3d/reflection_probe.h @@ -118,7 +118,7 @@ class ReflectionProbe : public VisualInstance3D { virtual AABB get_aabb() const override; - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; ReflectionProbe(); ~ReflectionProbe(); diff --git a/scene/3d/remote_transform_3d.cpp b/scene/3d/remote_transform_3d.cpp index fe309a82f88e76..0b14f9af7ebbd9 100644 --- a/scene/3d/remote_transform_3d.cpp +++ b/scene/3d/remote_transform_3d.cpp @@ -178,8 +178,8 @@ void RemoteTransform3D::force_update_cache() { _update_cache(); } -PackedStringArray RemoteTransform3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array RemoteTransform3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!has_node(remote_node) || !Object::cast_to(get_node(remote_node))) { warnings.push_back(RTR("The \"Remote Path\" property must point to a valid Node3D or Node3D-derived node to work.")); diff --git a/scene/3d/remote_transform_3d.h b/scene/3d/remote_transform_3d.h index 3841821daed285..40b59a5a5ee952 100644 --- a/scene/3d/remote_transform_3d.h +++ b/scene/3d/remote_transform_3d.h @@ -70,7 +70,7 @@ class RemoteTransform3D : public Node3D { void force_update_cache(); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; RemoteTransform3D(); }; diff --git a/scene/3d/shape_cast_3d.cpp b/scene/3d/shape_cast_3d.cpp index 75f94b36d38e38..b08da162aa03d4 100644 --- a/scene/3d/shape_cast_3d.cpp +++ b/scene/3d/shape_cast_3d.cpp @@ -169,8 +169,8 @@ void ShapeCast3D::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::COLOR, "debug_shape_custom_color"), "set_debug_shape_custom_color", "get_debug_shape_custom_color"); } -PackedStringArray ShapeCast3D::get_configuration_warnings() const { - PackedStringArray warnings = Node3D::get_configuration_warnings(); +Array ShapeCast3D::get_configuration_warnings() const { + Array warnings = Node3D::get_configuration_warnings(); if (shape.is_null()) { warnings.push_back(RTR("This node cannot interact with other objects unless a Shape3D is assigned.")); diff --git a/scene/3d/shape_cast_3d.h b/scene/3d/shape_cast_3d.h index 98158d3c7cd36b..b45a023cf7d1ad 100644 --- a/scene/3d/shape_cast_3d.h +++ b/scene/3d/shape_cast_3d.h @@ -140,7 +140,7 @@ class ShapeCast3D : public Node3D { void remove_exception(const CollisionObject3D *p_node); void clear_exceptions(); - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; }; #endif // SHAPE_CAST_3D_H diff --git a/scene/3d/soft_body_3d.cpp b/scene/3d/soft_body_3d.cpp index d1753fff6c88c0..b52dc69a278cda 100644 --- a/scene/3d/soft_body_3d.cpp +++ b/scene/3d/soft_body_3d.cpp @@ -375,8 +375,8 @@ void SoftBody3D::_bind_methods() { BIND_ENUM_CONSTANT(DISABLE_MODE_KEEP_ACTIVE); } -PackedStringArray SoftBody3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array SoftBody3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (mesh.is_null()) { warnings.push_back(RTR("This body will be ignored until you set a mesh.")); diff --git a/scene/3d/soft_body_3d.h b/scene/3d/soft_body_3d.h index 0b75ae2cda9bcd..8d1142a0d00564 100644 --- a/scene/3d/soft_body_3d.h +++ b/scene/3d/soft_body_3d.h @@ -125,7 +125,7 @@ class SoftBody3D : public MeshInstance3D { void _notification(int p_what); static void _bind_methods(); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; public: RID get_physics_rid() const { return physics_rid; } diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp index 9f7ff05924ab6c..3442dc93996200 100644 --- a/scene/3d/sprite_3d.cpp +++ b/scene/3d/sprite_3d.cpp @@ -1337,8 +1337,8 @@ StringName AnimatedSprite3D::get_animation() const { return animation; } -PackedStringArray AnimatedSprite3D::get_configuration_warnings() const { - PackedStringArray warnings = SpriteBase3D::get_configuration_warnings(); +Array AnimatedSprite3D::get_configuration_warnings() const { + Array warnings = SpriteBase3D::get_configuration_warnings(); if (frames.is_null()) { warnings.push_back(RTR("A SpriteFrames resource must be created or set in the \"Frames\" property in order for AnimatedSprite3D to display frames.")); } diff --git a/scene/3d/sprite_3d.h b/scene/3d/sprite_3d.h index 1eb1211951359d..fce6381a62691a 100644 --- a/scene/3d/sprite_3d.h +++ b/scene/3d/sprite_3d.h @@ -286,7 +286,7 @@ class AnimatedSprite3D : public SpriteBase3D { virtual Rect2 get_item_rect() const override; - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; virtual void get_argument_options(const StringName &p_function, int p_idx, List *r_options) const override; AnimatedSprite3D(); diff --git a/scene/3d/vehicle_body_3d.cpp b/scene/3d/vehicle_body_3d.cpp index e23703a6dce042..39bc71c947fa66 100644 --- a/scene/3d/vehicle_body_3d.cpp +++ b/scene/3d/vehicle_body_3d.cpp @@ -105,8 +105,8 @@ void VehicleWheel3D::_notification(int p_what) { } } -PackedStringArray VehicleWheel3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array VehicleWheel3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!Object::cast_to(get_parent())) { warnings.push_back(RTR("VehicleWheel3D serves to provide a wheel system to a VehicleBody3D. Please use it as a child of a VehicleBody3D.")); diff --git a/scene/3d/vehicle_body_3d.h b/scene/3d/vehicle_body_3d.h index ce913f152d59e6..8127340accc7ad 100644 --- a/scene/3d/vehicle_body_3d.h +++ b/scene/3d/vehicle_body_3d.h @@ -147,7 +147,7 @@ class VehicleWheel3D : public Node3D { void set_steering(real_t p_steering); real_t get_steering() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; VehicleWheel3D(); }; diff --git a/scene/3d/visible_on_screen_notifier_3d.cpp b/scene/3d/visible_on_screen_notifier_3d.cpp index d1ad713343ff1d..23f866bd3b287a 100644 --- a/scene/3d/visible_on_screen_notifier_3d.cpp +++ b/scene/3d/visible_on_screen_notifier_3d.cpp @@ -79,8 +79,8 @@ void VisibleOnScreenNotifier3D::_notification(int p_what) { } } -PackedStringArray VisibleOnScreenNotifier3D::get_configuration_warnings() const { - PackedStringArray warnings = VisualInstance3D::get_configuration_warnings(); +Array VisibleOnScreenNotifier3D::get_configuration_warnings() const { + Array warnings = VisualInstance3D::get_configuration_warnings(); if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") { warnings.push_back(RTR("VisibleOnScreenNotifier3D nodes are not supported when using the GL Compatibility backend yet. Support will be added in a future release.")); diff --git a/scene/3d/visible_on_screen_notifier_3d.h b/scene/3d/visible_on_screen_notifier_3d.h index 85156c256e9b12..10e41ceec6dde8 100644 --- a/scene/3d/visible_on_screen_notifier_3d.h +++ b/scene/3d/visible_on_screen_notifier_3d.h @@ -57,7 +57,7 @@ class VisibleOnScreenNotifier3D : public VisualInstance3D { virtual AABB get_aabb() const override; bool is_on_screen() const; - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; VisibleOnScreenNotifier3D(); ~VisibleOnScreenNotifier3D(); diff --git a/scene/3d/visual_instance_3d.cpp b/scene/3d/visual_instance_3d.cpp index 8026b12c2bc7cf..b9e9ba2466498a 100644 --- a/scene/3d/visual_instance_3d.cpp +++ b/scene/3d/visual_instance_3d.cpp @@ -425,8 +425,8 @@ bool GeometryInstance3D::is_ignoring_occlusion_culling() { return ignore_occlusion_culling; } -PackedStringArray GeometryInstance3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array GeometryInstance3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!Math::is_zero_approx(visibility_range_end) && visibility_range_end <= visibility_range_begin) { warnings.push_back(RTR("The GeometryInstance3D visibility range's End distance is set to a non-zero value, but is lower than the Begin distance.\nThis means the GeometryInstance3D will never be visible.\nTo resolve this, set the End distance to 0 or to a value greater than the Begin distance.")); diff --git a/scene/3d/visual_instance_3d.h b/scene/3d/visual_instance_3d.h index ef0f7966e2181d..ad02c03e17587c 100644 --- a/scene/3d/visual_instance_3d.h +++ b/scene/3d/visual_instance_3d.h @@ -194,7 +194,7 @@ class GeometryInstance3D : public VisualInstance3D { void set_ignore_occlusion_culling(bool p_enabled); bool is_ignoring_occlusion_culling(); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; GeometryInstance3D(); virtual ~GeometryInstance3D(); }; diff --git a/scene/3d/voxel_gi.cpp b/scene/3d/voxel_gi.cpp index faeacec63a8da6..152903db246b0a 100644 --- a/scene/3d/voxel_gi.cpp +++ b/scene/3d/voxel_gi.cpp @@ -489,8 +489,8 @@ AABB VoxelGI::get_aabb() const { return AABB(-size / 2, size); } -PackedStringArray VoxelGI::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array VoxelGI::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") { warnings.push_back(RTR("VoxelGI nodes are not supported when using the GL Compatibility backend yet. Support will be added in a future release.")); diff --git a/scene/3d/voxel_gi.h b/scene/3d/voxel_gi.h index d276186dd1bdb2..72549a3e1c23c2 100644 --- a/scene/3d/voxel_gi.h +++ b/scene/3d/voxel_gi.h @@ -161,7 +161,7 @@ class VoxelGI : public VisualInstance3D { virtual AABB get_aabb() const override; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; VoxelGI(); ~VoxelGI(); diff --git a/scene/3d/world_environment.cpp b/scene/3d/world_environment.cpp index 4687c84734838a..8db310ce30a8e1 100644 --- a/scene/3d/world_environment.cpp +++ b/scene/3d/world_environment.cpp @@ -135,8 +135,8 @@ Ref WorldEnvironment::get_camera_attributes() const { return camera_attributes; } -PackedStringArray WorldEnvironment::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array WorldEnvironment::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!environment.is_valid() && !camera_attributes.is_valid()) { warnings.push_back(RTR("To have any visible effect, WorldEnvironment requires its \"Environment\" property to contain an Environment, its \"Camera Attributes\" property to contain a CameraAttributes resource, or both.")); diff --git a/scene/3d/world_environment.h b/scene/3d/world_environment.h index 2809d2550aeb53..57d95f1f0ebf68 100644 --- a/scene/3d/world_environment.h +++ b/scene/3d/world_environment.h @@ -55,7 +55,7 @@ class WorldEnvironment : public Node { void set_camera_attributes(const Ref &p_camera_attributes); Ref get_camera_attributes() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; WorldEnvironment(); }; diff --git a/scene/3d/xr_nodes.cpp b/scene/3d/xr_nodes.cpp index ac0a47d1a1d6e4..a980219d8c127b 100644 --- a/scene/3d/xr_nodes.cpp +++ b/scene/3d/xr_nodes.cpp @@ -76,8 +76,8 @@ void XRCamera3D::_pose_changed(const Ref &p_pose) { } } -PackedStringArray XRCamera3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array XRCamera3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (is_visible() && is_inside_tree()) { // must be child node of XROrigin3D! @@ -405,8 +405,8 @@ XRNode3D::~XRNode3D() { xr_server->disconnect("tracker_removed", callable_mp(this, &XRNode3D::_removed_tracker)); } -PackedStringArray XRNode3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array XRNode3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (is_visible() && is_inside_tree()) { // must be child node of XROrigin! @@ -584,8 +584,8 @@ Plane XRAnchor3D::get_plane() const { Vector XROrigin3D::origin_nodes; -PackedStringArray XROrigin3D::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array XROrigin3D::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (is_visible() && is_inside_tree()) { bool has_camera = false; diff --git a/scene/3d/xr_nodes.h b/scene/3d/xr_nodes.h index 6e56aa28deaa1f..a7891de3534977 100644 --- a/scene/3d/xr_nodes.h +++ b/scene/3d/xr_nodes.h @@ -55,7 +55,7 @@ class XRCamera3D : public Camera3D { void _pose_changed(const Ref &p_pose); public: - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; virtual Vector3 project_local_ray_normal(const Point2 &p_pos) const override; virtual Point2 unproject_position(const Vector3 &p_pos) const override; @@ -107,7 +107,7 @@ class XRNode3D : public Node3D { Ref get_pose(); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; XRNode3D(); ~XRNode3D(); @@ -191,7 +191,7 @@ class XROrigin3D : public Node3D { static void _bind_methods(); public: - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; real_t get_world_scale() const; void set_world_scale(real_t p_world_scale); diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp index 23640328633889..452f25009c50a9 100644 --- a/scene/animation/animation_tree.cpp +++ b/scene/animation/animation_tree.cpp @@ -1985,8 +1985,8 @@ uint64_t AnimationTree::get_last_process_pass() const { return process_pass; } -PackedStringArray AnimationTree::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array AnimationTree::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!root.is_valid()) { warnings.push_back(RTR("No root AnimationNode for the graph is set.")); diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h index 422bd0abb1f0a0..17d99a69fb775a 100644 --- a/scene/animation/animation_tree.h +++ b/scene/animation/animation_tree.h @@ -401,7 +401,7 @@ class AnimationTree : public Node { void set_audio_max_polyphony(int p_audio_max_polyphony); int get_audio_max_polyphony() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; bool is_state_invalid() const; String get_invalid_state_reason() const; diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index 3ac3ca7363e58f..392f54a5805bf3 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -430,8 +430,8 @@ bool BaseButton::_was_pressed_by_mouse() const { return was_mouse_pressed; } -PackedStringArray BaseButton::get_configuration_warnings() const { - PackedStringArray warnings = Control::get_configuration_warnings(); +Array BaseButton::get_configuration_warnings() const { + Array warnings = Control::get_configuration_warnings(); if (get_button_group().is_valid() && !is_toggle_mode()) { warnings.push_back(RTR("ButtonGroup is intended to be used only with buttons that have toggle_mode set to true.")); diff --git a/scene/gui/base_button.h b/scene/gui/base_button.h index a8d5cee44cade0..b5fbf11c8d3c06 100644 --- a/scene/gui/base_button.h +++ b/scene/gui/base_button.h @@ -139,7 +139,7 @@ class BaseButton : public Control { void set_button_group(const Ref &p_group); Ref get_button_group() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; BaseButton(); ~BaseButton(); diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp index 4e23db4caef51b..d949433a160775 100644 --- a/scene/gui/container.cpp +++ b/scene/gui/container.cpp @@ -190,8 +190,8 @@ void Container::_notification(int p_what) { } } -PackedStringArray Container::get_configuration_warnings() const { - PackedStringArray warnings = Control::get_configuration_warnings(); +Array Container::get_configuration_warnings() const { + Array warnings = Control::get_configuration_warnings(); if (get_class() == "Container" && get_script().is_null()) { warnings.push_back(RTR("Container by itself serves no purpose unless a script configures its children placement behavior.\nIf you don't intend to add a script, use a plain Control node instead.")); diff --git a/scene/gui/container.h b/scene/gui/container.h index 94c3c540d72b14..d04a71fe231db5 100644 --- a/scene/gui/container.h +++ b/scene/gui/container.h @@ -63,7 +63,7 @@ class Container : public Control { virtual Vector get_allowed_size_flags_horizontal() const; virtual Vector get_allowed_size_flags_vertical() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; Container(); }; diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 78862364d57aca..fbb1b42f82811b 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -223,9 +223,9 @@ void Control::get_argument_options(const StringName &p_function, int p_idx, List } } -PackedStringArray Control::get_configuration_warnings() const { - ERR_READ_THREAD_GUARD_V(PackedStringArray()); - PackedStringArray warnings = Node::get_configuration_warnings(); +Array Control::get_configuration_warnings() const { + ERR_READ_THREAD_GUARD_V(Array()); + Array warnings = Node::get_configuration_warnings(); if (data.mouse_filter == MOUSE_FILTER_IGNORE && !data.tooltip.is_empty()) { warnings.push_back(RTR("The Hint Tooltip won't be displayed as the control's Mouse Filter is set to \"Ignore\". To solve this, set the Mouse Filter to \"Stop\" or \"Pass\".")); diff --git a/scene/gui/control.h b/scene/gui/control.h index 7cb8fc5bf6a5b7..3779295f8b46b9 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -401,7 +401,7 @@ class Control : public CanvasItem { // Editor integration. virtual void get_argument_options(const StringName &p_function, int p_idx, List *r_options) const override; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; virtual bool is_text_field() const; diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 2c37017fa13d32..3a22238365d2b9 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -207,8 +207,8 @@ Control::CursorShape GraphEdit::get_cursor_shape(const Point2 &p_pos) const { return Control::get_cursor_shape(p_pos); } -PackedStringArray GraphEdit::get_configuration_warnings() const { - PackedStringArray warnings = Control::get_configuration_warnings(); +Array GraphEdit::get_configuration_warnings() const { + Array warnings = Control::get_configuration_warnings(); warnings.push_back(RTR("Please be aware that GraphEdit and GraphNode will undergo extensive refactoring in a future 4.x version involving compatibility-breaking API changes.")); diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h index 8b02fbfddc375a..7d2dce1391b373 100644 --- a/scene/gui/graph_edit.h +++ b/scene/gui/graph_edit.h @@ -290,7 +290,7 @@ class GraphEdit : public Control { public: virtual CursorShape get_cursor_shape(const Point2 &p_pos = Point2i()) const override; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; Error connect_node(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port); bool is_node_connected(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port); diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 1b48b9165d81f2..f965dbed2839f5 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -344,8 +344,8 @@ void Label::_update_theme_item_cache() { theme_cache.font_shadow_outline_size = get_theme_constant(SNAME("shadow_outline_size")); } -PackedStringArray Label::get_configuration_warnings() const { - PackedStringArray warnings = Control::get_configuration_warnings(); +Array Label::get_configuration_warnings() const { + Array warnings = Control::get_configuration_warnings(); // Ensure that the font can render all of the required glyphs. Ref font; diff --git a/scene/gui/label.h b/scene/gui/label.h index 70e15fc2e2c847..e510645953905c 100644 --- a/scene/gui/label.h +++ b/scene/gui/label.h @@ -95,7 +95,7 @@ class Label : public Control { public: virtual Size2 get_minimum_size() const override; - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; void set_horizontal_alignment(HorizontalAlignment p_alignment); HorizontalAlignment get_horizontal_alignment() const; diff --git a/scene/gui/range.cpp b/scene/gui/range.cpp index 8db4fe42efb4c2..a359bb23dd8e67 100644 --- a/scene/gui/range.cpp +++ b/scene/gui/range.cpp @@ -30,8 +30,8 @@ #include "range.h" -PackedStringArray Range::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array Range::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (shared->exp_ratio && shared->min <= 0) { warnings.push_back(RTR("If \"Exp Edit\" is enabled, \"Min Value\" must be greater than 0.")); diff --git a/scene/gui/range.h b/scene/gui/range.h index 9b4f0707e6f42e..bfaefc398da59c 100644 --- a/scene/gui/range.h +++ b/scene/gui/range.h @@ -102,7 +102,7 @@ class Range : public Control { void share(Range *p_range); void unshare(); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; Range(); ~Range(); diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index 85dd73beeb1c74..008497760966c5 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -542,8 +542,8 @@ void ScrollContainer::set_follow_focus(bool p_follow) { follow_focus = p_follow; } -PackedStringArray ScrollContainer::get_configuration_warnings() const { - PackedStringArray warnings = Container::get_configuration_warnings(); +Array ScrollContainer::get_configuration_warnings() const { + Array warnings = Container::get_configuration_warnings(); int found = 0; diff --git a/scene/gui/scroll_container.h b/scene/gui/scroll_container.h index dbd1b3904ac32a..d6f4e2c25697df 100644 --- a/scene/gui/scroll_container.h +++ b/scene/gui/scroll_container.h @@ -120,7 +120,7 @@ class ScrollContainer : public Container { VScrollBar *get_v_scroll_bar(); void ensure_control_visible(Control *p_control); - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; ScrollContainer(); }; diff --git a/scene/gui/subviewport_container.cpp b/scene/gui/subviewport_container.cpp index 91058374869244..e4cb90704c4cfa 100644 --- a/scene/gui/subviewport_container.cpp +++ b/scene/gui/subviewport_container.cpp @@ -233,8 +233,8 @@ void SubViewportContainer::remove_child_notify(Node *p_child) { } } -PackedStringArray SubViewportContainer::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array SubViewportContainer::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); bool has_viewport = false; for (int i = 0; i < get_child_count(); i++) { diff --git a/scene/gui/subviewport_container.h b/scene/gui/subviewport_container.h index 8e5f5d157db914..2356ad9030d110 100644 --- a/scene/gui/subviewport_container.h +++ b/scene/gui/subviewport_container.h @@ -64,7 +64,7 @@ class SubViewportContainer : public Container { virtual Vector get_allowed_size_flags_horizontal() const override; virtual Vector get_allowed_size_flags_vertical() const override; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; SubViewportContainer(); }; diff --git a/scene/main/missing_node.cpp b/scene/main/missing_node.cpp index ccb6ac3571970b..49e565a39c46ec 100644 --- a/scene/main/missing_node.cpp +++ b/scene/main/missing_node.cpp @@ -74,9 +74,9 @@ bool MissingNode::is_recording_properties() const { return recording_properties; } -PackedStringArray MissingNode::get_configuration_warnings() const { +Array MissingNode::get_configuration_warnings() const { // The mere existence of this node is warning. - PackedStringArray ret; + Array ret; ret.push_back(vformat(RTR("This node was saved as class type '%s', which was no longer available when this scene was loaded."), original_class)); ret.push_back(RTR("Data from the original node is kept as a placeholder until this type of node is available again. It can hence be safely re-saved without risk of data loss.")); return ret; diff --git a/scene/main/missing_node.h b/scene/main/missing_node.h index 7fa2c99c9655bf..a56469b8ac0404 100644 --- a/scene/main/missing_node.h +++ b/scene/main/missing_node.h @@ -55,7 +55,7 @@ class MissingNode : public Node { void set_recording_properties(bool p_enable); bool is_recording_properties() const; - virtual PackedStringArray get_configuration_warnings() const override; + virtual Array get_configuration_warnings() const override; MissingNode(); }; diff --git a/scene/main/shader_globals_override.cpp b/scene/main/shader_globals_override.cpp index 7fff74e8e1a2b9..da3371a3828070 100644 --- a/scene/main/shader_globals_override.cpp +++ b/scene/main/shader_globals_override.cpp @@ -271,8 +271,8 @@ void ShaderGlobalsOverride::_notification(int p_what) { } } -PackedStringArray ShaderGlobalsOverride::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array ShaderGlobalsOverride::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (!active) { warnings.push_back(RTR("ShaderGlobalsOverride is not active because another node of the same type is in the scene.")); diff --git a/scene/main/shader_globals_override.h b/scene/main/shader_globals_override.h index d8557ecf6a1eee..72226c0cb357ce 100644 --- a/scene/main/shader_globals_override.h +++ b/scene/main/shader_globals_override.h @@ -58,7 +58,7 @@ class ShaderGlobalsOverride : public Node { static void _bind_methods(); public: - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; ShaderGlobalsOverride(); }; diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp index 0f4f18b495eabb..acb788f76fb5c9 100644 --- a/scene/main/timer.cpp +++ b/scene/main/timer.cpp @@ -180,8 +180,8 @@ void Timer::_set_process(bool p_process, bool p_force) { processing = p_process; } -PackedStringArray Timer::get_configuration_warnings() const { - PackedStringArray warnings = Node::get_configuration_warnings(); +Array Timer::get_configuration_warnings() const { + Array warnings = Node::get_configuration_warnings(); if (wait_time < 0.05 - CMP_EPSILON) { warnings.push_back(RTR("Very low timer wait times (< 0.05 seconds) may behave in significantly different ways depending on the rendered or physics frame rate.\nConsider using a script's process loop instead of relying on a Timer for very low wait times.")); diff --git a/scene/main/timer.h b/scene/main/timer.h index d16e49793ddd93..add61ef5f47094 100644 --- a/scene/main/timer.h +++ b/scene/main/timer.h @@ -73,7 +73,7 @@ class Timer : public Node { double get_time_left() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; void set_timer_process_callback(TimerProcessCallback p_callback); TimerProcessCallback get_timer_process_callback() const; diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index faa609d847764e..bace56de20da52 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -3112,9 +3112,9 @@ Variant Viewport::gui_get_drag_data() const { return gui.drag_data; } -PackedStringArray Viewport::get_configuration_warnings() const { - ERR_MAIN_THREAD_GUARD_V(PackedStringArray()); - PackedStringArray warnings = Node::get_configuration_warnings(); +Array Viewport::get_configuration_warnings() const { + ERR_MAIN_THREAD_GUARD_V(Array()); + Array warnings = Node::get_configuration_warnings(); if (size.x <= 1 || size.y <= 1) { warnings.push_back(RTR("The Viewport size must be greater than or equal to 2 pixels on both dimensions to render anything.")); diff --git a/scene/main/viewport.h b/scene/main/viewport.h index af2907ca6f1a2e..eb37ba3ffe62d5 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -593,7 +593,7 @@ class Viewport : public Node { void gui_release_focus(); Control *gui_get_focus_owner() const; - PackedStringArray get_configuration_warnings() const override; + Array get_configuration_warnings() const override; void set_debug_draw(DebugDraw p_debug_draw); DebugDraw get_debug_draw() const;