Controller dialog: Wheel and throttle support #13189
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
garbear
added
Type: Feature
This was referenced Dec 13, 2017
garbear
force-pushed
the
saturn
branch
2 times, most recently
from
4f9310e
to
46c6c49
Compare
Montellese
approved these changes
Dec 16, 2017
| } | ||
| catch (...) | ||
| { | ||
| CLog::Log(LOGERROR, "GAME: %s: exception caught in InputEvent()", m_gameClient->ID().c_str()); |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -105,6 +105,22 @@ bool CPort::OnAccelerometerMotion(const std::string& feature, float x, float y, | |||
| return m_gameInput->OnAccelerometerMotion(feature, x, y, z); | |||
| } | |||
|
|
|||
| bool CPort::OnWheelMotion(const std::string& feature, float position, unsigned int motionTimeMs) | |||
| { | |||
| if ((position != 0.0f) && !m_gameClient.AcceptsInput()) | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| const bool bWasActivated = (m_state != 0.0f); | ||
|
|
||
| if (!bActivated && bWasActivated) | ||
| { |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| motionTimeMs = MotionTimeMs(); | ||
| } | ||
| else | ||
| { |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
addressed your comments. jenkins build this please |
Needed for analog triggers, wheels and throttles.
|
jenkins build this please |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds support for wheels and throttles in the Game API and Peripheral API. These feature types are needed for full Saturn support.
Requires:
Description
Wheels and throttles introduce a new kind of input. Currently, we have buttons (semiaxis) and analog sticks (dual axis). These new features, on the other hand, are composed of a single full axis.
First we modify the Game API to accept events for a single axis. We then use the
buttonmap.xmlbelonging to the emulator to map the axis feature to an axis on a libretro device. See kodi-game/game.libretro#23 for more info and examples.Next, we modify the Peripheral API so that we can map axis features. See xbmc/peripheral.joystick#133 for more info and examples. Then we augment the joystick library to handle axis features and connect to the Peripheral API to the Game API.
Finally, we add the ability to map axis features in the Controller Dialog. The buttons for these features use a FSM similar to analog sticks, but instead of prompting for four buttons, they prompt for two.
Motivation and Context
Part of my goal toward a completed player manager.
How Has This Been Tested?
Tested on OSX with an Xbox 360 controller. Possible remaining bugs.
Screenshots (if appropriate):
Types of change