mirror/bsnes
1
0
Fork 0
mirror of https://github.com/bsnes-emu/bsnes.git synced 2025-09-02 19:32:46 +02:00
Code Issues Projects Releases Wiki Activity

Fix a bug where haptics randomly stop working

Browse Source
This commit is contained in:
Lior Halphon
2024-06-13 22:46:02 +03:00
parent d1b4af5e76
commit d55426afa0
1 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
iOS/GBHapticManager.m
View File

@@ -12,6 +12,7 @@
#pragma clang diagnostic pop
__weak GCController *_controller;
double _rumble;
dispatch_queue_t _queue;
}
+ (instancetype)sharedManager
@@ -36,6 +37,7 @@
_engine.autoShutdownEnabled = true;
}
if (!_engine) return [[GBHapticManagerLegacy alloc] init];
_queue = dispatch_queue_create("SameBoy Haptic Queue", NULL);
return self;
}
@@ -57,20 +59,22 @@
- (void)doTapHaptic
{
if (_rumble) return;
double intensity = [[NSUserDefaults standardUserDefaults] doubleForKey:@"GBHapticsStrength"];
if (_rumble > intensity) return;
CHHapticPattern *pattern = [[CHHapticPattern alloc] initWithEvents:@[[self eventWithType:CHHapticEventTypeHapticTransient
sharpness:0.25
intensity:[[NSUserDefaults standardUserDefaults] doubleForKey:@"GBHapticsStrength"]
duration:1.0]]
parameters:nil
error:nil];
@try {
id<CHHapticPatternPlayer> player = [_engine createPlayerWithPattern:pattern error:nil];
[player startAtTime:0 error:nil];
}
@catch (NSException *exception) {}
dispatch_async(_queue, ^{
CHHapticPattern *pattern = [[CHHapticPattern alloc] initWithEvents:@[[self eventWithType:CHHapticEventTypeHapticTransient
sharpness:0.25
intensity:intensity
duration:1.0]]
parameters:nil
error:nil];
@try {
id<CHHapticPatternPlayer> player = [_engine createPlayerWithPattern:pattern error:nil];
[player startAtTime:0 error:nil];
}
@catch (NSException *exception) {}
});
}
- (void)setRumbleStrength:(double)rumble
@@ -90,27 +94,32 @@
_rumble = 0;
return;
}
// No change
if (rumble == _rumble) return;
_rumble = rumble;
CHHapticPattern *pattern = [[CHHapticPattern alloc] initWithEvents:@[[self eventWithType:CHHapticEventTypeHapticContinuous
sharpness:0.75
intensity:rumble
duration:1.0]]
parameters:nil
error:nil];
@try {
id<CHHapticPatternPlayer> newPlayer = [_externalEngine ?: _engine createPlayerWithPattern:pattern error:nil];
[newPlayer startAtTime:0 error:nil];
[_rumblePlayer stopAtTime:0 error:nil];
_rumblePlayer = newPlayer;
}
@catch (NSException *exception) {
if (_externalEngine) {
// Something might have happened with our controller? Delete and try again
_externalEngine = nil;
[self setRumbleStrength: rumble];
dispatch_async(_queue, ^{
CHHapticPattern *pattern = [[CHHapticPattern alloc] initWithEvents:@[[self eventWithType:CHHapticEventTypeHapticContinuous
sharpness:0.75
intensity:rumble
duration:1.0]]
parameters:nil
error:nil];
@try {
id<CHHapticPatternPlayer> newPlayer = [_externalEngine ?: _engine createPlayerWithPattern:pattern error:nil];
[newPlayer startAtTime:0 error:nil];
[_rumblePlayer stopAtTime:0 error:nil];
_rumblePlayer = newPlayer;
}
}
@catch (NSException *exception) {
if (_externalEngine) {
// Something might have happened with our controller? Delete and try again
_externalEngine = nil;
[self setRumbleStrength: rumble];
}
}
});
}
- (void)setController:(GCController *)controller