asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #23621 from workless/allow_strength_in_action_press

Browse source 
Allow to specify a custom strength when calling Input.action_press(),…
This commit is contained in:
Rémi Verschelde 2018-11-10 21:35:07 +01:00 committed by GitHub
commit 8c45282d21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/os/input.cpp
View file

@ -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("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("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("warp_mouse_position", "to"), &Input::warp_mouse_position);
ClassDB::bind_method(D_METHOD("action_press", "action"), &Input::action_press); ClassDB::bind_method(D_METHOD("action_press", "action", "strength"), &Input::action_press);
ClassDB::bind_method(D_METHOD("action_release", "action"), &Input::action_release); 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_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())); ClassDB::bind_method(D_METHOD("set_custom_mouse_cursor", "image", "shape", "hotspot"), &Input::set_custom_mouse_cursor, DEFVAL(CURSOR_ARROW), DEFVAL(Vector2()));

2
core/os/input.h
View file

@ -113,7 +113,7 @@ public:
virtual Vector3 get_magnetometer() const = 0; virtual Vector3 get_magnetometer() const = 0;
virtual Vector3 get_gyroscope() const = 0; virtual Vector3 get_gyroscope() const = 0;
virtual void action_press(const StringName &p_action) = 0; virtual void action_press(const StringName &p_action, float p_strength = 1.f) = 0;
virtual void action_release(const StringName &p_action) = 0; virtual void action_release(const StringName &p_action) = 0;
void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const; void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const;

4
doc/classes/Input.xml
View file

@ -17,8 +17,10 @@
</return> </return>
<argument index="0" name="action" type="String"> <argument index="0" name="action" type="String">
</argument> </argument>
<argument index="1" name="strength" type="float" default="1.0f">
</argument>
<description> <description>
This will simulate pressing the specified action. This will simulate pressing the specified action. The strength can be used for non-boolean actions.
</description> </description>
</method> </method>
<method name="action_release"> <method name="action_release">

4
main/input_default.cpp
View file

@ -556,14 +556,14 @@ Point2i InputDefault::warp_mouse_motion(const Ref<InputEventMouseMotion> &p_moti
void InputDefault::iteration(float p_step) { void InputDefault::iteration(float p_step) {
} }
void InputDefault::action_press(const StringName &p_action) { void InputDefault::action_press(const StringName &p_action, float p_strength) {
Action action; Action action;
action.physics_frame = Engine::get_singleton()->get_physics_frames(); action.physics_frame = Engine::get_singleton()->get_physics_frames();
action.idle_frame = Engine::get_singleton()->get_idle_frames(); action.idle_frame = Engine::get_singleton()->get_idle_frames();
action.pressed = true; action.pressed = true;
action.strength = 0.f; action.strength = p_strength;
action_state[p_action] = action; action_state[p_action] = action;
} }

2
main/input_default.h
View file

@ -227,7 +227,7 @@ public:
void set_main_loop(MainLoop *p_main_loop); void set_main_loop(MainLoop *p_main_loop);
void set_mouse_position(const Point2 &p_posf); void set_mouse_position(const Point2 &p_posf);
void action_press(const StringName &p_action); void action_press(const StringName &p_action, float p_strength = 1.f);
void action_release(const StringName &p_action); void action_release(const StringName &p_action);
void iteration(float p_step); void iteration(float p_step);