From c1062208bb54cce8dffa04e9697ae124f271ecaf Mon Sep 17 00:00:00 2001 From: Hannes Schulze Date: Wed, 29 Jan 2025 00:58:07 +0100 Subject: use game controller api for input --- app/mac/main.mm | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'app/mac/main.mm') diff --git a/app/mac/main.mm b/app/mac/main.mm index 5ca7c5c..4e96cea 100644 --- a/app/mac/main.mm +++ b/app/mac/main.mm @@ -1,8 +1,7 @@ -#import "scene.hh" +#import "view-controller.hh" #import #import -#import int main(int argc, char** argv) { @@ -34,23 +33,12 @@ int main(int argc, char** argv) [mainMenu addItem:item]; [app setMainMenu:mainMenu]; - auto scene = [[Scene alloc] initWithFilePath:filePath]; - auto minSize = [scene size]; - - auto view = [[SKView alloc] init]; - [view setIgnoresSiblingOrder:YES]; - [view setShowsFPS:YES]; - [view presentScene:scene]; - - auto window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0., 0., minSize.width * 2, minSize.height * 2) - styleMask:(NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | - NSWindowMiniaturizeButton | NSWindowStyleMaskResizable) - backing:NSBackingStoreBuffered - defer:false]; + auto viewController = [[ViewController alloc] initWithFilePath:filePath]; + auto window = [NSWindow windowWithContentViewController:viewController]; [window setTitle:@"NES"]; - [window setContentAspectRatio:minSize]; - [window setContentMinSize:minSize]; - [window setContentView:view]; + [window setContentAspectRatio:[viewController minimumDisplaySize]]; + [window setContentMinSize:[viewController minimumDisplaySize]]; + [window setContentSize:[viewController preferredDisplaySize]]; [window makeKeyAndOrderFront:nil]; [app activateIgnoringOtherApps:YES]; -- cgit v1.3.1