Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added touch API #63

Merged
merged 1 commit into from
Feb 26, 2015
Merged

Added touch API #63

merged 1 commit into from
Feb 26, 2015

Conversation

zsbzsb
Copy link
Member

@zsbzsb zsbzsb commented Feb 25, 2015

No description provided.

else
position = sf::Touch::getPosition(finger);

return {position.x, position.y};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is C++11, see the other PR for the correct code.

@LaurentGomila
Copy link
Member

You forgot the touch events.

@zsbzsb
Copy link
Member Author

zsbzsb commented Feb 26, 2015

Done, touch events will come in another PR (based on this and #62 PR).

@zsbzsb
Copy link
Member Author

zsbzsb commented Feb 26, 2015

Fixing the conflicts.... :P

@zsbzsb
Copy link
Member Author

zsbzsb commented Feb 26, 2015

And ready to merge.

LaurentGomila added a commit that referenced this pull request Feb 26, 2015
@LaurentGomila LaurentGomila merged commit a499927 into SFML:master Feb 26, 2015
@zsbzsb zsbzsb deleted the feature/touch_api branch February 26, 2015 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants