XboxControllerHandlerBase fixes #1521
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
Fixes an issue where it'd get stuck in a HoldStarted or HoldCompletedState, due to incorrect logic in cancelling coroutines. I also removed several states that really didn't mean anything, along with removing the tracking bools that duplicated the GestureState enum.
| } | ||
|
|
||
| if (XboxControllerMapping.GetButton_Up(SelectButton, eventData)) | ||
| if (eventData.XboxA_Up) |
There was a problem hiding this comment.
this removes the customization of the selection buttons
There was a problem hiding this comment.
Ahh yes, this was left over from when I was investigating the double events. Reverting.
| @@ -25,9 +25,8 @@ public class XboxControllerHandlerTest : XboxControllerHandlerBase | |||
| private Vector3 newPosition; | |||
| private Vector3 newRotation; | |||
|
|
|||
| protected override void Start() | |||
| private void Start() | |||
There was a problem hiding this comment.
We should probably make this protected virtual in case someone wants to add onto the functionality of this class
There was a problem hiding this comment.
Since it's a test class, I feel like that's unlikely, but I'll change it.
NeerajW
approved these changes
Dec 14, 2017
StephenHodgson
approved these changes
Dec 14, 2017
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.
Overview
Simplified the state machine in
XboxControllerHandlerBaseto reduce confusion and cases where states may conflict with each other.Also resolved a bug where
GamePadHandlerBasewas registering as a global listener twice, thus receiving all events from theInputManagertwice.Changes