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

Fixes issue where “menu” inputs from MFi controllers had no effect

Browse Source
This commit is contained in:
Riley Testut 2017-01-04 18:00:03 -06:00
parent 3a9f0f36aa
commit c87ecf4d40
2 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Delta/Emulation/GameViewController.swift
View File

@ -74,6 +74,8 @@ class GameViewController: DeltaCore.GameViewController
}
}
fileprivate var _isLoadingSaveState = false
fileprivate var context = CIContext(options: [kCIContextWorkingColorSpace: NSNull()])
// Sustain Buttons
@ -274,19 +276,10 @@ extension GameViewController
self.pausedSaveState = nil
DispatchQueue.main.async {
if
let transitionCoordinator = self.transitionCoordinator,
let navigationController = segue.source.navigationController,
navigationController.viewControllers.count == 1
if self._isLoadingSaveState
{
// If user pressed "Resume" from Pause Menu, we wait for the transition to complete before resuming emulation
transitionCoordinator.animate(alongsideTransition: nil, completion: { (context) in
self.resumeEmulation()
})
}
else
{
// Otherwise, we resume emulation immediately (such as when loading save states and the game view needs to be updated ASAP)
// If loading save state, resume emulation immediately (since the game view needs to be updated ASAP)
if self.resumeEmulation()
{
@ -300,6 +293,15 @@ extension GameViewController
}
}
}
else
{
// Otherwise, wait for the transition to complete before resuming emulation
self.transitionCoordinator?.animate(alongsideTransition: nil, completion: { (context) in
self.resumeEmulation()
})
}
self._isLoadingSaveState = false
}
case "unwindToGames":
@ -339,7 +341,11 @@ private extension GameViewController
{
@objc func updateControllers()
{
self.emulatorCore?.removeAllGameControllers()
var controllers = [GameController]()
controllers.append(self.controllerView)
// We need to map each item as a GameControllerProtocol due to a Swift bug
controllers.append(contentsOf: ExternalControllerManager.shared.connectedControllers.map { $0 as GameController })
if let index = Settings.localControllerPlayerIndex
{
@ -352,11 +358,15 @@ private extension GameViewController
self.controllerView.isHidden = true
}
var controllers = [GameController]()
controllers.append(self.controllerView)
// Removing all game controllers from EmulatorCore will reset each controller's playerIndex to nil
// We temporarily cache their playerIndexes, and then we reset them after removing all controllers
var controllerIndexes = [ObjectIdentifier: Int?]()
controllers.forEach { controllerIndexes[ObjectIdentifier($0)] = $0.playerIndex }
// We need to map each item as a GameControllerProtocol due to a Swift bug
controllers.append(contentsOf: ExternalControllerManager.shared.connectedControllers.map { $0 as GameController })
self.emulatorCore?.removeAllGameControllers()
// Reset each controller's playerIndex to what it was before removing all controllers from EmulatorCore
controllers.forEach { $0.playerIndex = controllerIndexes[ObjectIdentifier($0)] ?? nil }
for controller in controllers
{
@ -531,6 +541,8 @@ extension GameViewController: SaveStatesViewControllerDelegate
func saveStatesViewController(_ saveStatesViewController: SaveStatesViewController, loadSaveState saveState: SaveStateProtocol)
{
self._isLoadingSaveState = true
// If we're loading the auto save state, we need to create a temporary copy of saveState.
// Then, we update the auto save state, but load our copy so everything works out.
var temporarySaveState: SaveStateProtocol? = nil
@ -738,8 +750,15 @@ extension GameViewController: GameViewControllerDelegate
self.hideSustainButtonView()
}
self.pauseEmulation()
self.performSegue(withIdentifier: "pause", sender: gameController)
if let pauseViewController = self.pauseViewController, !self.selectingSustainedButtons
{
pauseViewController.dismiss()
}
else if self.presentedViewController == nil
{
self.pauseEmulation()
self.performSegue(withIdentifier: "pause", sender: gameController)
}
}
func gameViewControllerShouldResumeEmulation(_ gameViewController: DeltaCore.GameViewController) -> Bool

10
Delta/Pause Menu/Save States/SaveStatesViewController.swift
View File

@ -514,12 +514,7 @@ private extension SaveStatesViewController
func resetEmulatorCoreIfNeeded()
{
// Kinda hacky, but isMovingFromParentViewController only returns yes when popping off navigation controller, and not being dismissed modally
// Because of this, this is only run when the user returns to PauseMenuViewController, and not when they choose a save state to load
if self.isMovingFromParentViewController
{
self.prepareEmulatorCore()
}
self.prepareEmulatorCore()
if let saveState = self.emulatorCoreSaveState
{
@ -538,7 +533,8 @@ private extension SaveStatesViewController
func prepareEmulatorCore()
{
// We stopped emulation for 3D Touch, so now we must resume emulation and load the save state we made to make it seem like it was never stopped
guard let emulatorCore = self.emulatorCore else { return }
// Additionally, if emulatorCore.state != .stopped, then we have already resumed emulation with correct save state, and don't need to do it again
guard let emulatorCore = self.emulatorCore, emulatorCore.state == .stopped else { return }
// Temporarily disable video rendering to prevent flickers
emulatorCore.videoManager.isEnabled = false