CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-28 21:55:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(iOS) Fix broken multi-touch code.

Browse Source
This commit is contained in:
meancoot 2013-03-05 20:28:59 -05:00
parent 3fd2db88e8
commit dbc3e3f7ff
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ios/RetroArch/input/RAInputResponder.h
View File

@ -19,7 +19,6 @@
typedef struct touch_data
{
bool is_down;
int16_t screen_x, screen_y;
int16_t fixed_x, fixed_y;
int16_t full_x, full_y;

15
ios/RetroArch/input/RAInputResponder.m
View File

@ -57,7 +57,7 @@ extern NSString* const RATouchNotification;
- (const touch_data_t*)getTouchDataAtIndex:(unsigned)index
{
return (index < MAX_TOUCHES && _touches[index].is_down) ? &_touches[index] : 0;
return (index < _touchCount) ? &_touches[index] : 0;
}
// Response handlers
@ -77,18 +77,21 @@ extern NSString* const RATouchNotification;
{
UIEvent* event = [notification.userInfo objectForKey:@"event"];
NSArray* touches = [[event allTouches] allObjects];
const int numTouches = [touches count];
_touchCount = [touches count];
_touchCount = 0;
for(int i = 0; i != _touchCount; i ++)
for(int i = 0; i != numTouches && _touchCount != MAX_TOUCHES; i ++)
{
UITouch *touch = [touches objectAtIndex:i];
CGPoint coord = [touch locationInView:touch.view];
float scale = [[UIScreen mainScreen] scale];
_touches[i].is_down = (touch.phase != UITouchPhaseEnded) && (touch.phase != UITouchPhaseCancelled);
_touches[i].screen_x = coord.x * scale;
_touches[i].screen_y = coord.y * scale;
if (touch.phase != UITouchPhaseEnded && touch.phase != UITouchPhaseCancelled)
{
_touches[_touchCount ].screen_x = coord.x * scale;
_touches[_touchCount ++].screen_y = coord.y * scale;
}
}
}
@end