diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-08 12:25:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-08 12:25:41 +0100 |
| commit | 1cf53ca90b16841eed7a57d20f7442d50b49ead5 (patch) | |
| tree | 4c17648c61d252fb42d09d97e173054d7c2c03f7 | |
| parent | d94bf9f7b66c7e5ec4c7438025fbcc59110cb4e7 (diff) | |
| parent | 58c38d957b79502180b3fef16fd186e67b6289b6 (diff) | |
Merge pull request #44184 from madmiraal/xrcontroller-button_released
Rename XRController signal button_release to button_released
| -rw-r--r-- | doc/classes/XRController3D.xml | 2 | ||||
| -rw-r--r-- | scene/3d/xr_nodes.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/classes/XRController3D.xml b/doc/classes/XRController3D.xml index c0f64d9e27..78684d10ee 100644 --- a/doc/classes/XRController3D.xml +++ b/doc/classes/XRController3D.xml @@ -86,7 +86,7 @@ Emitted when a button on this controller is pressed. </description> </signal> - <signal name="button_release"> + <signal name="button_released"> <argument index="0" name="button" type="int"> </argument> <description> diff --git a/scene/3d/xr_nodes.cpp b/scene/3d/xr_nodes.cpp index 674868a04c..763461880f 100644 --- a/scene/3d/xr_nodes.cpp +++ b/scene/3d/xr_nodes.cpp @@ -211,7 +211,7 @@ void XRController3D::_notification(int p_what) { emit_signal("button_pressed", i); button_states += mask; } else if (was_pressed && !is_pressed) { - emit_signal("button_release", i); + emit_signal("button_released", i); button_states -= mask; }; @@ -257,7 +257,7 @@ void XRController3D::_bind_methods() { ClassDB::bind_method(D_METHOD("get_mesh"), &XRController3D::get_mesh); ADD_SIGNAL(MethodInfo("button_pressed", PropertyInfo(Variant::INT, "button"))); - ADD_SIGNAL(MethodInfo("button_release", PropertyInfo(Variant::INT, "button"))); + ADD_SIGNAL(MethodInfo("button_released", PropertyInfo(Variant::INT, "button"))); ADD_SIGNAL(MethodInfo("mesh_updated", PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"))); }; |