mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 12:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed missing JoystickImpl member on Android

Browse Source
This commit is contained in:
Mario Liebisch 2014-04-15 18:16:42 +02:00 committed by Jonathan De Wachter
parent 03acb2ad9f
commit dd7a3cb30b
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/SFML/Window/Android/JoystickImpl.cpp
View File

@ -78,6 +78,13 @@ JoystickCaps JoystickImpl::getCapabilities() const
} }
////////////////////////////////////////////////////////////
Joystick::Identification JoystickImpl::getIdentification() const
{
return m_identification;
}
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
JoystickState JoystickImpl::update() JoystickState JoystickImpl::update()
{ {

11
src/SFML/Window/Android/JoystickImpl.hpp
View File

@ -84,6 +84,14 @@ public :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
JoystickCaps getCapabilities() const; JoystickCaps getCapabilities() const;
////////////////////////////////////////////////////////////
/// \brief Get the joystick identification
///
/// \return Joystick identification
///
////////////////////////////////////////////////////////////
Joystick::Identification getIdentification() const;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Update the joystick and get its new state /// \brief Update the joystick and get its new state
/// ///
@ -97,7 +105,8 @@ private :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
int m_index; ///< Index of the joystick int m_index; ///< Index of the joystick
Joystick::Identification m_identification; ///< Joystick identification
}; };
} // namespace priv } // namespace priv