mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-04-23 07:45:38 +00:00
Updated Haptic API for SDL 3.0 conventions
Also removed the XInput haptic support since using the haptic API for rumble is no longer supported.
This commit is contained in:
Sam Lantinga
@@ -352,33 +352,30 @@ SDL3_0.0.0 {
|
||||
SDL_GetWindowTitle;
|
||||
SDL_GetYUVConversionMode;
|
||||
SDL_GetYUVConversionModeForResolution;
|
||||
SDL_HapticClose;
|
||||
SDL_HapticDestroyEffect;
|
||||
SDL_CloseHaptic;
|
||||
SDL_DestroyHapticEffect;
|
||||
SDL_HapticEffectSupported;
|
||||
SDL_HapticGetEffectStatus;
|
||||
SDL_HapticIndex;
|
||||
SDL_HapticName;
|
||||
SDL_HapticNewEffect;
|
||||
SDL_HapticNumAxes;
|
||||
SDL_HapticNumEffects;
|
||||
SDL_HapticNumEffectsPlaying;
|
||||
SDL_HapticOpen;
|
||||
SDL_HapticOpenFromJoystick;
|
||||
SDL_HapticOpenFromMouse;
|
||||
SDL_HapticOpened;
|
||||
SDL_HapticPause;
|
||||
SDL_HapticQuery;
|
||||
SDL_HapticRumbleInit;
|
||||
SDL_HapticRumblePlay;
|
||||
SDL_HapticRumbleStop;
|
||||
SDL_GetHapticEffectStatus;
|
||||
SDL_CreateHapticEffect;
|
||||
SDL_GetNumHapticAxes;
|
||||
SDL_GetMaxHapticEffects;
|
||||
SDL_GetMaxHapticEffectsPlaying;
|
||||
SDL_OpenHaptic;
|
||||
SDL_OpenHapticFromJoystick;
|
||||
SDL_OpenHapticFromMouse;
|
||||
SDL_PauseHaptic;
|
||||
SDL_GetHapticFeatures;
|
||||
SDL_InitHapticRumble;
|
||||
SDL_PlayHapticRumble;
|
||||
SDL_StopHapticRumble;
|
||||
SDL_HapticRumbleSupported;
|
||||
SDL_HapticRunEffect;
|
||||
SDL_HapticSetAutocenter;
|
||||
SDL_HapticSetGain;
|
||||
SDL_HapticStopAll;
|
||||
SDL_HapticStopEffect;
|
||||
SDL_HapticUnpause;
|
||||
SDL_HapticUpdateEffect;
|
||||
SDL_RunHapticEffect;
|
||||
SDL_SetHapticAutocenter;
|
||||
SDL_SetHapticGain;
|
||||
SDL_StopHapticEffects;
|
||||
SDL_StopHapticEffect;
|
||||
SDL_ResumeHaptic;
|
||||
SDL_UpdateHapticEffect;
|
||||
SDL_HasARMSIMD;
|
||||
SDL_HasAVX2;
|
||||
SDL_HasAVX512F;
|
||||
@@ -417,7 +414,7 @@ SDL3_0.0.0 {
|
||||
SDL_JoystickHasLED;
|
||||
SDL_JoystickHasRumble;
|
||||
SDL_JoystickHasRumbleTriggers;
|
||||
SDL_JoystickIsHaptic;
|
||||
SDL_IsJoystickHaptic;
|
||||
SDL_LinuxSetThreadPriority;
|
||||
SDL_LinuxSetThreadPriorityAndPolicy;
|
||||
SDL_LoadBMP;
|
||||
@@ -457,8 +454,7 @@ SDL3_0.0.0 {
|
||||
SDL_Metal_DestroyView;
|
||||
SDL_Metal_GetLayer;
|
||||
SDL_MinimizeWindow;
|
||||
SDL_MouseIsHaptic;
|
||||
SDL_NumHaptics;
|
||||
SDL_IsMouseHaptic;
|
||||
SDL_OnApplicationDidBecomeActive;
|
||||
SDL_OnApplicationDidChangeStatusBarOrientation;
|
||||
SDL_OnApplicationDidEnterBackground;
|
||||
@@ -962,6 +958,11 @@ SDL3_0.0.0 {
|
||||
SDL_SyncWindow;
|
||||
SDL_GetGamepadSteamHandle;
|
||||
SDL_GetRendererFromTexture;
|
||||
SDL_GetHaptics;
|
||||
SDL_GetHapticInstanceName;
|
||||
SDL_GetHapticFromInstanceID;
|
||||
SDL_GetHapticInstanceID;
|
||||
SDL_GetHapticName;
|
||||
# extra symbols go here (don't modify this line)
|
||||
local: *;
|
||||
};
|
||||
|
||||
@@ -376,33 +376,30 @@
|
||||
#define SDL_GetWindowTitle SDL_GetWindowTitle_REAL
|
||||
#define SDL_GetYUVConversionMode SDL_GetYUVConversionMode_REAL
|
||||
#define SDL_GetYUVConversionModeForResolution SDL_GetYUVConversionModeForResolution_REAL
|
||||
#define SDL_HapticClose SDL_HapticClose_REAL
|
||||
#define SDL_HapticDestroyEffect SDL_HapticDestroyEffect_REAL
|
||||
#define SDL_CloseHaptic SDL_CloseHaptic_REAL
|
||||
#define SDL_DestroyHapticEffect SDL_DestroyHapticEffect_REAL
|
||||
#define SDL_HapticEffectSupported SDL_HapticEffectSupported_REAL
|
||||
#define SDL_HapticGetEffectStatus SDL_HapticGetEffectStatus_REAL
|
||||
#define SDL_HapticIndex SDL_HapticIndex_REAL
|
||||
#define SDL_HapticName SDL_HapticName_REAL
|
||||
#define SDL_HapticNewEffect SDL_HapticNewEffect_REAL
|
||||
#define SDL_HapticNumAxes SDL_HapticNumAxes_REAL
|
||||
#define SDL_HapticNumEffects SDL_HapticNumEffects_REAL
|
||||
#define SDL_HapticNumEffectsPlaying SDL_HapticNumEffectsPlaying_REAL
|
||||
#define SDL_HapticOpen SDL_HapticOpen_REAL
|
||||
#define SDL_HapticOpenFromJoystick SDL_HapticOpenFromJoystick_REAL
|
||||
#define SDL_HapticOpenFromMouse SDL_HapticOpenFromMouse_REAL
|
||||
#define SDL_HapticOpened SDL_HapticOpened_REAL
|
||||
#define SDL_HapticPause SDL_HapticPause_REAL
|
||||
#define SDL_HapticQuery SDL_HapticQuery_REAL
|
||||
#define SDL_HapticRumbleInit SDL_HapticRumbleInit_REAL
|
||||
#define SDL_HapticRumblePlay SDL_HapticRumblePlay_REAL
|
||||
#define SDL_HapticRumbleStop SDL_HapticRumbleStop_REAL
|
||||
#define SDL_GetHapticEffectStatus SDL_GetHapticEffectStatus_REAL
|
||||
#define SDL_CreateHapticEffect SDL_CreateHapticEffect_REAL
|
||||
#define SDL_GetNumHapticAxes SDL_GetNumHapticAxes_REAL
|
||||
#define SDL_GetMaxHapticEffects SDL_GetMaxHapticEffects_REAL
|
||||
#define SDL_GetMaxHapticEffectsPlaying SDL_GetMaxHapticEffectsPlaying_REAL
|
||||
#define SDL_OpenHaptic SDL_OpenHaptic_REAL
|
||||
#define SDL_OpenHapticFromJoystick SDL_OpenHapticFromJoystick_REAL
|
||||
#define SDL_OpenHapticFromMouse SDL_OpenHapticFromMouse_REAL
|
||||
#define SDL_PauseHaptic SDL_PauseHaptic_REAL
|
||||
#define SDL_GetHapticFeatures SDL_GetHapticFeatures_REAL
|
||||
#define SDL_InitHapticRumble SDL_InitHapticRumble_REAL
|
||||
#define SDL_PlayHapticRumble SDL_PlayHapticRumble_REAL
|
||||
#define SDL_StopHapticRumble SDL_StopHapticRumble_REAL
|
||||
#define SDL_HapticRumbleSupported SDL_HapticRumbleSupported_REAL
|
||||
#define SDL_HapticRunEffect SDL_HapticRunEffect_REAL
|
||||
#define SDL_HapticSetAutocenter SDL_HapticSetAutocenter_REAL
|
||||
#define SDL_HapticSetGain SDL_HapticSetGain_REAL
|
||||
#define SDL_HapticStopAll SDL_HapticStopAll_REAL
|
||||
#define SDL_HapticStopEffect SDL_HapticStopEffect_REAL
|
||||
#define SDL_HapticUnpause SDL_HapticUnpause_REAL
|
||||
#define SDL_HapticUpdateEffect SDL_HapticUpdateEffect_REAL
|
||||
#define SDL_RunHapticEffect SDL_RunHapticEffect_REAL
|
||||
#define SDL_SetHapticAutocenter SDL_SetHapticAutocenter_REAL
|
||||
#define SDL_SetHapticGain SDL_SetHapticGain_REAL
|
||||
#define SDL_StopHapticEffects SDL_StopHapticEffects_REAL
|
||||
#define SDL_StopHapticEffect SDL_StopHapticEffect_REAL
|
||||
#define SDL_ResumeHaptic SDL_ResumeHaptic_REAL
|
||||
#define SDL_UpdateHapticEffect SDL_UpdateHapticEffect_REAL
|
||||
#define SDL_HasARMSIMD SDL_HasARMSIMD_REAL
|
||||
#define SDL_HasAVX SDL_HasAVX_REAL
|
||||
#define SDL_HasAVX2 SDL_HasAVX2_REAL
|
||||
@@ -441,7 +438,7 @@
|
||||
#define SDL_JoystickHasLED SDL_JoystickHasLED_REAL
|
||||
#define SDL_JoystickHasRumble SDL_JoystickHasRumble_REAL
|
||||
#define SDL_JoystickHasRumbleTriggers SDL_JoystickHasRumbleTriggers_REAL
|
||||
#define SDL_JoystickIsHaptic SDL_JoystickIsHaptic_REAL
|
||||
#define SDL_IsJoystickHaptic SDL_IsJoystickHaptic_REAL
|
||||
#define SDL_LinuxSetThreadPriority SDL_LinuxSetThreadPriority_REAL
|
||||
#define SDL_LinuxSetThreadPriorityAndPolicy SDL_LinuxSetThreadPriorityAndPolicy_REAL
|
||||
#define SDL_LoadBMP SDL_LoadBMP_REAL
|
||||
@@ -481,8 +478,7 @@
|
||||
#define SDL_Metal_DestroyView SDL_Metal_DestroyView_REAL
|
||||
#define SDL_Metal_GetLayer SDL_Metal_GetLayer_REAL
|
||||
#define SDL_MinimizeWindow SDL_MinimizeWindow_REAL
|
||||
#define SDL_MouseIsHaptic SDL_MouseIsHaptic_REAL
|
||||
#define SDL_NumHaptics SDL_NumHaptics_REAL
|
||||
#define SDL_IsMouseHaptic SDL_IsMouseHaptic_REAL
|
||||
#define SDL_OnApplicationDidBecomeActive SDL_OnApplicationDidBecomeActive_REAL
|
||||
#define SDL_OnApplicationDidChangeStatusBarOrientation SDL_OnApplicationDidChangeStatusBarOrientation_REAL
|
||||
#define SDL_OnApplicationDidEnterBackground SDL_OnApplicationDidEnterBackground_REAL
|
||||
@@ -987,3 +983,8 @@
|
||||
#define SDL_SyncWindow SDL_SyncWindow_REAL
|
||||
#define SDL_GetGamepadSteamHandle SDL_GetGamepadSteamHandle_REAL
|
||||
#define SDL_GetRendererFromTexture SDL_GetRendererFromTexture_REAL
|
||||
#define SDL_GetHaptics SDL_GetHaptics_REAL
|
||||
#define SDL_GetHapticInstanceName SDL_GetHapticInstanceName_REAL
|
||||
#define SDL_GetHapticFromInstanceID SDL_GetHapticFromInstanceID_REAL
|
||||
#define SDL_GetHapticInstanceID SDL_GetHapticInstanceID_REAL
|
||||
#define SDL_GetHapticName SDL_GetHapticName_REAL
|
||||
|
||||
@@ -435,33 +435,30 @@ SDL_DYNAPI_PROC(SDL_Surface*,SDL_GetWindowSurface,(SDL_Window *a),(a),return)
|
||||
SDL_DYNAPI_PROC(const char*,SDL_GetWindowTitle,(SDL_Window *a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_YUV_CONVERSION_MODE,SDL_GetYUVConversionMode,(void),(),return)
|
||||
SDL_DYNAPI_PROC(SDL_YUV_CONVERSION_MODE,SDL_GetYUVConversionModeForResolution,(int a, int b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(void,SDL_HapticClose,(SDL_Haptic *a),(a),)
|
||||
SDL_DYNAPI_PROC(void,SDL_HapticDestroyEffect,(SDL_Haptic *a, int b),(a,b),)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticEffectSupported,(SDL_Haptic *a, SDL_HapticEffect *b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticGetEffectStatus,(SDL_Haptic *a, int b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticIndex,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(const char*,SDL_HapticName,(int a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticNewEffect,(SDL_Haptic *a, SDL_HapticEffect *b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticNumAxes,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticNumEffects,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticNumEffectsPlaying,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_Haptic*,SDL_HapticOpen,(int a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_Haptic*,SDL_HapticOpenFromJoystick,(SDL_Joystick *a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_Haptic*,SDL_HapticOpenFromMouse,(void),(),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticOpened,(int a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticPause,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(unsigned int,SDL_HapticQuery,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticRumbleInit,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticRumblePlay,(SDL_Haptic *a, float b, Uint32 c),(a,b,c),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticRumbleStop,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticRumbleSupported,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticRunEffect,(SDL_Haptic *a, int b, Uint32 c),(a,b,c),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticSetAutocenter,(SDL_Haptic *a, int b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticSetGain,(SDL_Haptic *a, int b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticStopAll,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticStopEffect,(SDL_Haptic *a, int b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticUnpause,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_HapticUpdateEffect,(SDL_Haptic *a, int b, SDL_HapticEffect *c),(a,b,c),return)
|
||||
SDL_DYNAPI_PROC(void,SDL_CloseHaptic,(SDL_Haptic *a),(a),)
|
||||
SDL_DYNAPI_PROC(void,SDL_DestroyHapticEffect,(SDL_Haptic *a, int b),(a,b),)
|
||||
SDL_DYNAPI_PROC(SDL_bool,SDL_HapticEffectSupported,(SDL_Haptic *a, SDL_HapticEffect *b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_GetHapticEffectStatus,(SDL_Haptic *a, int b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_CreateHapticEffect,(SDL_Haptic *a, SDL_HapticEffect *b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_GetNumHapticAxes,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_GetMaxHapticEffects,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_GetMaxHapticEffectsPlaying,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_Haptic*,SDL_OpenHaptic,(SDL_HapticID a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_Haptic*,SDL_OpenHapticFromJoystick,(SDL_Joystick *a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_Haptic*,SDL_OpenHapticFromMouse,(void),(),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_PauseHaptic,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(unsigned int,SDL_GetHapticFeatures,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_InitHapticRumble,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_PlayHapticRumble,(SDL_Haptic *a, float b, Uint32 c),(a,b,c),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_StopHapticRumble,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_bool,SDL_HapticRumbleSupported,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_RunHapticEffect,(SDL_Haptic *a, int b, Uint32 c),(a,b,c),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_SetHapticAutocenter,(SDL_Haptic *a, int b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_SetHapticGain,(SDL_Haptic *a, int b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_StopHapticEffects,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_StopHapticEffect,(SDL_Haptic *a, int b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_ResumeHaptic,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_UpdateHapticEffect,(SDL_Haptic *a, int b, SDL_HapticEffect *c),(a,b,c),return)
|
||||
SDL_DYNAPI_PROC(SDL_bool,SDL_HasARMSIMD,(void),(),return)
|
||||
SDL_DYNAPI_PROC(SDL_bool,SDL_HasAVX,(void),(),return)
|
||||
SDL_DYNAPI_PROC(SDL_bool,SDL_HasAVX2,(void),(),return)
|
||||
@@ -497,7 +494,7 @@ SDL_DYNAPI_PROC(SDL_bool,SDL_JoystickEventsEnabled,(void),(),return)
|
||||
SDL_DYNAPI_PROC(SDL_bool,SDL_JoystickHasLED,(SDL_Joystick *a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_bool,SDL_JoystickHasRumble,(SDL_Joystick *a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_bool,SDL_JoystickHasRumbleTriggers,(SDL_Joystick *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_JoystickIsHaptic,(SDL_Joystick *a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_bool,SDL_IsJoystickHaptic,(SDL_Joystick *a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_Surface*,SDL_LoadBMP,(const char *a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_Surface*,SDL_LoadBMP_RW,(SDL_RWops *a, SDL_bool b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(void*,SDL_LoadFile,(const char *a, size_t *b),(a,b),return)
|
||||
@@ -527,8 +524,7 @@ SDL_DYNAPI_PROC(SDL_MetalView,SDL_Metal_CreateView,(SDL_Window *a),(a),return)
|
||||
SDL_DYNAPI_PROC(void,SDL_Metal_DestroyView,(SDL_MetalView a),(a),)
|
||||
SDL_DYNAPI_PROC(void*,SDL_Metal_GetLayer,(SDL_MetalView a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_MinimizeWindow,(SDL_Window *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_MouseIsHaptic,(void),(),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_NumHaptics,(void),(),return)
|
||||
SDL_DYNAPI_PROC(SDL_bool,SDL_IsMouseHaptic,(void),(),return)
|
||||
SDL_DYNAPI_PROC(void,SDL_OnApplicationDidBecomeActive,(void),(),)
|
||||
SDL_DYNAPI_PROC(void,SDL_OnApplicationDidEnterBackground,(void),(),)
|
||||
SDL_DYNAPI_PROC(void,SDL_OnApplicationDidReceiveMemoryWarning,(void),(),)
|
||||
@@ -1012,3 +1008,8 @@ SDL_DYNAPI_PROC(wchar_t*,SDL_wcsnstr,(const wchar_t *a, const wchar_t *b, size_t
|
||||
SDL_DYNAPI_PROC(int,SDL_SyncWindow,(SDL_Window *a),(a),return)
|
||||
SDL_DYNAPI_PROC(Uint64,SDL_GetGamepadSteamHandle,(SDL_Gamepad *a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_Renderer*,SDL_GetRendererFromTexture,(SDL_Texture *a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_HapticID*,SDL_GetHaptics,(int *a),(a),return)
|
||||
SDL_DYNAPI_PROC(const char*,SDL_GetHapticInstanceName,(SDL_HapticID a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_Haptic*,SDL_GetHapticFromInstanceID,(SDL_HapticID a),(a),return)
|
||||
SDL_DYNAPI_PROC(SDL_HapticID,SDL_GetHapticInstanceID,(SDL_Haptic *a),(a),return)
|
||||
SDL_DYNAPI_PROC(const char*,SDL_GetHapticName,(SDL_Haptic *a),(a),return)
|
||||
|
||||
Reference in New Issue
Block a user