godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Rename some more global enums (Key, Joy, MIDI)

Browse Source
This commit is contained in:
Aaron Franke
2020-05-13 18:27:34 -04:00
parent 10d7fccb54
commit a5324787c8
27 changed files with 366 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/javascript/display_server_javascript.cpp
View File

@@ -601,7 +601,7 @@ void DisplayServerJavaScript::process_joypads() {
// Buttons 6 and 7 in the standard mapping need to be
// axis to be handled as JOY_AXIS_TRIGGER by Godot.
if (s_standard && (b == 6 || b == 7)) {
Input::JoyAxis joy_axis;
Input::JoyAxisValue joy_axis;
joy_axis.min = 0;
joy_axis.value = value;
int a = b == 6 ? JOY_AXIS_TRIGGER_LEFT : JOY_AXIS_TRIGGER_RIGHT;
@@ -611,7 +611,7 @@ void DisplayServerJavaScript::process_joypads() {
}
}
for (int a = 0; a < s_axes_num; a++) {
Input::JoyAxis joy_axis;
Input::JoyAxisValue joy_axis;
joy_axis.min = -1;
joy_axis.value = s_axes[a];
input->joy_axis(idx, a, joy_axis);