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

fix issues with change camera button

Browse Source
This commit is contained in:
Cal Moody
2024-06-26 19:06:05 -04:00
parent 66da5fd530
commit 3bf94d281a
1 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
iOS/GBViewController.m
View File

@@ -52,10 +52,10 @@
NSTimer *_disableCameraTimer; NSTimer *_disableCameraTimer;
AVCaptureDevicePosition _cameraPosition; AVCaptureDevicePosition _cameraPosition;
UIButton *_cameraPositionButton; UIButton *_cameraPositionButton;
UIButton *_changeCameraButton;
NSArray *_allCaptureDevices; NSArray *_allCaptureDevices;
NSArray *_backCaptureDevices; NSArray *_backCaptureDevices;
AVCaptureDevice *_selectedCaptureDevice; AVCaptureDevice *_selectedBackCaptureDevice;
UIButton *_changeCameraButton;
__weak GCController *_lastController; __weak GCController *_lastController;
@@ -245,7 +245,7 @@ static void rumbleCallback(GB_gameboy_t *gb, double amp)
_motionManager = [[CMMotionManager alloc] init]; _motionManager = [[CMMotionManager alloc] init];
_cameraPosition = AVCaptureDevicePositionBack; _cameraPosition = AVCaptureDevicePositionBack;
_selectedCaptureDevice = [AVCaptureDevice defaultDeviceWithMediaType: AVMediaTypeVideo]; _selectedBackCaptureDevice = [AVCaptureDevice defaultDeviceWithMediaType: AVMediaTypeVideo];
// Back camera setup // Back camera setup
NSArray *deviceTypes = @[AVCaptureDeviceTypeBuiltInWideAngleCamera, NSArray *deviceTypes = @[AVCaptureDeviceTypeBuiltInWideAngleCamera,
@@ -273,8 +273,9 @@ static void rumbleCallback(GB_gameboy_t *gb, double amp)
} }
_backCaptureDevices = filteredBackCameras; _backCaptureDevices = filteredBackCameras;
_cameraPositionButton = [[UIButton alloc] initWithFrame:CGRectMake(8, UIEdgeInsets insets = self.window.safeAreaInsets;
0, _cameraPositionButton = [[UIButton alloc] initWithFrame:CGRectMake(insets.left + 8,
_backgroundView.bounds.size.height - 8 - insets.bottom - 32,
32, 32,
32)]; 32)];
[self didRotateFromInterfaceOrientation:[UIApplication sharedApplication].statusBarOrientation]; [self didRotateFromInterfaceOrientation:[UIApplication sharedApplication].statusBarOrientation];
@@ -284,20 +285,20 @@ static void rumbleCallback(GB_gameboy_t *gb, double amp)
forState:UIControlStateNormal]; forState:UIControlStateNormal];
_cameraPositionButton.backgroundColor = [UIColor systemBackgroundColor]; _cameraPositionButton.backgroundColor = [UIColor systemBackgroundColor];
// Configure the change camera button // Configure the change camera button stacked on top of the camera position button
_changeCameraButton = [[UIButton alloc] initWithFrame:CGRectMake(8, _changeCameraButton = [[UIButton alloc] initWithFrame:CGRectMake(insets.left + 8,
0, _backgroundView.bounds.size.height - 8 - insets.bottom - 32 - 32 - 8,
32, 32,
32)]; 32)];
[_changeCameraButton setImage:[UIImage systemImageNamed:@"camera" [_changeCameraButton setImage:[UIImage systemImageNamed:@"camera.aperture"
withConfiguration:[UIImageSymbolConfiguration configurationWithScale:UIImageSymbolScaleLarge]] withConfiguration:[UIImageSymbolConfiguration configurationWithScale:UIImageSymbolScaleLarge]]
forState:UIControlStateNormal]; forState:UIControlStateNormal];
_changeCameraButton.backgroundColor = [UIColor systemBackgroundColor]; _changeCameraButton.backgroundColor = [UIColor systemBackgroundColor];
_changeCameraButton.layer.cornerRadius = 6; _changeCameraButton.layer.cornerRadius = 6;
_changeCameraButton.alpha = 0; _changeCameraButton.alpha = 0;
[_changeCameraButton addTarget:self [_changeCameraButton addTarget:self
action:@selector(changeCamera) action:@selector(changeCamera)
forControlEvents:UIControlEventTouchUpInside]; forControlEvents:UIControlEventTouchUpInside];
// Only show the change camera button if we have more than one back camera to swap between. // Only show the change camera button if we have more than one back camera to swap between.
if ([_backCaptureDevices count] > 1) { if ([_backCaptureDevices count] > 1) {
[_backgroundView addSubview:_changeCameraButton]; [_backgroundView addSubview:_changeCameraButton];
@@ -309,11 +310,12 @@ static void rumbleCallback(GB_gameboy_t *gb, double amp)
forState:UIControlStateNormal]; forState:UIControlStateNormal];
_cameraPositionButton.backgroundColor = [UIColor whiteColor]; _cameraPositionButton.backgroundColor = [UIColor whiteColor];
} }
_cameraPositionButton.layer.cornerRadius = 6; _cameraPositionButton.layer.cornerRadius = 6;
_cameraPositionButton.alpha = 0; _cameraPositionButton.alpha = 0;
[_cameraPositionButton addTarget:self [_cameraPositionButton addTarget:self
action:@selector(rotateCamera) action:@selector(rotateCamera)
forControlEvents:UIControlEventTouchUpInside]; forControlEvents:UIControlEventTouchUpInside];
[_backgroundView addSubview:_cameraPositionButton]; [_backgroundView addSubview:_cameraPositionButton];
@@ -737,9 +739,15 @@ static void rumbleCallback(GB_gameboy_t *gb, double amp)
- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
{ {
UIEdgeInsets insets = self.window.safeAreaInsets; UIEdgeInsets insets = self.window.safeAreaInsets;
_cameraPositionButton.frame = CGRectMake(insets.left + 8, _backgroundView.bounds.size.height - 8 - insets.bottom - 32, 32, 32); _cameraPositionButton.frame = CGRectMake(insets.left + 8,
if (@available(iOS 13.0, *)) { _backgroundView.bounds.size.height - 8 - insets.bottom - 32,
_changeCameraButton.frame = CGRectMake(_backgroundView.bounds.size.width - 8 - insets.right - 32, _backgroundView.bounds.size.height - 8 - insets.bottom - 32, 32, 32); 32,
32);
if (_changeCameraButton != nil) {
_changeCameraButton.frame = CGRectMake(insets.left + 8,
_backgroundView.bounds.size.height - 8 - insets.bottom - 32 - 32 - 8,
32,
32);
} }
} }
@@ -1186,7 +1194,7 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
} }
// There may be several back cameras, return the one with the matching type // There may be several back cameras, return the one with the matching type
if ([device deviceType] == [_selectedCaptureDevice deviceType]) { if ([device deviceType] == [_selectedBackCaptureDevice deviceType]) {
return device; return device;
} }
} }
@@ -1242,6 +1250,14 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
_cameraPositionButton.alpha = 1; _cameraPositionButton.alpha = 1;
}]; }];
} }
if (_changeCameraButton != nil) {
// The change camera button is only available when we are using a capture device on the back of the device
int changeCameraButtonAlpha = (_cameraPosition == AVCaptureDevicePositionFront) ? 0 : 1;
[UIView animateWithDuration:0.25 animations:^{
_changeCameraButton.alpha = changeCameraButtonAlpha;
}];
}
_disableCameraTimer = [NSTimer scheduledTimerWithTimeInterval:1 _disableCameraTimer = [NSTimer scheduledTimerWithTimeInterval:1
repeats:false repeats:false
block:^(NSTimer *timer) { block:^(NSTimer *timer) {
@@ -1250,6 +1266,13 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
_cameraPositionButton.alpha = 0; _cameraPositionButton.alpha = 0;
}]; }];
} }
if (_changeCameraButton != nil) {
if (_changeCameraButton.alpha) {
[UIView animateWithDuration:0.25 animations:^{
_changeCameraButton.alpha = 0;
}];
}
}
dispatch_async(_cameraQueue, ^{ dispatch_async(_cameraQueue, ^{
[_cameraSession stopRunning]; [_cameraSession stopRunning];
_cameraSession = nil; _cameraSession = nil;
@@ -1359,9 +1382,9 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
{ {
dispatch_async(_cameraQueue, ^{ dispatch_async(_cameraQueue, ^{
// Get index of selected camera and select the next one, wrapping to the beginning // Get index of selected camera and select the next one, wrapping to the beginning
NSUInteger i = [_backCaptureDevices indexOfObject:_selectedCaptureDevice]; NSUInteger i = [_backCaptureDevices indexOfObject:_selectedBackCaptureDevice];
int nextIndex = (i + 1) % _backCaptureDevices.count; int nextIndex = (i + 1) % _backCaptureDevices.count;
_selectedCaptureDevice = _backCaptureDevices[nextIndex]; _selectedBackCaptureDevice = _backCaptureDevices[nextIndex];
[_cameraSession stopRunning]; [_cameraSession stopRunning];
_cameraSession = nil; _cameraSession = nil;