diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-18 10:22:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 10:22:05 +0100 |
| commit | 80dab2bb26732e804bf2a24fd8058e9a864a0629 (patch) | |
| tree | c507200a49df39c4a9a82d44341001c477d07894 | |
| parent | 9eb4b6d91a64661f8e2823a70f935c602f8a725a (diff) | |
| parent | b98263013ad51391acd81532a9af593cb28a643f (diff) | |
Merge pull request #23777 from workless/23772_second_parameter_input_action_press
Fixed the default value and documentation for Input.action_press() from commit 8c45282
| -rw-r--r-- | core/os/input.cpp | 2 | ||||
| -rw-r--r-- | doc/classes/Input.xml | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/os/input.cpp b/core/os/input.cpp index 1a24258a10..3b895b16b4 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -86,7 +86,7 @@ void Input::_bind_methods() { ClassDB::bind_method(D_METHOD("set_mouse_mode", "mode"), &Input::set_mouse_mode); ClassDB::bind_method(D_METHOD("get_mouse_mode"), &Input::get_mouse_mode); ClassDB::bind_method(D_METHOD("warp_mouse_position", "to"), &Input::warp_mouse_position); - ClassDB::bind_method(D_METHOD("action_press", "action", "strength"), &Input::action_press); + ClassDB::bind_method(D_METHOD("action_press", "action", "strength"), &Input::action_press, DEFVAL(1.f)); ClassDB::bind_method(D_METHOD("action_release", "action"), &Input::action_release); ClassDB::bind_method(D_METHOD("set_default_cursor_shape", "shape"), &Input::set_default_cursor_shape, DEFVAL(CURSOR_ARROW)); ClassDB::bind_method(D_METHOD("set_custom_mouse_cursor", "image", "shape", "hotspot"), &Input::set_custom_mouse_cursor, DEFVAL(CURSOR_ARROW), DEFVAL(Vector2())); diff --git a/doc/classes/Input.xml b/doc/classes/Input.xml index bf395ee513..724e6a078d 100644 --- a/doc/classes/Input.xml +++ b/doc/classes/Input.xml @@ -17,10 +17,11 @@ </return> <argument index="0" name="action" type="String"> </argument> - <argument index="1" name="strength" type="float"> + <argument index="1" name="strength" type="float" default="1.0"> </argument> <description> - This will simulate pressing the specified action. The strength can be used for non-boolean actions. + This will simulate pressing the specified action. + The strength can be used for non-boolean actions, it's ranged between 0 and 1 representing the intensity of the given action. </description> </method> <method name="action_release"> |