Mac CCResponder refactoring #1191
Merged
Conversation
This file contains hidden or 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
| @@ -133,13 +133,13 @@ - (void) mouseUpOutside:(NSEvent*)event | |||
| [self inputUpOutside]; | |||
| } | |||
|
|
|||
| - (void) mouseDragged:(NSEvent*)event | |||
| - (void) mouseDragged:(NSEvent*)event button:(CCMouseButton) button | |||
| { | |||
| CGPoint dragPos = [event locationInNode:self]; | |||
|
|
|||
| [self inputDraggedWithPos:dragPos]; | |||
There was a problem hiding this comment.
This needs an if(button == left) check.
…ector/ResponderRefactoring Conflicts: cocos2d/CCResponderManager.m
…ector/ResponderRefactoring Conflicts: cocos2d/CCResponder.m
…rRefactoring Conflicts: cocos2d-tests.xcodeproj/project.pbxproj
|
Is there anything better we can do than "other" mouse button? It seems really odd after using it. |
This was referenced Feb 18, 2015
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.
Refactoring the Mac input code with these goals:
[CCDirector bind:]calls- there were too many before due tot he copy-pasted codeThe API for handling mouse events has been reduced from 9 methods to 3. Before, we had
mouseUp(left mouse button),rightMouseUp, andotherMouseUp, etc. Now,mouseUpis passed a CCMouseButton. I'd like feedback on that change.The CCMouseButton enum was moved between headers. I considered removing it in favor of the already existing NSEventType enum. However, I decided against changing the existing code for compatibility and because those events are sort of complicated, they encapsulate both mouse button and state:
NSLeftMouseDown,NSOtherMouseUp, etc. Thoughts on that would be appreciated also.In this pull request, the commits are well organized, so you might want to review it by going through each commit one at a time. The purposes of each change should be quite clear that way.