3-group-ios/GBA001
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Supports touch inputs when external controller is connected

Browse Source
This commit is contained in:
Riley Testut 2020-12-10 15:33:45 -06:00
parent a63de5db4d
commit c7329136ac
3 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cores/DeltaCore

@ -1 +1 @@
Subproject commit 7ad85ffa473dbcb8086f87b96b732187e712a30b Subproject commit a07abad3214a310785055eddf86bed36ae7612ca

5
Delta/Database/Model/Human/ControllerSkin.swift
View File

@ -86,11 +86,6 @@ extension ControllerSkin: ControllerSkinProtocol
return self.controllerSkin?.isTranslucent(for: traits) return self.controllerSkin?.isTranslucent(for: traits)
} }
public func gameScreenFrame(for traits: DeltaCore.ControllerSkin.Traits) -> CGRect?
{
return self.controllerSkin?.gameScreenFrame(for: traits)
}
public func screens(for traits: DeltaCore.ControllerSkin.Traits) -> [DeltaCore.ControllerSkin.Screen]? public func screens(for traits: DeltaCore.ControllerSkin.Traits) -> [DeltaCore.ControllerSkin.Screen]?
{ {
return self.controllerSkin?.screens(for: traits) return self.controllerSkin?.screens(for: traits)

50
Delta/Emulation/GameViewController.swift
View File

@ -17,6 +17,15 @@ import Roxas
private var kvoContext = 0 private var kvoContext = 0
private extension DeltaCore.ControllerSkin
{
func hasTouchScreen(for traits: DeltaCore.ControllerSkin.Traits) -> Bool
{
let hasTouchScreen = self.items(for: traits)?.contains(where: { $0.kind == .touchScreen }) ?? false
return hasTouchScreen
}
}
private extension GameViewController private extension GameViewController
{ {
struct PausedSaveState: SaveStateProtocol struct PausedSaveState: SaveStateProtocol
@ -99,7 +108,6 @@ class GameViewController: DeltaCore.GameViewController
self.shouldResetSustainedInputs = true self.shouldResetSustainedInputs = true
} }
self.updateControllerSkin()
self.updateControllers() self.updateControllers()
self.presentedGyroAlert = false self.presentedGyroAlert = false
@ -307,7 +315,6 @@ extension GameViewController
self.sustainButtonsContentView.topAnchor.constraint(equalTo: self.gameView.topAnchor).isActive = true self.sustainButtonsContentView.topAnchor.constraint(equalTo: self.gameView.topAnchor).isActive = true
self.sustainButtonsContentView.bottomAnchor.constraint(equalTo: self.gameView.bottomAnchor).isActive = true self.sustainButtonsContentView.bottomAnchor.constraint(equalTo: self.gameView.bottomAnchor).isActive = true
self.updateControllerSkin()
self.updateControllers() self.updateControllers()
} }
@ -544,15 +551,26 @@ private extension GameViewController
} }
// If Settings.localControllerPlayerIndex is non-nil, and there isn't a connected controller with same playerIndex, show controller view. // If Settings.localControllerPlayerIndex is non-nil, and there isn't a connected controller with same playerIndex, show controller view.
if let index = Settings.localControllerPlayerIndex, !ExternalGameControllerManager.shared.connectedControllers.contains { $0.playerIndex == index } if let index = Settings.localControllerPlayerIndex, !ExternalGameControllerManager.shared.connectedControllers.contains(where: { $0.playerIndex == index })
{ {
self.controllerView.playerIndex = index self.controllerView.playerIndex = index
self.controllerView.isHidden = false self.controllerView.isHidden = false
} }
else else
{ {
self.controllerView.playerIndex = nil if let game = self.game,
self.controllerView.isHidden = true let traits = self.controllerView.controllerSkinTraits,
let controllerSkin = DeltaCore.ControllerSkin.standardControllerSkin(for: game.type),
controllerSkin.hasTouchScreen(for: traits)
{
self.controllerView.isHidden = false
self.controllerView.playerIndex = 0
}
else
{
self.controllerView.isHidden = true
self.controllerView.playerIndex = nil
}
Settings.localControllerPlayerIndex = nil Settings.localControllerPlayerIndex = nil
} }
@ -608,6 +626,8 @@ private extension GameViewController
self.controllerView.isButtonHapticFeedbackEnabled = Settings.isButtonHapticFeedbackEnabled self.controllerView.isButtonHapticFeedbackEnabled = Settings.isButtonHapticFeedbackEnabled
self.controllerView.isThumbstickHapticFeedbackEnabled = Settings.isThumbstickHapticFeedbackEnabled self.controllerView.isThumbstickHapticFeedbackEnabled = Settings.isThumbstickHapticFeedbackEnabled
self.updateControllerSkin()
} }
func updateControllerSkin() func updateControllerSkin()
@ -616,8 +636,24 @@ private extension GameViewController
let traits = DeltaCore.ControllerSkin.Traits.defaults(for: window) let traits = DeltaCore.ControllerSkin.Traits.defaults(for: window)
let controllerSkin = Settings.preferredControllerSkin(for: game, traits: traits) if Settings.localControllerPlayerIndex != nil
self.controllerView.controllerSkin = controllerSkin {
let controllerSkin = Settings.preferredControllerSkin(for: game, traits: traits)
self.controllerView.controllerSkin = controllerSkin
}
else if let controllerSkin = DeltaCore.ControllerSkin.standardControllerSkin(for: game.type), controllerSkin.hasTouchScreen(for: traits)
{
var touchControllerSkin = TouchControllerSkin(controllerSkin: controllerSkin)
touchControllerSkin.layoutGuide = self.view.safeAreaLayoutGuide
switch traits.orientation
{
case .portrait: touchControllerSkin.screenLayoutAxis = .vertical
case .landscape: touchControllerSkin.screenLayoutAxis = .horizontal
}
self.controllerView.controllerSkin = touchControllerSkin
}
self.view.setNeedsLayout() self.view.setNeedsLayout()
} }