Use 'MTKView' as 'GameBoyWindow.contentView' without proxy

LiarPrincess · Nov 9, 2020 · 3794f3d · 3794f3d
1 parent 7a773b0
commit 3794f3d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 29 deletions.
diff --git a/Sources/GameBoyMac/AppDelegate.swift b/Sources/GameBoyMac/AppDelegate.swift
@@ -19,8 +19,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
       right: .right,
       a: .a,
       b: .s,
-      start: .space,
-      select: .q
+      start: .q,
+      select: .w
     )
 
     let window = GameBoyWindow(

diff --git a/Sources/GameBoyMac/GameBoyWindow.swift b/Sources/GameBoyMac/GameBoyWindow.swift
@@ -10,7 +10,6 @@ class GameBoyWindow: NSWindow, GameboyInputProvider, MTKViewDelegate {
 
   // swiftlint:disable:next implicitly_unwrapped_optional
   private(set) var gameBoy: GameBoy!
-  let mtkView: MTKView
   let keyMap: KeyMap
 
   let device:       MTLDevice
@@ -22,8 +21,8 @@ class GameBoyWindow: NSWindow, GameboyInputProvider, MTKViewDelegate {
   override var canBecomeKey:  Bool { return true }
   override var canBecomeMain: Bool { return true }
 
+  // swiftlint:disable:next function_body_length
   init(scale: Int, bootrom: Bootrom?, cartridge: Cartridge, keyMap: KeyMap) {
-    self.mtkView = MTKView()
     self.keyMap = keyMap
 
     self.device = Metal.createDevice()
@@ -51,11 +50,16 @@ class GameBoyWindow: NSWindow, GameboyInputProvider, MTKViewDelegate {
       input: self
     )
 
-    self.customizeWindow(title: cartridge.header.title)
-    self.addMtkSubview()
-  }
+    self.contentView = {
+      let view = MTKView()
+      view.device = self.device
+      view.delegate = self
+      view.colorPixelFormat = .bgra8Unorm
+      view.framebufferOnly = true
+      view.translatesAutoresizingMaskIntoConstraints = false
+      return view
+    }()
 
-  private func customizeWindow(title: String) {
     self.title = title
     self.backgroundColor = .black
     self.isMovableByWindowBackground = true
@@ -67,27 +71,6 @@ class GameBoyWindow: NSWindow, GameboyInputProvider, MTKViewDelegate {
     // self.setContentSize(NSSize(width: width, height: height))
   }
 
-  private func addMtkSubview() {
-    guard let contentView = self.contentView else {
-      print("Unable to find window content view.")
-      exit(1)
-    }
-
-    self.mtkView.device = self.device
-    self.mtkView.delegate = self
-    self.mtkView.colorPixelFormat = .bgra8Unorm
-    self.mtkView.framebufferOnly = true
-    self.mtkView.translatesAutoresizingMaskIntoConstraints = false
-
-    contentView.addSubview(self.mtkView)
-    NSLayoutConstraint.activate([
-      self.mtkView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor),
-      self.mtkView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor),
-      self.mtkView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
-      self.mtkView.heightAnchor.constraint(equalTo: contentView.heightAnchor)
-    ])
-  }
-
   // MARK: - Input
 
   private var input = GameboyInput()