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

Adds Save State and Fast Forward controller skin actions

Browse Source
This commit is contained in:
Riley Testut 2020-02-07 16:01:49 -08:00
parent 0373b757f7
commit 59beb243c0
3 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Delta/Emulation/ActionInput.swift
View File

@ -18,6 +18,7 @@ enum ActionInput: String
case quickSave case quickSave
case quickLoad case quickLoad
case fastForward case fastForward
case toggleFastForward
} }
extension ActionInput: Input extension ActionInput: Input

42
Delta/Emulation/GameViewController.swift
View File

@ -31,6 +31,29 @@ private extension GameViewController
} }
} }
struct DefaultInputMapping: GameControllerInputMappingProtocol
{
let gameController: GameController
var gameControllerInputType: GameControllerInputType {
return self.gameController.inputType
}
func input(forControllerInput controllerInput: Input) -> Input?
{
if let mappedInput = self.gameController.defaultInputMapping?.input(forControllerInput: controllerInput)
{
return mappedInput
}
// Only intercept controller skin inputs.
guard controllerInput.type == .controller(.controllerSkin) else { return nil }
let actionInput = ActionInput(stringValue: controllerInput.stringValue)
return actionInput
}
}
struct SustainInputsMapping: GameControllerInputMappingProtocol struct SustainInputsMapping: GameControllerInputMappingProtocol
{ {
let gameController: GameController let gameController: GameController
@ -190,7 +213,7 @@ class GameViewController: DeltaCore.GameViewController
self.inputsToSustain[AnyInput(input)] = value self.inputsToSustain[AnyInput(input)] = value
} }
} }
else if self.emulatorCore?.state == .running else if let emulatorCore = self.emulatorCore, emulatorCore.state == .running
{ {
guard let actionInput = ActionInput(input: input) else { return } guard let actionInput = ActionInput(input: input) else { return }
@ -199,6 +222,9 @@ class GameViewController: DeltaCore.GameViewController
case .quickSave: self.performQuickSaveAction() case .quickSave: self.performQuickSaveAction()
case .quickLoad: self.performQuickLoadAction() case .quickLoad: self.performQuickLoadAction()
case .fastForward: self.performFastForwardAction(activate: true) case .fastForward: self.performFastForwardAction(activate: true)
case .toggleFastForward:
let isFastForwarding = (emulatorCore.rate != emulatorCore.deltaCore.supportedRates.lowerBound)
self.performFastForwardAction(activate: !isFastForwarding)
} }
} }
} }
@ -223,6 +249,7 @@ class GameViewController: DeltaCore.GameViewController
case .quickSave: break case .quickSave: break
case .quickLoad: break case .quickLoad: break
case .fastForward: self.performFastForwardAction(activate: false) case .fastForward: self.performFastForwardAction(activate: false)
case .toggleFastForward: break
} }
} }
} }
@ -518,16 +545,19 @@ private extension GameViewController
{ {
if gameController.playerIndex != nil if gameController.playerIndex != nil
{ {
if let inputMapping = GameControllerInputMapping.inputMapping(for: gameController, gameType: game.type, in: DatabaseManager.shared.viewContext) let inputMapping: GameControllerInputMappingProtocol
if let mapping = GameControllerInputMapping.inputMapping(for: gameController, gameType: game.type, in: DatabaseManager.shared.viewContext)
{ {
gameController.addReceiver(self, inputMapping: inputMapping) inputMapping = mapping
gameController.addReceiver(emulatorCore, inputMapping: inputMapping)
} }
else else
{ {
gameController.addReceiver(self) inputMapping = DefaultInputMapping(gameController: gameController)
gameController.addReceiver(emulatorCore)
} }
gameController.addReceiver(self, inputMapping: inputMapping)
gameController.addReceiver(emulatorCore, inputMapping: inputMapping)
} }
else else
{ {

2
Delta/Settings/Controllers/ControllerInputsViewController.swift
View File

@ -223,6 +223,8 @@ private extension ControllerInputsViewController
case .fastForward: case .fastForward:
image = #imageLiteral(resourceName: "FastForward") image = #imageLiteral(resourceName: "FastForward")
text = NSLocalizedString("Fast Forward", comment: "") text = NSLocalizedString("Fast Forward", comment: "")
case .toggleFastForward: continue
} }
let item = MenuItem(text: text, image: image) { [unowned self] (item) in let item = MenuItem(text: text, image: image) { [unowned self] (item) in