From 20f2b71e214737e7065e4095050ed85c94a5dd7d Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Wed, 18 Nov 2020 09:44:25 +0000 Subject: Update joy button and stick names, enums and documentation --- doc/classes/@GlobalScope.xml | 141 +++++++------------------------------------ 1 file changed, 21 insertions(+), 120 deletions(-) (limited to 'doc/classes') diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml index f6b1bb4d7c..f6b8e0da19 100644 --- a/doc/classes/@GlobalScope.xml +++ b/doc/classes/@GlobalScope.xml @@ -2093,130 +2093,61 @@ Extra mouse button 2 mask. - + An invalid game controller button. - Game controller SDL button A. + Game controller SDL button A. Corresponds to the bottom action button: Sony Cross, Xbox A, Nintendo B. - Game controller SDL button B. + Game controller SDL button B. Corresponds to the right action button: Sony Circle, Xbox B, Nintendo A. - Game controller SDL button X. + Game controller SDL button X. Corresponds to the left action button: Sony Square, Xbox X, Nintendo Y. - Game controller SDL button Y. + Game controller SDL button Y. Corresponds to the top action button: Sony Triangle, Xbox Y, Nintendo X. - Game controller SDL back button. + Game controller SDL back button. Corresponds to the Sony Select, Xbox Back, Nintendo - button. - Game controller SDL guide button. + Game controller SDL guide button. Corresponds to the Sony PS, Xbox Home button. - Game controller SDL start button. + Game controller SDL start button. Corresponds to the Nintendo + button. - Game controller SDL left stick button. + Game controller SDL left stick button. Corresponds to the Sony L3, Xbox L/LS button. - Game controller SDL right stick button. + Game controller SDL right stick button. Corresponds to the Sony R3, Xbox R/RS button. - Game controller SDL left shoulder button. + Game controller SDL left shoulder button. Corresponds to the Sony L1, Xbox LB button. - Game controller SDL right shoulder button. + Game controller SDL right shoulder button. Corresponds to the Sony R1, Xbox RB button. - Game controller SDL D-pad up button. + Game controller D-pad up button. - Game controller SDL D-pad down button. + Game controller D-pad down button. - Game controller SDL D-pad left button. + Game controller D-pad left button. - Game controller SDL D-pad right button. + Game controller D-pad right button. - + The number of SDL game controller buttons. - - Sony DualShock controller X button maps to SDL button A. - - - Sony DualShock controller cross button maps to SDL button A. - - - Sony DualShock controller circle button maps to SDL button B. - - - Sony DualShock controller square button maps to SDL button X. - - - Sony DualShock controller triangle button maps to SDL button Y. - - - Sony DualShock controller select button maps to SDL back button. - - - Sony DualShock controller start button maps to SDL start button. - - - Sony DualShock controller PS button maps to SDL guide button. - - - Sony DualShock controller L1 button maps to SDL left shoulder button. - - - Sony DualShock controller R1 button maps to SDL right shoulder button. - - - Sony DualShock controller L3 button maps to SDL left stick button. - - - Sony DualShock controller R3 button maps to SDL right stick button. - - - Xbox game controller A button maps to SDL button A. - - - Xbox game controller B button maps to SDL button B. - - - Xbox game controller X button maps to SDL button X. - - - Xbox game controller Y button maps to SDL button Y. - - - Xbox game controller back button maps to SDL back button. - - - Xbox game controller start button maps to SDL start button. - - - Xbox game controller home button maps to SDL guide button. - - - Xbox game controller left stick button maps to SDL left stick button. - - - Xbox game controller right stick button maps to SDL right stick button. - - - Xbox game controller left bumper button maps to SDL left shoulder button. - - - Xbox game controller right bumper button maps to SDL right shoulder button. - - The maximum number of game controller buttons. + The maximum number of game controller buttons: Android supports up to 36 buttons. - + An invalid game controller axis. @@ -2237,41 +2168,11 @@ Game controller right trigger axis. - + The number of SDL game controller axes. - - Game controller joystick 0 x-axis. - - - Game controller joystick 0 y-axis. - - - Game controller joystick 1 x-axis. - - - Game controller joystick 1 y-axis. - - - Game controller joystick 2 x-axis. - - - Game controller joystick 2 y-axis. - - - Game controller joystick 3 x-axis. - - - Game controller joystick 3 y-axis. - - - Game controller joystick 4 x-axis. - - - Game controller joystick 4 y-axis. - - The maximum number of game controller axes. + The maximum number of game controller axes: OpenVR supports up to 5 Joysticks making a total of 10 axes. MIDI note OFF message. -- cgit v1.2.3