mirror/bsnes
1
0
Fork 0
mirror of https://github.com/bsnes-emu/bsnes.git synced 2025-09-03 08:42:54 +02:00
Code Issues Projects Releases Wiki Activity

Improved dpad controls

Browse Source
This commit is contained in:
Lior Halphon
2024-06-09 18:28:10 +03:00
parent 76c93254ed
commit 2018f0ee01
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
iOS/GBBackgroundView.m
View File

@@ -82,7 +82,7 @@ static GB_key_mask_t angleToKeyMask(double angle)
@implementation GBBackgroundView @implementation GBBackgroundView
{ {
NSMutableSet<UITouch *> *_touches; NSMutableSet<UITouch *> *_touches;
UITouch *_swipePadTouch; UITouch *_padTouch;
CGPoint _padSwipeOrigin; CGPoint _padSwipeOrigin;
UITouch *_screenTouch; UITouch *_screenTouch;
UITouch *_logoTouch; UITouch *_logoTouch;
@@ -219,10 +219,10 @@ static GB_key_mask_t angleToKeyMask(double angle)
else if (CGRectContainsPoint(logoRect, point) && !_logoTouch) { else if (CGRectContainsPoint(logoRect, point) && !_logoTouch) {
_logoTouch = touch; _logoTouch = touch;
} }
else if (_usesSwipePad && !_swipePadTouch) { else if (!_padTouch) {
if (fabs(point.x - dpadLocation.x) <= dpadRadius && if (fabs(point.x - dpadLocation.x) <= dpadRadius &&
fabs(point.y - dpadLocation.y) <= dpadRadius) { fabs(point.y - dpadLocation.y) <= dpadRadius) {
_swipePadTouch = touch; _padTouch = touch;
_padSwipeOrigin = point; _padSwipeOrigin = point;
} }
} }
@@ -233,8 +233,8 @@ static GB_key_mask_t angleToKeyMask(double angle)
- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event - (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
{ {
if (_swipePadTouch && [touches containsObject:_swipePadTouch]) { if (_padTouch && [touches containsObject:_padTouch]) {
_swipePadTouch = nil; _padTouch = nil;
} }
if (_screenTouch && [touches containsObject:_screenTouch]) { if (_screenTouch && [touches containsObject:_screenTouch]) {
@@ -298,8 +298,8 @@ static GB_key_mask_t angleToKeyMask(double angle)
bool dpadHandled = false; bool dpadHandled = false;
if (_usesSwipePad) { if (_usesSwipePad) {
dpadHandled = true; dpadHandled = true;
if (_swipePadTouch) { if (_padTouch) {
CGPoint point = [_swipePadTouch locationInView:self]; CGPoint point = [_padTouch locationInView:self];
double squaredDistance = CGPointSquaredDistance(point, _padSwipeOrigin); double squaredDistance = CGPointSquaredDistance(point, _padSwipeOrigin);
if (squaredDistance > 16 * 16) { if (squaredDistance > 16 * 16) {
double angle = CGPointAngle(point, _padSwipeOrigin); double angle = CGPointAngle(point, _padSwipeOrigin);
@@ -315,7 +315,7 @@ static GB_key_mask_t angleToKeyMask(double angle)
} }
} }
for (UITouch *touch in _touches) { for (UITouch *touch in _touches) {
if (touch == _swipePadTouch) continue; if (_usesSwipePad && touch == _padTouch) continue;
CGPoint point = [touch locationInView:self]; CGPoint point = [touch locationInView:self];
if (touch == _screenTouch) { if (touch == _screenTouch) {
@@ -364,7 +364,17 @@ static GB_key_mask_t angleToKeyMask(double angle)
point.x *= factor; point.x *= factor;
point.y *= factor; point.y *= factor;
if (CGPointSquaredDistance(point, _layout.aLocation) <= buttonRadiusSquared) { if (!dpadHandled &&
(touch == _padTouch ||
(fabs(point.x - _layout.dpadLocation.x) <= dpadRadius &&
fabs(point.y - _layout.dpadLocation.y) <= dpadRadius)
) && (fabs(point.x - _layout.dpadLocation.x) >= dpadRadius / 5 ||
fabs(point.y - _layout.dpadLocation.y) >= dpadRadius / 5)) {
dpadHandled = true; // Don't handle the dpad twice
double angle = CGPointAngle(point, _layout.dpadLocation);
mask |= angleToKeyMask(angle);
}
else if (CGPointSquaredDistance(point, _layout.aLocation) <= buttonRadiusSquared) {
mask |= GB_KEY_A_MASK; mask |= GB_KEY_A_MASK;
} }
else if (CGPointSquaredDistance(point, _layout.bLocation) <= buttonRadiusSquared) { else if (CGPointSquaredDistance(point, _layout.bLocation) <= buttonRadiusSquared) {
@@ -380,13 +390,6 @@ static GB_key_mask_t angleToKeyMask(double angle)
CGPointSquaredDistance(point, _layout.abComboLocation) <= buttonRadiusSquared) { CGPointSquaredDistance(point, _layout.abComboLocation) <= buttonRadiusSquared) {
mask |= GB_KEY_A_MASK | GB_KEY_B_MASK; mask |= GB_KEY_A_MASK | GB_KEY_B_MASK;
} }
else if (!dpadHandled &&
fabs(point.x - _layout.dpadLocation.x) <= dpadRadius &&
fabs(point.y - _layout.dpadLocation.y) <= dpadRadius) {
dpadHandled = true; // Don't handle the dpad twice
double angle = CGPointAngle(point, _layout.dpadLocation);
mask |= angleToKeyMask(angle);
}
} }
if (mask != _lastMask) { if (mask != _lastMask) {
_aButtonView.image = [_layout.theme imageNamed:(mask & GB_KEY_A_MASK)? @"buttonAPressed" : @"buttonA"]; _aButtonView.image = [_layout.theme imageNamed:(mask & GB_KEY_A_MASK)? @"buttonAPressed" : @"buttonA"];