mirror of
				https://github.com/libsdl-org/SDL.git
				synced 2025-11-04 01:34:38 +00:00 
			
		
		
		
	Fixed typos and documentation in haptic header file.
This commit is contained in:
		@@ -22,12 +22,12 @@
 | 
				
			|||||||
/**
 | 
					/**
 | 
				
			||||||
 *  \file SDL_haptic.h
 | 
					 *  \file SDL_haptic.h
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  \brief The SDL Haptic subsystem allows you to control haptic (force feedback)
 | 
					 *  \brief The SDL haptic subsystem allows you to control haptic (force feedback)
 | 
				
			||||||
 *         devices.
 | 
					 *         devices.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  The basic usage is as follows:
 | 
					 *  The basic usage is as follows:
 | 
				
			||||||
 *   - Initialize the Subsystem (::SDL_INIT_HAPTIC).
 | 
					 *   - Initialize the subsystem (::SDL_INIT_HAPTIC).
 | 
				
			||||||
 *   - Open a Haptic Device.
 | 
					 *   - Open a haptic device.
 | 
				
			||||||
 *    - SDL_HapticOpen() to open from index.
 | 
					 *    - SDL_HapticOpen() to open from index.
 | 
				
			||||||
 *    - SDL_HapticOpenFromJoystick() to open from an existing joystick.
 | 
					 *    - SDL_HapticOpenFromJoystick() to open from an existing joystick.
 | 
				
			||||||
 *   - Create an effect (::SDL_HapticEffect).
 | 
					 *   - Create an effect (::SDL_HapticEffect).
 | 
				
			||||||
@@ -282,7 +282,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
 | 
				
			|||||||
/**
 | 
					/**
 | 
				
			||||||
 *  \brief Device can be queried for effect status.
 | 
					 *  \brief Device can be queried for effect status.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  Device can be queried for effect status.
 | 
					 *  Device supports querying effect status.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  \sa SDL_HapticGetEffectStatus
 | 
					 *  \sa SDL_HapticGetEffectStatus
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
@@ -291,6 +291,8 @@ typedef struct _SDL_Haptic SDL_Haptic;
 | 
				
			|||||||
/**
 | 
					/**
 | 
				
			||||||
 *  \brief Device can be paused.
 | 
					 *  \brief Device can be paused.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 | 
					 *  Devices supports being paused.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 *  \sa SDL_HapticPause
 | 
					 *  \sa SDL_HapticPause
 | 
				
			||||||
 *  \sa SDL_HapticUnpause
 | 
					 *  \sa SDL_HapticUnpause
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
@@ -444,7 +446,7 @@ typedef struct SDL_HapticDirection
 | 
				
			|||||||
/**
 | 
					/**
 | 
				
			||||||
 *  \brief A structure containing a template for a Constant effect.
 | 
					 *  \brief A structure containing a template for a Constant effect.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  The struct is exclusive to the ::SDL_HAPTIC_CONSTANT effect.
 | 
					 *  This struct is exclusively for the ::SDL_HAPTIC_CONSTANT effect.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  A constant effect applies a constant force in the specified direction
 | 
					 *  A constant effect applies a constant force in the specified direction
 | 
				
			||||||
 *  to the joystick.
 | 
					 *  to the joystick.
 | 
				
			||||||
@@ -676,6 +678,8 @@ typedef struct SDL_HapticLeftRight
 | 
				
			|||||||
/**
 | 
					/**
 | 
				
			||||||
 *  \brief A structure containing a template for the ::SDL_HAPTIC_CUSTOM effect.
 | 
					 *  \brief A structure containing a template for the ::SDL_HAPTIC_CUSTOM effect.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 | 
					 *  This struct is exclusively for the ::SDL_HAPTIC_CUSTOM effect.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 *  A custom force feedback effect is much like a periodic effect, where the
 | 
					 *  A custom force feedback effect is much like a periodic effect, where the
 | 
				
			||||||
 *  application can define its exact shape.  You will have to allocate the
 | 
					 *  application can define its exact shape.  You will have to allocate the
 | 
				
			||||||
 *  data yourself.  Data should consist of channels * samples Uint16 samples.
 | 
					 *  data yourself.  Data should consist of channels * samples Uint16 samples.
 | 
				
			||||||
@@ -804,7 +808,7 @@ typedef union SDL_HapticEffect
 | 
				
			|||||||
extern DECLSPEC int SDLCALL SDL_NumHaptics(void);
 | 
					extern DECLSPEC int SDLCALL SDL_NumHaptics(void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 *  \brief Get the implementation dependent name of a Haptic device.
 | 
					 *  \brief Get the implementation dependent name of a haptic device.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  This can be called before any joysticks are opened.
 | 
					 *  This can be called before any joysticks are opened.
 | 
				
			||||||
 *  If no name can be found, this function returns NULL.
 | 
					 *  If no name can be found, this function returns NULL.
 | 
				
			||||||
@@ -817,9 +821,9 @@ extern DECLSPEC int SDLCALL SDL_NumHaptics(void);
 | 
				
			|||||||
extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index);
 | 
					extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 *  \brief Opens a Haptic device for usage.
 | 
					 *  \brief Opens a haptic device for use.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  The index passed as an argument refers to the N'th Haptic device on this
 | 
					 *  The index passed as an argument refers to the N'th haptic device on this
 | 
				
			||||||
 *  system.
 | 
					 *  system.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  When opening a haptic device, its gain will be set to maximum and
 | 
					 *  When opening a haptic device, its gain will be set to maximum and
 | 
				
			||||||
@@ -885,15 +889,15 @@ extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromMouse(void);
 | 
				
			|||||||
 *  \brief Checks to see if a joystick has haptic features.
 | 
					 *  \brief Checks to see if a joystick has haptic features.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  \param joystick Joystick to test for haptic capabilities.
 | 
					 *  \param joystick Joystick to test for haptic capabilities.
 | 
				
			||||||
 *  \return 1 if the joystick is haptic, 0 if it isn't
 | 
					 *  \return SDL_TRUE if the joystick is haptic, SDL_FALSE if it isn't
 | 
				
			||||||
 *          or -1 if an error ocurred.
 | 
					 *          or -1 if an error occurred.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  \sa SDL_HapticOpenFromJoystick
 | 
					 *  \sa SDL_HapticOpenFromJoystick
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick);
 | 
					extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 *  \brief Opens a Haptic device for usage from a Joystick device.
 | 
					 *  \brief Opens a haptic device for use from a joystick device.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  You must still close the haptic device separately.  It will not be closed
 | 
					 *  You must still close the haptic device separately.  It will not be closed
 | 
				
			||||||
 *  with the joystick.
 | 
					 *  with the joystick.
 | 
				
			||||||
@@ -913,7 +917,7 @@ extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromJoystick(SDL_Joystick *
 | 
				
			|||||||
                                                               joystick);
 | 
					                                                               joystick);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 *  \brief Closes a Haptic device previously opened with SDL_HapticOpen().
 | 
					 *  \brief Closes a haptic device previously opened with SDL_HapticOpen().
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  \param haptic Haptic device to close.
 | 
					 *  \param haptic Haptic device to close.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
@@ -957,7 +961,7 @@ extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic);
 | 
				
			|||||||
 *  Example:
 | 
					 *  Example:
 | 
				
			||||||
 *  \code
 | 
					 *  \code
 | 
				
			||||||
 *  if (SDL_HapticQuery(haptic) & SDL_HAPTIC_CONSTANT) {
 | 
					 *  if (SDL_HapticQuery(haptic) & SDL_HAPTIC_CONSTANT) {
 | 
				
			||||||
 *      printf("We have constant haptic effect!");
 | 
					 *      printf("We have constant haptic effect!\n");
 | 
				
			||||||
 *  }
 | 
					 *  }
 | 
				
			||||||
 *  \endcode
 | 
					 *  \endcode
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
@@ -996,7 +1000,7 @@ extern DECLSPEC int SDLCALL SDL_HapticEffectSupported(SDL_Haptic * haptic,
 | 
				
			|||||||
 *
 | 
					 *
 | 
				
			||||||
 *  \param haptic Haptic device to create the effect on.
 | 
					 *  \param haptic Haptic device to create the effect on.
 | 
				
			||||||
 *  \param effect Properties of the effect to create.
 | 
					 *  \param effect Properties of the effect to create.
 | 
				
			||||||
 *  \return The id of the effect on success or -1 on error.
 | 
					 *  \return The identifier of the effect on success or -1 on error.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  \sa SDL_HapticUpdateEffect
 | 
					 *  \sa SDL_HapticUpdateEffect
 | 
				
			||||||
 *  \sa SDL_HapticRunEffect
 | 
					 *  \sa SDL_HapticRunEffect
 | 
				
			||||||
@@ -1008,13 +1012,13 @@ extern DECLSPEC int SDLCALL SDL_HapticNewEffect(SDL_Haptic * haptic,
 | 
				
			|||||||
/**
 | 
					/**
 | 
				
			||||||
 *  \brief Updates the properties of an effect.
 | 
					 *  \brief Updates the properties of an effect.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  Can be used dynamically, although behaviour when dynamically changing
 | 
					 *  Can be used dynamically, although behavior when dynamically changing
 | 
				
			||||||
 *  direction may be strange.  Specifically the effect may reupload itself
 | 
					 *  direction may be strange.  Specifically the effect may reupload itself
 | 
				
			||||||
 *  and start playing from the start.  You cannot change the type either when
 | 
					 *  and start playing from the start.  You cannot change the type either when
 | 
				
			||||||
 *  running SDL_HapticUpdateEffect().
 | 
					 *  running SDL_HapticUpdateEffect().
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  \param haptic Haptic device that has the effect.
 | 
					 *  \param haptic Haptic device that has the effect.
 | 
				
			||||||
 *  \param effect Effect to update.
 | 
					 *  \param effect Identifier of the effect to update.
 | 
				
			||||||
 *  \param data New effect properties to use.
 | 
					 *  \param data New effect properties to use.
 | 
				
			||||||
 *  \return 0 on success or -1 on error.
 | 
					 *  \return 0 on success or -1 on error.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user