From 308f23f21d6803115f49a9cd2b827a61275c1dab Mon Sep 17 00:00:00 2001 From: David Snopek Date: Wed, 3 Dec 2025 04:13:09 -0600 Subject: [PATCH] Synchronize the names for `RequiredParam` arguments in header files --- core/input/input.h | 6 ++-- core/input/input_map.h | 8 +++--- core/io/resource_saver.h | 2 +- .../godot_physics_server_3d.h | 2 +- modules/jolt_physics/jolt_physics_server_3d.h | 2 +- scene/2d/physics/area_2d.h | 4 +-- scene/2d/physics/collision_object_2d.h | 2 +- scene/2d/physics/physics_body_2d.h | 4 +-- scene/2d/physics/ray_cast_2d.h | 4 +-- scene/2d/physics/shape_cast_2d.h | 4 +-- scene/3d/physics/area_3d.h | 4 +-- scene/3d/physics/collision_object_3d.h | 2 +- scene/3d/physics/physics_body_3d.h | 4 +-- scene/3d/physics/ray_cast_3d.h | 4 +-- scene/3d/physics/shape_cast_3d.h | 4 +-- scene/3d/physics/soft_body_3d.h | 4 +-- scene/animation/tween.h | 6 ++-- scene/gui/container.h | 2 +- scene/gui/control.h | 6 ++-- scene/main/canvas_item.h | 28 +++++++++---------- scene/main/node.h | 16 +++++------ scene/main/scene_tree.h | 6 ++-- scene/main/viewport.h | 4 +-- scene/resources/2d/shape_2d.h | 8 +++--- servers/physics_2d/physics_server_2d.h | 14 +++++----- servers/physics_3d/physics_server_3d.h | 16 +++++------ servers/physics_3d/physics_server_3d_dummy.h | 2 +- 27 files changed, 84 insertions(+), 84 deletions(-) diff --git a/core/input/input.h b/core/input/input.h index f8e1462d378..200012b3406 100644 --- a/core/input/input.h +++ b/core/input/input.h @@ -321,8 +321,8 @@ public: bool is_action_pressed(const StringName &p_action, bool p_exact = false) const; bool is_action_just_pressed(const StringName &p_action, bool p_exact = false) const; bool is_action_just_released(const StringName &p_action, bool p_exact = false) const; - bool is_action_just_pressed_by_event(const StringName &p_action, RequiredParam p_event, bool p_exact = false) const; - bool is_action_just_released_by_event(const StringName &p_action, RequiredParam p_event, bool p_exact = false) const; + bool is_action_just_pressed_by_event(const StringName &p_action, RequiredParam rp_event, bool p_exact = false) const; + bool is_action_just_released_by_event(const StringName &p_action, RequiredParam rp_event, bool p_exact = false) const; float get_action_strength(const StringName &p_action, bool p_exact = false) const; float get_action_raw_strength(const StringName &p_action, bool p_exact = false) const; @@ -350,7 +350,7 @@ public: void warp_mouse(const Vector2 &p_position); Point2 warp_mouse_motion(const Ref &p_motion, const Rect2 &p_rect); - void parse_input_event(RequiredParam p_event); + void parse_input_event(RequiredParam rp_event); void set_gravity(const Vector3 &p_gravity); void set_accelerometer(const Vector3 &p_accel); diff --git a/core/input/input_map.h b/core/input/input_map.h index 02fe15d1384..d72590407e6 100644 --- a/core/input/input_map.h +++ b/core/input/input_map.h @@ -87,13 +87,13 @@ public: float action_get_deadzone(const StringName &p_action); void action_set_deadzone(const StringName &p_action, float p_deadzone); - void action_add_event(const StringName &p_action, RequiredParam p_event); - bool action_has_event(const StringName &p_action, RequiredParam p_event); - void action_erase_event(const StringName &p_action, RequiredParam p_event); + void action_add_event(const StringName &p_action, RequiredParam rp_event); + bool action_has_event(const StringName &p_action, RequiredParam rp_event); + void action_erase_event(const StringName &p_action, RequiredParam rp_event); void action_erase_events(const StringName &p_action); const List> *action_get_events(const StringName &p_action); - bool event_is_action(RequiredParam p_event, const StringName &p_action, bool p_exact_match = false) const; + bool event_is_action(RequiredParam rp_event, const StringName &p_action, bool p_exact_match = false) const; int event_get_index(const Ref &p_event, const StringName &p_action, bool p_exact_match = false) const; bool event_get_action_status(const Ref &p_event, const StringName &p_action, bool p_exact_match = false, bool *r_pressed = nullptr, float *r_strength = nullptr, float *r_raw_strength = nullptr, int *r_event_index = nullptr) const; diff --git a/core/io/resource_saver.h b/core/io/resource_saver.h index 3ecf2b6bd0b..0fc660c1a0d 100644 --- a/core/io/resource_saver.h +++ b/core/io/resource_saver.h @@ -83,7 +83,7 @@ public: FLAG_REPLACE_SUBRESOURCE_PATHS = 64, }; - static Error save(RequiredParam p_resource, const String &p_path = "", uint32_t p_flags = (uint32_t)FLAG_NONE); + static Error save(RequiredParam rp_resource, const String &p_path = "", uint32_t p_flags = (uint32_t)FLAG_NONE); static void get_recognized_extensions(const Ref &p_resource, List *p_extensions); static void add_resource_format_saver(Ref p_format_saver, bool p_at_front = false); static void remove_resource_format_saver(Ref p_format_saver); diff --git a/modules/godot_physics_3d/godot_physics_server_3d.h b/modules/godot_physics_3d/godot_physics_server_3d.h index 43e7c35f14b..417bfd26a72 100644 --- a/modules/godot_physics_3d/godot_physics_server_3d.h +++ b/modules/godot_physics_3d/godot_physics_server_3d.h @@ -263,7 +263,7 @@ public: virtual RID soft_body_create() override; - virtual void soft_body_update_rendering_server(RID p_body, RequiredParam p_rendering_server_handler) override; + virtual void soft_body_update_rendering_server(RID p_body, RequiredParam rp_rendering_server_handler) override; virtual void soft_body_set_space(RID p_body, RID p_space) override; virtual RID soft_body_get_space(RID p_body) const override; diff --git a/modules/jolt_physics/jolt_physics_server_3d.h b/modules/jolt_physics/jolt_physics_server_3d.h index 4695116055e..f29d97a9fe8 100644 --- a/modules/jolt_physics/jolt_physics_server_3d.h +++ b/modules/jolt_physics/jolt_physics_server_3d.h @@ -300,7 +300,7 @@ public: virtual RID soft_body_create() override; - virtual void soft_body_update_rendering_server(RID p_body, RequiredParam p_rendering_server_handler) override; + virtual void soft_body_update_rendering_server(RID p_body, RequiredParam rp_rendering_server_handler) override; virtual void soft_body_set_space(RID p_body, RID p_space) override; virtual RID soft_body_get_space(RID p_body) const override; diff --git a/scene/2d/physics/area_2d.h b/scene/2d/physics/area_2d.h index 2a3d99cebd6..ec4066efa28 100644 --- a/scene/2d/physics/area_2d.h +++ b/scene/2d/physics/area_2d.h @@ -185,8 +185,8 @@ public: bool has_overlapping_bodies() const; bool has_overlapping_areas() const; - bool overlaps_area(RequiredParam p_area) const; - bool overlaps_body(RequiredParam p_body) const; + bool overlaps_area(RequiredParam rp_area) const; + bool overlaps_body(RequiredParam rp_body) const; void set_audio_bus_override(bool p_override); bool is_overriding_audio_bus() const; diff --git a/scene/2d/physics/collision_object_2d.h b/scene/2d/physics/collision_object_2d.h index daba8168a2c..3156d906ce1 100644 --- a/scene/2d/physics/collision_object_2d.h +++ b/scene/2d/physics/collision_object_2d.h @@ -154,7 +154,7 @@ public: void shape_owner_set_one_way_collision_margin(uint32_t p_owner, real_t p_margin); real_t get_shape_owner_one_way_collision_margin(uint32_t p_owner) const; - void shape_owner_add_shape(uint32_t p_owner, RequiredParam p_shape); + void shape_owner_add_shape(uint32_t p_owner, RequiredParam rp_shape); int shape_owner_get_shape_count(uint32_t p_owner) const; Ref shape_owner_get_shape(uint32_t p_owner, int p_shape) const; int shape_owner_get_shape_index(uint32_t p_owner, int p_shape) const; diff --git a/scene/2d/physics/physics_body_2d.h b/scene/2d/physics/physics_body_2d.h index 56f55db2f96..5272170b812 100644 --- a/scene/2d/physics/physics_body_2d.h +++ b/scene/2d/physics/physics_body_2d.h @@ -54,6 +54,6 @@ public: Vector2 get_gravity() const; TypedArray get_collision_exceptions(); - void add_collision_exception_with(RequiredParam p_node); //must be physicsbody - void remove_collision_exception_with(RequiredParam p_node); + void add_collision_exception_with(RequiredParam rp_node); //must be physicsbody + void remove_collision_exception_with(RequiredParam rp_node); }; diff --git a/scene/2d/physics/ray_cast_2d.h b/scene/2d/physics/ray_cast_2d.h index 6b53c6d0714..affcabf5aa0 100644 --- a/scene/2d/physics/ray_cast_2d.h +++ b/scene/2d/physics/ray_cast_2d.h @@ -97,9 +97,9 @@ public: Vector2 get_collision_normal() const; void add_exception_rid(const RID &p_rid); - void add_exception(RequiredParam p_node); + void add_exception(RequiredParam rp_node); void remove_exception_rid(const RID &p_rid); - void remove_exception(RequiredParam p_node); + void remove_exception(RequiredParam rp_node); void clear_exceptions(); RayCast2D(); diff --git a/scene/2d/physics/shape_cast_2d.h b/scene/2d/physics/shape_cast_2d.h index 07972cefbd7..d0d1b9513a0 100644 --- a/scene/2d/physics/shape_cast_2d.h +++ b/scene/2d/physics/shape_cast_2d.h @@ -112,9 +112,9 @@ public: real_t get_closest_collision_unsafe_fraction() const; void add_exception_rid(const RID &p_rid); - void add_exception(RequiredParam p_node); + void add_exception(RequiredParam rp_node); void remove_exception_rid(const RID &p_rid); - void remove_exception(RequiredParam p_node); + void remove_exception(RequiredParam rp_node); void clear_exceptions(); PackedStringArray get_configuration_warnings() const override; diff --git a/scene/3d/physics/area_3d.h b/scene/3d/physics/area_3d.h index 22aca56e7b6..438bc68c61a 100644 --- a/scene/3d/physics/area_3d.h +++ b/scene/3d/physics/area_3d.h @@ -204,8 +204,8 @@ public: bool has_overlapping_bodies() const; bool has_overlapping_areas() const; - bool overlaps_area(RequiredParam p_area) const; - bool overlaps_body(RequiredParam p_body) const; + bool overlaps_area(RequiredParam rp_area) const; + bool overlaps_body(RequiredParam rp_body) const; void set_audio_bus_override(bool p_override); bool is_overriding_audio_bus() const; diff --git a/scene/3d/physics/collision_object_3d.h b/scene/3d/physics/collision_object_3d.h index 24af2e15880..dc841d16734 100644 --- a/scene/3d/physics/collision_object_3d.h +++ b/scene/3d/physics/collision_object_3d.h @@ -157,7 +157,7 @@ public: void shape_owner_set_disabled(uint32_t p_owner, bool p_disabled); bool is_shape_owner_disabled(uint32_t p_owner) const; - void shape_owner_add_shape(uint32_t p_owner, RequiredParam p_shape); + void shape_owner_add_shape(uint32_t p_owner, RequiredParam rp_shape); int shape_owner_get_shape_count(uint32_t p_owner) const; Ref shape_owner_get_shape(uint32_t p_owner, int p_shape) const; int shape_owner_get_shape_index(uint32_t p_owner, int p_shape) const; diff --git a/scene/3d/physics/physics_body_3d.h b/scene/3d/physics/physics_body_3d.h index fe51b8828e1..a5a99ceafc5 100644 --- a/scene/3d/physics/physics_body_3d.h +++ b/scene/3d/physics/physics_body_3d.h @@ -65,6 +65,6 @@ public: virtual real_t get_inverse_mass() const; TypedArray get_collision_exceptions(); - void add_collision_exception_with(RequiredParam p_node); //must be physicsbody - void remove_collision_exception_with(RequiredParam p_node); + void add_collision_exception_with(RequiredParam rp_node); //must be physicsbody + void remove_collision_exception_with(RequiredParam rp_node); }; diff --git a/scene/3d/physics/ray_cast_3d.h b/scene/3d/physics/ray_cast_3d.h index 2d85b3aa413..8ad4f486366 100644 --- a/scene/3d/physics/ray_cast_3d.h +++ b/scene/3d/physics/ray_cast_3d.h @@ -127,9 +127,9 @@ public: int get_collision_face_index() const; void add_exception_rid(const RID &p_rid); - void add_exception(RequiredParam p_node); + void add_exception(RequiredParam rp_node); void remove_exception_rid(const RID &p_rid); - void remove_exception(RequiredParam p_node); + void remove_exception(RequiredParam rp_node); void clear_exceptions(); RayCast3D(); diff --git a/scene/3d/physics/shape_cast_3d.h b/scene/3d/physics/shape_cast_3d.h index e0a8ee6557c..b0be9330d6e 100644 --- a/scene/3d/physics/shape_cast_3d.h +++ b/scene/3d/physics/shape_cast_3d.h @@ -135,9 +135,9 @@ public: bool is_colliding() const; void add_exception_rid(const RID &p_rid); - void add_exception(RequiredParam p_node); + void add_exception(RequiredParam rp_node); void remove_exception_rid(const RID &p_rid); - void remove_exception(RequiredParam p_node); + void remove_exception(RequiredParam rp_node); void clear_exceptions(); virtual PackedStringArray get_configuration_warnings() const override; diff --git a/scene/3d/physics/soft_body_3d.h b/scene/3d/physics/soft_body_3d.h index 7f7218f4ded..05ea50cfe38 100644 --- a/scene/3d/physics/soft_body_3d.h +++ b/scene/3d/physics/soft_body_3d.h @@ -177,8 +177,8 @@ public: real_t get_drag_coefficient(); TypedArray get_collision_exceptions(); - void add_collision_exception_with(RequiredParam p_node); - void remove_collision_exception_with(RequiredParam p_node); + void add_collision_exception_with(RequiredParam rp_node); + void remove_collision_exception_with(RequiredParam rp_node); Vector3 get_point_transform(int p_point_index); diff --git a/scene/animation/tween.h b/scene/animation/tween.h index e909d1aa3f3..e417b064705 100644 --- a/scene/animation/tween.h +++ b/scene/animation/tween.h @@ -143,11 +143,11 @@ protected: virtual String _to_string() override; public: - RequiredResult tween_property(RequiredParam p_target, const NodePath &p_property, Variant p_to, double p_duration); + RequiredResult tween_property(RequiredParam rp_target, const NodePath &p_property, Variant p_to, double p_duration); RequiredResult tween_interval(double p_time); RequiredResult tween_callback(const Callable &p_callback); RequiredResult tween_method(const Callable &p_callback, const Variant p_from, Variant p_to, double p_duration); - RequiredResult tween_subtween(RequiredParam p_subtween); + RequiredResult tween_subtween(RequiredParam rp_subtween); void append(Ref p_tweener); bool custom_step(double p_delta); @@ -160,7 +160,7 @@ public: bool is_valid(); void clear(); - RequiredResult bind_node(RequiredParam p_node); + RequiredResult bind_node(RequiredParam rp_node); RequiredResult set_process_mode(TweenProcessMode p_mode); TweenProcessMode get_process_mode() const; RequiredResult set_pause_mode(TweenPauseMode p_mode); diff --git a/scene/gui/container.h b/scene/gui/container.h index f928b1d5819..50be92d9b9a 100644 --- a/scene/gui/container.h +++ b/scene/gui/container.h @@ -65,7 +65,7 @@ public: NOTIFICATION_SORT_CHILDREN = 51, }; - void fit_child_in_rect(RequiredParam p_child, const Rect2 &p_rect); + void fit_child_in_rect(RequiredParam rp_child, const Rect2 &p_rect); virtual Vector get_allowed_size_flags_horizontal() const; virtual Vector get_allowed_size_flags_vertical() const; diff --git a/scene/gui/control.h b/scene/gui/control.h index 6dfbe20a549..28dcd43ff15 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -674,9 +674,9 @@ public: void begin_bulk_theme_override(); void end_bulk_theme_override(); - void add_theme_icon_override(const StringName &p_name, RequiredParam p_icon); - void add_theme_style_override(const StringName &p_name, RequiredParam p_style); - void add_theme_font_override(const StringName &p_name, RequiredParam p_font); + void add_theme_icon_override(const StringName &p_name, RequiredParam rp_icon); + void add_theme_style_override(const StringName &p_name, RequiredParam rp_style); + void add_theme_font_override(const StringName &p_name, RequiredParam rp_font); void add_theme_font_size_override(const StringName &p_name, int p_font_size); void add_theme_color_override(const StringName &p_name, const Color &p_color); void add_theme_constant_override(const StringName &p_name, int p_constant); diff --git a/scene/main/canvas_item.h b/scene/main/canvas_item.h index 1b3a94bd6d9..3e838aa2280 100644 --- a/scene/main/canvas_item.h +++ b/scene/main/canvas_item.h @@ -317,26 +317,26 @@ public: void draw_ellipse(const Point2 &p_pos, real_t p_major, real_t p_minor, const Color &p_color, bool p_filled = true, real_t p_width = -1.0, bool p_antialiased = false); void draw_circle(const Point2 &p_pos, real_t p_radius, const Color &p_color, bool p_filled = true, real_t p_width = -1.0, bool p_antialiased = false); void draw_texture(RequiredParam rp_texture, const Point2 &p_pos, const Color &p_modulate = Color(1, 1, 1, 1)); - void draw_texture_rect(RequiredParam p_texture, const Rect2 &p_rect, bool p_tile = false, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false); - void draw_texture_rect_region(RequiredParam p_texture, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, bool p_clip_uv = false); - void draw_msdf_texture_rect_region(RequiredParam p_texture, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), double p_outline = 0.0, double p_pixel_range = 4.0, double p_scale = 1.0); - void draw_lcd_texture_rect_region(RequiredParam p_texture, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1)); - void draw_style_box(RequiredParam p_style_box, const Rect2 &p_rect); + void draw_texture_rect(RequiredParam rp_texture, const Rect2 &p_rect, bool p_tile = false, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false); + void draw_texture_rect_region(RequiredParam rp_texture, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, bool p_clip_uv = false); + void draw_msdf_texture_rect_region(RequiredParam rp_texture, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), double p_outline = 0.0, double p_pixel_range = 4.0, double p_scale = 1.0); + void draw_lcd_texture_rect_region(RequiredParam rp_texture, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1)); + void draw_style_box(RequiredParam rp_style_box, const Rect2 &p_rect); void draw_primitive(const Vector &p_points, const Vector &p_colors, const Vector &p_uvs, Ref p_texture = Ref()); void draw_polygon(const Vector &p_points, const Vector &p_colors, const Vector &p_uvs = Vector(), Ref p_texture = Ref()); void draw_colored_polygon(const Vector &p_points, const Color &p_color, const Vector &p_uvs = Vector(), Ref p_texture = Ref()); - void draw_mesh(RequiredParam p_mesh, const Ref &p_texture, const Transform2D &p_transform = Transform2D(), const Color &p_modulate = Color(1, 1, 1)); - void draw_multimesh(RequiredParam p_multimesh, const Ref &p_texture); + void draw_mesh(RequiredParam rp_mesh, const Ref &p_texture, const Transform2D &p_transform = Transform2D(), const Color &p_modulate = Color(1, 1, 1)); + void draw_multimesh(RequiredParam rp_multimesh, const Ref &p_texture); - void draw_string(RequiredParam p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const; - void draw_multiline_string(RequiredParam p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_max_lines = -1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField p_brk_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND, BitField p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const; + void draw_string(RequiredParam rp_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const; + void draw_multiline_string(RequiredParam rp_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_max_lines = -1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField p_brk_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND, BitField p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const; - void draw_string_outline(RequiredParam p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const; - void draw_multiline_string_outline(RequiredParam p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_max_lines = -1, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField p_brk_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND, BitField p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const; + void draw_string_outline(RequiredParam rp_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const; + void draw_multiline_string_outline(RequiredParam rp_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment = HORIZONTAL_ALIGNMENT_LEFT, float p_width = -1, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_max_lines = -1, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), BitField p_brk_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND, BitField p_jst_flags = TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_WORD_BOUND, TextServer::Direction p_direction = TextServer::DIRECTION_AUTO, TextServer::Orientation p_orientation = TextServer::ORIENTATION_HORIZONTAL, float p_oversampling = 0.0) const; - void draw_char(RequiredParam p_font, const Point2 &p_pos, const String &p_char, int p_font_size = Font::DEFAULT_FONT_SIZE, const Color &p_modulate = Color(1.0, 1.0, 1.0), float p_oversampling = 0.0) const; - void draw_char_outline(RequiredParam p_font, const Point2 &p_pos, const String &p_char, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), float p_oversampling = 0.0) const; + void draw_char(RequiredParam rp_font, const Point2 &p_pos, const String &p_char, int p_font_size = Font::DEFAULT_FONT_SIZE, const Color &p_modulate = Color(1.0, 1.0, 1.0), float p_oversampling = 0.0) const; + void draw_char_outline(RequiredParam rp_font, const Point2 &p_pos, const String &p_char, int p_font_size = Font::DEFAULT_FONT_SIZE, int p_size = 1, const Color &p_modulate = Color(1.0, 1.0, 1.0), float p_oversampling = 0.0) const; void draw_set_transform(const Point2 &p_offset, real_t p_rot = 0.0, const Size2 &p_scale = Size2(1.0, 1.0)); void draw_set_transform_matrix(const Transform2D &p_matrix); @@ -387,7 +387,7 @@ public: virtual void set_use_parent_material(bool p_use_parent_material); bool get_use_parent_material() const; - RequiredResult make_input_local(RequiredParam p_event) const; + RequiredResult make_input_local(RequiredParam rp_event) const; Vector2 make_canvas_position_local(const Vector2 &screen_point) const; Vector2 get_global_mouse_position() const; diff --git a/scene/main/node.h b/scene/main/node.h index dd62d12b79b..33489595a32 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -534,7 +534,7 @@ public: bool has_node_and_resource(const NodePath &p_path) const; Node *get_node_and_resource(const NodePath &p_path, Ref &r_res, Vector &r_leftover_subpath, bool p_last_is_property = true) const; - virtual void reparent(RequiredParam p_parent, bool p_keep_global_transform = true); + virtual void reparent(RequiredParam rp_parent, bool p_keep_global_transform = true); Node *get_parent() const; Node *find_parent(const String &p_pattern) const; @@ -553,11 +553,11 @@ public: _FORCE_INLINE_ bool is_inside_tree() const { return data.tree; } bool is_internal() const { return data.internal_mode != INTERNAL_MODE_DISABLED; } - bool is_ancestor_of(RequiredParam p_node) const; - bool is_greater_than(RequiredParam p_node) const; + bool is_ancestor_of(RequiredParam rp_node) const; + bool is_greater_than(RequiredParam rp_node) const; NodePath get_path() const; - NodePath get_path_to(RequiredParam p_node, bool p_use_unique_path = false) const; + NodePath get_path_to(RequiredParam rp_node, bool p_use_unique_path = false) const; Node *find_common_parent_with(const Node *p_node) const; void add_to_group(const StringName &p_identifier, bool p_persistent = false); @@ -572,7 +572,7 @@ public: void get_groups(List *p_groups) const; int get_persistent_group_count() const; - void move_child(RequiredParam p_child, int p_index); + void move_child(RequiredParam rp_child, int p_index); void _move_child(Node *p_child, int p_index, bool p_ignore_end = false); void set_owner(Node *p_owner); @@ -621,8 +621,8 @@ public: void set_editor_description(const String &p_editor_description); String get_editor_description() const; - void set_editable_instance(RequiredParam p_node, bool p_editable); - bool is_editable_instance(RequiredParam p_node) const; + void set_editable_instance(RequiredParam rp_node, bool p_editable); + bool is_editable_instance(RequiredParam rp_node) const; Node *get_deepest_editable_node(Node *p_start_node) const; #ifdef TOOLS_ENABLED @@ -742,7 +742,7 @@ public: return binds; } - void replace_by(RequiredParam p_node, bool p_keep_groups = false); + void replace_by(RequiredParam rp_node, bool p_keep_groups = false); void set_process_mode(ProcessMode p_mode); ProcessMode get_process_mode() const; diff --git a/scene/main/scene_tree.h b/scene/main/scene_tree.h index e73035ac6a4..fce3fabe287 100644 --- a/scene/main/scene_tree.h +++ b/scene/main/scene_tree.h @@ -407,7 +407,7 @@ public: int get_node_count() const; - void queue_delete(RequiredParam p_object); + void queue_delete(RequiredParam rp_object); Vector get_nodes_in_group(const StringName &p_group); Node *get_first_node_in_group(const StringName &p_group); @@ -423,8 +423,8 @@ public: void set_current_scene(Node *p_scene); Node *get_current_scene() const; Error change_scene_to_file(const String &p_path); - Error change_scene_to_packed(RequiredParam p_scene); - Error change_scene_to_node(RequiredParam p_node); + Error change_scene_to_packed(RequiredParam rp_scene); + Error change_scene_to_node(RequiredParam rp_node); Error reload_current_scene(); void unload_current_scene(); diff --git a/scene/main/viewport.h b/scene/main/viewport.h index b23df0f0401..bf512813b10 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -609,9 +609,9 @@ public: Vector2 get_camera_rect_size() const; void push_text_input(const String &p_text); - void push_input(RequiredParam p_event, bool p_local_coords = false); + void push_input(RequiredParam rp_event, bool p_local_coords = false); #ifndef DISABLE_DEPRECATED - void push_unhandled_input(RequiredParam p_event, bool p_local_coords = false); + void push_unhandled_input(RequiredParam rp_event, bool p_local_coords = false); #endif // DISABLE_DEPRECATED void notify_mouse_entered(); void notify_mouse_exited(); diff --git a/scene/resources/2d/shape_2d.h b/scene/resources/2d/shape_2d.h index 2ce6b63efa2..d98fcb2308d 100644 --- a/scene/resources/2d/shape_2d.h +++ b/scene/resources/2d/shape_2d.h @@ -49,11 +49,11 @@ public: void set_custom_solver_bias(real_t p_bias); real_t get_custom_solver_bias() const; - bool collide_with_motion(const Transform2D &p_local_xform, const Vector2 &p_local_motion, RequiredParam p_shape, const Transform2D &p_shape_xform, const Vector2 &p_shape_motion); - bool collide(const Transform2D &p_local_xform, RequiredParam p_shape, const Transform2D &p_shape_xform); + bool collide_with_motion(const Transform2D &p_local_xform, const Vector2 &p_local_motion, RequiredParam rp_shape, const Transform2D &p_shape_xform, const Vector2 &p_shape_motion); + bool collide(const Transform2D &p_local_xform, RequiredParam rp_shape, const Transform2D &p_shape_xform); - PackedVector2Array collide_with_motion_and_get_contacts(const Transform2D &p_local_xform, const Vector2 &p_local_motion, RequiredParam p_shape, const Transform2D &p_shape_xform, const Vector2 &p_shape_motion); - PackedVector2Array collide_and_get_contacts(const Transform2D &p_local_xform, RequiredParam p_shape, const Transform2D &p_shape_xform); + PackedVector2Array collide_with_motion_and_get_contacts(const Transform2D &p_local_xform, const Vector2 &p_local_motion, RequiredParam rp_shape, const Transform2D &p_shape_xform, const Vector2 &p_shape_motion); + PackedVector2Array collide_and_get_contacts(const Transform2D &p_local_xform, RequiredParam rp_shape, const Transform2D &p_shape_xform); virtual void draw(const RID &p_to_rid, const Color &p_color) {} virtual Rect2 get_rect() const { return Rect2(); } diff --git a/servers/physics_2d/physics_server_2d.h b/servers/physics_2d/physics_server_2d.h index c7bb83f8b97..3a9d8d4e4cd 100644 --- a/servers/physics_2d/physics_server_2d.h +++ b/servers/physics_2d/physics_server_2d.h @@ -124,12 +124,12 @@ class PhysicsShapeQueryParameters2D; class PhysicsDirectSpaceState2D : public Object { GDCLASS(PhysicsDirectSpaceState2D, Object); - Dictionary _intersect_ray(RequiredParam p_ray_query); - TypedArray _intersect_point(RequiredParam p_point_query, int p_max_results = 32); - TypedArray _intersect_shape(RequiredParam p_shape_query, int p_max_results = 32); - Vector _cast_motion(RequiredParam p_shape_query); - TypedArray _collide_shape(RequiredParam p_shape_query, int p_max_results = 32); - Dictionary _get_rest_info(RequiredParam p_shape_query); + Dictionary _intersect_ray(RequiredParam rp_ray_query); + TypedArray _intersect_point(RequiredParam rp_point_query, int p_max_results = 32); + TypedArray _intersect_shape(RequiredParam rp_shape_query, int p_max_results = 32); + Vector _cast_motion(RequiredParam rp_shape_query); + TypedArray _collide_shape(RequiredParam rp_shape_query, int p_max_results = 32); + Dictionary _get_rest_info(RequiredParam rp_shape_query); protected: static void _bind_methods(); @@ -216,7 +216,7 @@ class PhysicsServer2D : public Object { static PhysicsServer2D *singleton; - virtual bool _body_test_motion(RID p_body, RequiredParam p_parameters, const Ref &p_result = Ref()); + virtual bool _body_test_motion(RID p_body, RequiredParam rp_parameters, const Ref &p_result = Ref()); protected: static void _bind_methods(); diff --git a/servers/physics_3d/physics_server_3d.h b/servers/physics_3d/physics_server_3d.h index 3eacaf5a12f..77536d60ea9 100644 --- a/servers/physics_3d/physics_server_3d.h +++ b/servers/physics_3d/physics_server_3d.h @@ -126,12 +126,12 @@ class PhysicsDirectSpaceState3D : public Object { GDCLASS(PhysicsDirectSpaceState3D, Object); private: - Dictionary _intersect_ray(RequiredParam p_ray_query); - TypedArray _intersect_point(RequiredParam p_point_query, int p_max_results = 32); - TypedArray _intersect_shape(RequiredParam p_shape_query, int p_max_results = 32); - Vector _cast_motion(RequiredParam p_shape_query); - TypedArray _collide_shape(RequiredParam p_shape_query, int p_max_results = 32); - Dictionary _get_rest_info(RequiredParam p_shape_query); + Dictionary _intersect_ray(RequiredParam rp_ray_query); + TypedArray _intersect_point(RequiredParam rp_point_query, int p_max_results = 32); + TypedArray _intersect_shape(RequiredParam rp_shape_query, int p_max_results = 32); + Vector _cast_motion(RequiredParam rp_shape_query); + TypedArray _collide_shape(RequiredParam rp_shape_query, int p_max_results = 32); + Dictionary _get_rest_info(RequiredParam rp_shape_query); protected: static void _bind_methods(); @@ -238,7 +238,7 @@ class PhysicsServer3D : public Object { static PhysicsServer3D *singleton; - virtual bool _body_test_motion(RID p_body, RequiredParam p_parameters, const Ref &p_result = Ref()); + virtual bool _body_test_motion(RID p_body, RequiredParam rp_parameters, const Ref &p_result = Ref()); protected: static void _bind_methods(); @@ -576,7 +576,7 @@ public: virtual RID soft_body_create() = 0; - virtual void soft_body_update_rendering_server(RID p_body, RequiredParam p_rendering_server_handler) = 0; + virtual void soft_body_update_rendering_server(RID p_body, RequiredParam rp_rendering_server_handler) = 0; virtual void soft_body_set_space(RID p_body, RID p_space) = 0; virtual RID soft_body_get_space(RID p_body) const = 0; diff --git a/servers/physics_3d/physics_server_3d_dummy.h b/servers/physics_3d/physics_server_3d_dummy.h index ad0662c709c..d788423ba5c 100644 --- a/servers/physics_3d/physics_server_3d_dummy.h +++ b/servers/physics_3d/physics_server_3d_dummy.h @@ -312,7 +312,7 @@ public: virtual RID soft_body_create() override { return RID(); } - virtual void soft_body_update_rendering_server(RID p_body, RequiredParam p_rendering_server_handler) override {} + virtual void soft_body_update_rendering_server(RID p_body, RequiredParam rp_rendering_server_handler) override {} virtual void soft_body_set_space(RID p_body, RID p_space) override {} virtual RID soft_body_get_space(RID p_body) const override { return RID(); }