diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-04 14:31:35 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-04 14:31:35 +0200 |
commit | 2ac88339e40d14bb586afa13af7c7b89c754e9da (patch) | |
tree | 01e62bd576996493d504b5ec0a04a5bf01031940 | |
parent | fb32399183a223ccbbc2bf2064496b223eaedff5 (diff) | |
parent | 25f9f923a11ab366faf4a50cf7834b3b5b9d4f8d (diff) | |
download | redot-engine-2ac88339e40d14bb586afa13af7c7b89c754e9da.tar.gz |
Merge pull request #89721 from KoBeWi/position_who
Rename some arguments called "position"
-rw-r--r-- | doc/classes/CollisionObject3D.xml | 8 | ||||
-rw-r--r-- | doc/classes/GraphEdit.xml | 4 | ||||
-rw-r--r-- | doc/classes/StatusIndicator.xml | 2 | ||||
-rw-r--r-- | doc/classes/Tree.xml | 4 | ||||
-rw-r--r-- | scene/3d/physics/collision_object_3d.cpp | 4 | ||||
-rw-r--r-- | scene/gui/graph_edit.cpp | 2 | ||||
-rw-r--r-- | scene/gui/tree.cpp | 4 | ||||
-rw-r--r-- | scene/main/status_indicator.cpp | 2 |
8 files changed, 15 insertions, 15 deletions
diff --git a/doc/classes/CollisionObject3D.xml b/doc/classes/CollisionObject3D.xml index b45a5d8c56..063c27c76a 100644 --- a/doc/classes/CollisionObject3D.xml +++ b/doc/classes/CollisionObject3D.xml @@ -14,11 +14,11 @@ <return type="void" /> <param index="0" name="camera" type="Camera3D" /> <param index="1" name="event" type="InputEvent" /> - <param index="2" name="position" type="Vector3" /> + <param index="2" name="event_position" type="Vector3" /> <param index="3" name="normal" type="Vector3" /> <param index="4" name="shape_idx" type="int" /> <description> - Receives unhandled [InputEvent]s. [param position] is the location in world space of the mouse pointer on the surface of the shape with index [param shape_idx] and [param normal] is the normal vector of the surface at that point. Connect to the [signal input_event] signal to easily pick up these events. + Receives unhandled [InputEvent]s. [param event_position] is the location in world space of the mouse pointer on the surface of the shape with index [param shape_idx] and [param normal] is the normal vector of the surface at that point. Connect to the [signal input_event] signal to easily pick up these events. [b]Note:[/b] [method _input_event] requires [member input_ray_pickable] to be [code]true[/code] and at least one [member collision_layer] bit to be set. </description> </method> @@ -207,11 +207,11 @@ <signal name="input_event"> <param index="0" name="camera" type="Node" /> <param index="1" name="event" type="InputEvent" /> - <param index="2" name="position" type="Vector3" /> + <param index="2" name="event_position" type="Vector3" /> <param index="3" name="normal" type="Vector3" /> <param index="4" name="shape_idx" type="int" /> <description> - Emitted when the object receives an unhandled [InputEvent]. [param position] is the location in world space of the mouse pointer on the surface of the shape with index [param shape_idx] and [param normal] is the normal vector of the surface at that point. + Emitted when the object receives an unhandled [InputEvent]. [param event_position] is the location in world space of the mouse pointer on the surface of the shape with index [param shape_idx] and [param normal] is the normal vector of the surface at that point. </description> </signal> <signal name="mouse_entered"> diff --git a/doc/classes/GraphEdit.xml b/doc/classes/GraphEdit.xml index a9ac47d8df..18469b00a8 100644 --- a/doc/classes/GraphEdit.xml +++ b/doc/classes/GraphEdit.xml @@ -413,9 +413,9 @@ </description> </signal> <signal name="popup_request"> - <param index="0" name="position" type="Vector2" /> + <param index="0" name="at_position" type="Vector2" /> <description> - Emitted when a popup is requested. Happens on right-clicking in the GraphEdit. [param position] is the position of the mouse pointer when the signal is sent. + Emitted when a popup is requested. Happens on right-clicking in the GraphEdit. [param at_position] is the position of the mouse pointer when the signal is sent. </description> </signal> <signal name="scroll_offset_changed"> diff --git a/doc/classes/StatusIndicator.xml b/doc/classes/StatusIndicator.xml index 6b015c3d15..e1fcc35ad7 100644 --- a/doc/classes/StatusIndicator.xml +++ b/doc/classes/StatusIndicator.xml @@ -22,7 +22,7 @@ <signals> <signal name="pressed"> <param index="0" name="mouse_button" type="int" /> - <param index="1" name="position" type="Vector2i" /> + <param index="1" name="mouse_position" type="Vector2i" /> <description> Emitted when the status indicator is pressed. </description> diff --git a/doc/classes/Tree.xml b/doc/classes/Tree.xml index 0f318efbd1..d95492479c 100644 --- a/doc/classes/Tree.xml +++ b/doc/classes/Tree.xml @@ -414,7 +414,7 @@ </description> </signal> <signal name="empty_clicked"> - <param index="0" name="position" type="Vector2" /> + <param index="0" name="click_position" type="Vector2" /> <param index="1" name="mouse_button_index" type="int" /> <description> Emitted when a mouse button is clicked in the empty space of the tree. @@ -442,7 +442,7 @@ </description> </signal> <signal name="item_mouse_selected"> - <param index="0" name="position" type="Vector2" /> + <param index="0" name="mouse_position" type="Vector2" /> <param index="1" name="mouse_button_index" type="int" /> <description> Emitted when an item is selected with a mouse button. diff --git a/scene/3d/physics/collision_object_3d.cpp b/scene/3d/physics/collision_object_3d.cpp index bbd2ef2fb8..54752b1281 100644 --- a/scene/3d/physics/collision_object_3d.cpp +++ b/scene/3d/physics/collision_object_3d.cpp @@ -489,11 +489,11 @@ void CollisionObject3D::_bind_methods() { ClassDB::bind_method(D_METHOD("shape_owner_clear_shapes", "owner_id"), &CollisionObject3D::shape_owner_clear_shapes); ClassDB::bind_method(D_METHOD("shape_find_owner", "shape_index"), &CollisionObject3D::shape_find_owner); - GDVIRTUAL_BIND(_input_event, "camera", "event", "position", "normal", "shape_idx"); + GDVIRTUAL_BIND(_input_event, "camera", "event", "event_position", "normal", "shape_idx"); GDVIRTUAL_BIND(_mouse_enter); GDVIRTUAL_BIND(_mouse_exit); - ADD_SIGNAL(MethodInfo("input_event", PropertyInfo(Variant::OBJECT, "camera", PROPERTY_HINT_RESOURCE_TYPE, "Node"), PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"), PropertyInfo(Variant::VECTOR3, "position"), PropertyInfo(Variant::VECTOR3, "normal"), PropertyInfo(Variant::INT, "shape_idx"))); + ADD_SIGNAL(MethodInfo("input_event", PropertyInfo(Variant::OBJECT, "camera", PROPERTY_HINT_RESOURCE_TYPE, "Node"), PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"), PropertyInfo(Variant::VECTOR3, "event_position"), PropertyInfo(Variant::VECTOR3, "normal"), PropertyInfo(Variant::INT, "shape_idx"))); ADD_SIGNAL(MethodInfo("mouse_entered")); ADD_SIGNAL(MethodInfo("mouse_exited")); diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 8bce5c0caa..c8909840c8 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -2315,7 +2315,7 @@ void GraphEdit::_bind_methods() { ADD_SIGNAL(MethodInfo("node_selected", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node"))); ADD_SIGNAL(MethodInfo("node_deselected", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node"))); - ADD_SIGNAL(MethodInfo("popup_request", PropertyInfo(Variant::VECTOR2, "position"))); + ADD_SIGNAL(MethodInfo("popup_request", PropertyInfo(Variant::VECTOR2, "at_position"))); ADD_SIGNAL(MethodInfo("begin_node_move")); ADD_SIGNAL(MethodInfo("end_node_move")); diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 8c544dcacf..61014585a5 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -5593,8 +5593,8 @@ void Tree::_bind_methods() { ADD_SIGNAL(MethodInfo("item_selected")); ADD_SIGNAL(MethodInfo("cell_selected")); ADD_SIGNAL(MethodInfo("multi_selected", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "TreeItem"), PropertyInfo(Variant::INT, "column"), PropertyInfo(Variant::BOOL, "selected"))); - ADD_SIGNAL(MethodInfo("item_mouse_selected", PropertyInfo(Variant::VECTOR2, "position"), PropertyInfo(Variant::INT, "mouse_button_index"))); - ADD_SIGNAL(MethodInfo("empty_clicked", PropertyInfo(Variant::VECTOR2, "position"), PropertyInfo(Variant::INT, "mouse_button_index"))); + ADD_SIGNAL(MethodInfo("item_mouse_selected", PropertyInfo(Variant::VECTOR2, "mouse_position"), PropertyInfo(Variant::INT, "mouse_button_index"))); + ADD_SIGNAL(MethodInfo("empty_clicked", PropertyInfo(Variant::VECTOR2, "click_position"), PropertyInfo(Variant::INT, "mouse_button_index"))); ADD_SIGNAL(MethodInfo("item_edited")); ADD_SIGNAL(MethodInfo("custom_item_clicked", PropertyInfo(Variant::INT, "mouse_button_index"))); ADD_SIGNAL(MethodInfo("item_icon_double_clicked")); diff --git a/scene/main/status_indicator.cpp b/scene/main/status_indicator.cpp index ae58bc0b18..54b2ff75ca 100644 --- a/scene/main/status_indicator.cpp +++ b/scene/main/status_indicator.cpp @@ -67,7 +67,7 @@ void StatusIndicator::_bind_methods() { ClassDB::bind_method(D_METHOD("set_visible", "visible"), &StatusIndicator::set_visible); ClassDB::bind_method(D_METHOD("is_visible"), &StatusIndicator::is_visible); - ADD_SIGNAL(MethodInfo("pressed", PropertyInfo(Variant::INT, "mouse_button"), PropertyInfo(Variant::VECTOR2I, "position"))); + ADD_SIGNAL(MethodInfo("pressed", PropertyInfo(Variant::INT, "mouse_button"), PropertyInfo(Variant::VECTOR2I, "mouse_position"))); ADD_PROPERTY(PropertyInfo(Variant::STRING, "tooltip", PROPERTY_HINT_MULTILINE_TEXT), "set_tooltip", "get_tooltip"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Image"), "set_icon", "get_icon"); |