Launcher: controller switch and stick dead zone (#16)

A Controller card in the launcher: turn the game controller on or off and set the stick dead zone (NFSU2_PAD / NFSU2_PAD_DEADZONE; values set by hand still win).

Author: 007hacky007

README.md

@@ -289,7 +289,8 @@ portable app with the game files inside (APFS clones, seconds on the same disk),
 so nobody needs `pack.sh --embed` or a terminal for that. Untick "Show this
 window when the app opens" to go straight into the game (hold Option to get the
 window back). `NFSU2_SKIP_LAUNCHER=1` / `NFSU2_ENGINE=original|hd` do the same
-from scripts.
+from scripts. The Controller card turns the game controller on or off and sets its stick
+dead zone (`NFSU2_PAD` / `NFSU2_PAD_DEADZONE`, which still win when set by hand).
 
 ![Launcher window](screenshots/selected/launcher.png)
 

launcher/Game.swift

@@ -64,6 +64,9 @@ enum Prefs {
     // Shared with the engine (same bundle id, same defaults domain).
     static let gameFolder = "OyunDizini"          // name kept for existing installs
     static let fullscreen = "NFSUFullScreen"
+    // Launcher only; passed to the engine as NFSU2_PAD / NFSU2_PAD_DEADZONE.
+    static let controller = "LauncherController"
+    static let stickDeadzone = "LauncherStickDeadzone"
     // Launcher only.
     static let engine = "LauncherEngine"           // "original" | "hd"
     static let showAtStartup = "LauncherShowAtStartup"

launcher/Model.swift

@@ -21,6 +21,9 @@ final class LauncherModel: ObservableObject {
     @Published var showAtStartup: Bool { didSet { defaults.set(showAtStartup, forKey: Prefs.showAtStartup) } }
     @Published var wideHUD: Bool { didSet { defaults.set(wideHUD, forKey: Prefs.wideHUD) } }
     private var setHUDPOS = false        // HUDPOS was set by us (not by the caller)
+    @Published var controller: Bool { didSet { defaults.set(controller, forKey: Prefs.controller) } }
+    @Published var stickDeadzone: Double { didSet { defaults.set(stickDeadzone, forKey: Prefs.stickDeadzone) } }
+    private var setPad = false           // NFSU2_PAD / NFSU2_PAD_DEADZONE were set by us
     @Published var job: Job? = nil
     @Published var notice: String? = nil
 
@@ -41,7 +44,7 @@ final class LauncherModel: ObservableObject {
         let fm = FileManager.default
         let hasOriginal = fm.isExecutableFile(atPath: Paths.engine(nil, hd: false).path)
         let hasHD = fm.isExecutableFile(atPath: Paths.engine(nil, hd: true).path)
-        defaults.register(defaults: [Prefs.showAtStartup: true])
+        defaults.register(defaults: [Prefs.showAtStartup: true, Prefs.controller: true, Prefs.stickDeadzone: 0.10])
         var e = Engine(rawValue: defaults.string(forKey: Prefs.engine) ?? "") ?? .original
         if let env = ProcessInfo.processInfo.environment["NFSU2_ENGINE"], let f = Engine(rawValue: env) { e = f }
         if e == .hd && !hasHD { e = .original }
@@ -51,6 +54,8 @@ final class LauncherModel: ObservableObject {
         fullscreen = defaults.bool(forKey: Prefs.fullscreen)
         showAtStartup = defaults.bool(forKey: Prefs.showAtStartup)
         wideHUD = defaults.bool(forKey: Prefs.wideHUD)
+        controller = defaults.bool(forKey: Prefs.controller)
+        stickDeadzone = min(0.5, max(0, defaults.double(forKey: Prefs.stickDeadzone)))
     }
 
     var location: GameLocation? {
@@ -118,6 +123,13 @@ final class LauncherModel: ObservableObject {
             if wideHUD { setenv("HUDPOS", "1", 1); setHUDPOS = true }
             else if setHUDPOS { unsetenv("HUDPOS"); setHUDPOS = false }
         }
+        // Controller settings; NFSU2_PAD / NFSU2_PAD_DEADZONE set by hand still win.  Ours
+        // are overwritten on every Play, so a change takes effect without restarting.
+        if setPad || (env["NFSU2_PAD"] == nil && env["NFSU2_PAD_DEADZONE"] == nil) {
+            setenv("NFSU2_PAD", controller ? "1" : "0", 1)
+            setenv("NFSU2_PAD_DEADZONE", String(format: "%.2f", stickDeadzone), 1)
+            setPad = true
+        }
         var e = engine
         if !hasEngine(e) { e = (e == .hd) ? .original : .hd }
         let path = Paths.engine(loc.build, hd: e == .hd).path

launcher/Views.swift

@@ -154,6 +154,32 @@ struct GraphicsCard: View {
     }
 }
 
+struct ControllerCard: View {
+    @ObservedObject var model: LauncherModel
+    var body: some View {
+        Card("Controller") {
+            HStack(alignment: .center) {
+                VStack(alignment: .leading, spacing: 1) {
+                    Text("Use a game controller").font(.system(size: 12.5)).foregroundColor(Theme.text)
+                    Text("Xbox, PlayStation or MFi. Connect it before Play; buttons are set in the game's Controls menu.")
+                        .font(.system(size: 11)).foregroundColor(Theme.dim)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+                Spacer(minLength: 8)
+                Toggle("", isOn: $model.controller).labelsHidden().toggleStyle(SwitchToggleStyle())
+            }
+            HStack(alignment: .center, spacing: 10) {
+                Text("Stick dead zone").font(.system(size: 12.5)).foregroundColor(Theme.text)
+                Slider(value: $model.stickDeadzone, in: 0...0.5, step: 0.01)
+                Text("\(Int((model.stickDeadzone * 100).rounded())) %")
+                    .font(.system(size: 11.5).monospacedDigit()).foregroundColor(Theme.dim)
+                    .frame(width: 40, alignment: .trailing)
+            }
+            .disabled(!model.controller).opacity(model.controller ? 1 : 0.5)
+        }
+    }
+}
+
 struct MoreCard: View {
     @ObservedObject var model: LauncherModel
     var body: some View {
@@ -253,6 +279,7 @@ struct LauncherView: View {
 
                 GameCard(model: model)
                 GraphicsCard(model: model)
+                ControllerCard(model: model)
                 MoreCard(model: model)
 
                 Spacer(minLength: 0)
@@ -274,6 +301,6 @@ struct LauncherView: View {
             .padding(.horizontal, 22).padding(.top, 10).padding(.bottom, 18)
             if let j = model.job { JobOverlay(model: model, job: j) }
         }
-        .frame(width: 560, height: 624)
+        .frame(width: 560, height: 724)
     }
 }

launcher/main.swift

@@ -49,7 +49,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
 
         if let s = env["NFSU2_LAUNCHER_STATE"] { fakeState(s) }
         buildMenu()
-        let w = NSWindow(contentRect: NSRect(x: 0, y: 0, width: 560, height: 624),
+        let w = NSWindow(contentRect: NSRect(x: 0, y: 0, width: 560, height: 724),
                          styleMask: [.titled, .closable, .miniaturizable],
                          backing: .buffered, defer: false)
         w.titlebarAppearsTransparent = true