From 687d0888270d04569b8fc2af943db5b92ea40380 Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Mon, 5 Aug 2019 15:10:36 -0700 Subject: [PATCH 1/4] Updates cores to latest versions --- Cores/DeltaCore | 2 +- Cores/GBADeltaCore | 2 +- Cores/GBCDeltaCore | 2 +- Cores/N64DeltaCore | 2 +- Cores/NESDeltaCore | 2 +- Cores/SNESDeltaCore | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cores/DeltaCore b/Cores/DeltaCore index 9d060fb..bd91e2c 160000 --- a/Cores/DeltaCore +++ b/Cores/DeltaCore @@ -1 +1 @@ -Subproject commit 9d060fb341666abc55da96d216430af90df32927 +Subproject commit bd91e2c8b0084b94f0a81b30debef762c9e87c95 diff --git a/Cores/GBADeltaCore b/Cores/GBADeltaCore index 6c763da..14474b0 160000 --- a/Cores/GBADeltaCore +++ b/Cores/GBADeltaCore @@ -1 +1 @@ -Subproject commit 6c763da1513fbe762edbca2cf33cec556ce9536e +Subproject commit 14474b02ec607953cdc6dd3959856f7de1449bdb diff --git a/Cores/GBCDeltaCore b/Cores/GBCDeltaCore index 4dcb34a..85ced43 160000 --- a/Cores/GBCDeltaCore +++ b/Cores/GBCDeltaCore @@ -1 +1 @@ -Subproject commit 4dcb34a47e71b81a099bff4dc0ebd28c217ef85b +Subproject commit 85ced43f5f220ee7f19b99e0949d9091c963d549 diff --git a/Cores/N64DeltaCore b/Cores/N64DeltaCore index 0246be2..a4bdecd 160000 --- a/Cores/N64DeltaCore +++ b/Cores/N64DeltaCore @@ -1 +1 @@ -Subproject commit 0246be2de6dc282397703ce2190ee7f3ed4cc9fc +Subproject commit a4bdecdd53ad20d3f343bd4f06df1ed3a6f8760d diff --git a/Cores/NESDeltaCore b/Cores/NESDeltaCore index 4dc0f28..b2b8636 160000 --- a/Cores/NESDeltaCore +++ b/Cores/NESDeltaCore @@ -1 +1 @@ -Subproject commit 4dc0f283116aadf6397c88c1f7fdabcac32367a6 +Subproject commit b2b8636f085fba41defb7ea601067928400b0043 diff --git a/Cores/SNESDeltaCore b/Cores/SNESDeltaCore index dc0ec5b..f54e044 160000 --- a/Cores/SNESDeltaCore +++ b/Cores/SNESDeltaCore @@ -1 +1 @@ -Subproject commit dc0ec5b74c0e47e0e35912dfd63dd70f2a3d932e +Subproject commit f54e0440f1a9ed1fc005f5ea4729ebe26f36f945 From cb2caa7ef1cd9716ab04a6141778dbc1ea43289e Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Mon, 5 Aug 2019 22:58:59 -0700 Subject: [PATCH 2/4] Replaces screen edge gesture hack with preferredScreenEdgesDeferringSystemGestures We want priority over system gestures when tapping near edges of screen. Previously, we needed to access the private screen edge gesture recognizer, but now we can use preferredScreenEdgesDeferringSystemGestures. --- Delta/AppDelegate.swift | 6 ------ Delta/Emulation/GameViewController.swift | 4 ++++ Delta/Launch/LaunchViewController.swift | 4 ++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Delta/AppDelegate.swift b/Delta/AppDelegate.swift index 1c72c92..564841a 100644 --- a/Delta/AppDelegate.swift +++ b/Delta/AppDelegate.swift @@ -33,12 +33,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate self.configureAppearance() - // Disable system gestures that delay touches on left edge of screen - for gestureRecognizer in self.window?.gestureRecognizers ?? [] where NSStringFromClass(type(of: gestureRecognizer)).contains("GateGesture") - { - gestureRecognizer.delaysTouchesBegan = false - } - // Controllers ExternalGameControllerManager.shared.startMonitoring() diff --git a/Delta/Emulation/GameViewController.swift b/Delta/Emulation/GameViewController.swift index edb8d81..f2a936e 100644 --- a/Delta/Emulation/GameViewController.swift +++ b/Delta/Emulation/GameViewController.swift @@ -131,6 +131,10 @@ class GameViewController: DeltaCore.GameViewController return !self.isGyroActive } + override var preferredScreenEdgesDeferringSystemGestures: UIRectEdge { + return .all + } + required init() { super.init() diff --git a/Delta/Launch/LaunchViewController.swift b/Delta/Launch/LaunchViewController.swift index 58204e7..7a561cb 100644 --- a/Delta/Launch/LaunchViewController.swift +++ b/Delta/Launch/LaunchViewController.swift @@ -34,6 +34,10 @@ class LaunchViewController: RSTLaunchViewController return self.gameViewController } + override var childForScreenEdgesDeferringSystemGestures: UIViewController? { + return self.gameViewController + } + override var shouldAutorotate: Bool { return self.gameViewController?.shouldAutorotate ?? true } From c57b2ef725d8c8e2ab58af492bd8b82233d3fbfb Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Mon, 5 Aug 2019 22:59:54 -0700 Subject: [PATCH 3/4] Updates iOS deployment target to iOS 12.2 --- Delta.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj index ee19848..6ca0a83 100644 --- a/Delta.xcodeproj/project.pbxproj +++ b/Delta.xcodeproj/project.pbxproj @@ -1224,7 +1224,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.2; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "-DGLES_SILENCE_DEPRECATION"; @@ -1277,7 +1277,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.2; MTL_ENABLE_DEBUG_INFO = NO; OTHER_CFLAGS = "-DGLES_SILENCE_DEPRECATION"; OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies"; From 2a81710d07404ddca0ef11518f75925b2b4ac45d Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Mon, 5 Aug 2019 23:03:08 -0700 Subject: [PATCH 4/4] Adds support for DS games --- .gitmodules | 3 ++ Cores/DSDeltaCore | 1 + Cores/DeltaCore | 2 +- Delta.xcodeproj/project.pbxproj | 6 +++ Delta.xcworkspace/contents.xcworkspacedata | 3 ++ Delta/Base.lproj/Settings.storyboard | 40 ++++++++++++++----- Delta/Emulation/GameViewController.swift | 7 ++++ .../Extensions/DeltaCoreProtocol+Delta.swift | 1 + .../ControllerInputsViewController.swift | 1 + Delta/Settings/Settings.swift | 1 + Delta/Supporting Files/Info.plist | 34 ++++++++++++++++ Delta/Systems/System.swift | 9 +++++ 12 files changed, 96 insertions(+), 12 deletions(-) create mode 160000 Cores/DSDeltaCore diff --git a/.gitmodules b/.gitmodules index 098475f..fc1f8f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "Cores/N64DeltaCore"] path = Cores/N64DeltaCore url = git@github.com:rileytestut/N64DeltaCore.git +[submodule "Cores/DSDeltaCore"] + path = Cores/DSDeltaCore + url = https://github.com/rileytestut/DSDeltaCore.git diff --git a/Cores/DSDeltaCore b/Cores/DSDeltaCore new file mode 160000 index 0000000..3c0306f --- /dev/null +++ b/Cores/DSDeltaCore @@ -0,0 +1 @@ +Subproject commit 3c0306fcee19010175ae83a31b9b185dda7430fe diff --git a/Cores/DeltaCore b/Cores/DeltaCore index bd91e2c..119fafb 160000 --- a/Cores/DeltaCore +++ b/Cores/DeltaCore @@ -1 +1 @@ -Subproject commit bd91e2c8b0084b94f0a81b30debef762c9e87c95 +Subproject commit 119fafb193b2a6561e8f87d7eb64c1a663fc9b5c diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj index 6ca0a83..eddccca 100644 --- a/Delta.xcodeproj/project.pbxproj +++ b/Delta.xcodeproj/project.pbxproj @@ -145,6 +145,8 @@ BFDE2CD2222DF36A008038E0 /* SwiftyDropbox.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BFDE2CC8222DF345008038E0 /* SwiftyDropbox.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; BFDE2CD3222DF36A008038E0 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFDE2CC7222DF345008038E0 /* Alamofire.framework */; }; BFDE2CD4222DF36A008038E0 /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BFDE2CC7222DF345008038E0 /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + BFDF71DD22F94CF70074D92E /* DSDeltaCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFDF71DA22F94CDF0074D92E /* DSDeltaCore.framework */; }; + BFDF71DE22F94CF70074D92E /* DSDeltaCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BFDF71DA22F94CDF0074D92E /* DSDeltaCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; BFE022A01F5B57FF0052D888 /* PopoverMenuButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE0229F1F5B577D0052D888 /* PopoverMenuButton.swift */; }; BFE4269E1D9C68E600DC913F /* SaveStatesStoryboardSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE4269D1D9C68E600DC913F /* SaveStatesStoryboardSegue.swift */; }; BFE593CA21F3F8B7003412A6 /* GameSave.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE593C921F3F8B7003412A6 /* GameSave.swift */; }; @@ -185,6 +187,7 @@ BF0418151D01E93400E85BCF /* GBADeltaCore.framework in Embed Frameworks */, BFDE2CD4222DF36A008038E0 /* Alamofire.framework in Embed Frameworks */, BFB359442278FD7E00CFD920 /* N64DeltaCore_Video.framework in Embed Frameworks */, + BFDF71DE22F94CF70074D92E /* DSDeltaCore.framework in Embed Frameworks */, BF144C652238511400C387E1 /* Harmony_Dropbox.framework in Embed Frameworks */, BF98C9832204D9AB006B95AC /* NESDeltaCore.framework in Embed Frameworks */, BF99C6951D0A9AA600BA92BC /* SNESDeltaCore.framework in Embed Frameworks */, @@ -320,6 +323,7 @@ BFDE2CC6222DF345008038E0 /* Harmony_Dropbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Harmony_Dropbox.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BFDE2CC7222DF345008038E0 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Alamofire.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BFDE2CC8222DF345008038E0 /* SwiftyDropbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftyDropbox.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BFDF71DA22F94CDF0074D92E /* DSDeltaCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = DSDeltaCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BFE0229F1F5B577D0052D888 /* PopoverMenuButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopoverMenuButton.swift; sourceTree = ""; }; BFE4269D1D9C68E600DC913F /* SaveStatesStoryboardSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SaveStatesStoryboardSegue.swift; sourceTree = ""; }; BFE593C921F3F8B7003412A6 /* GameSave.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameSave.swift; sourceTree = ""; }; @@ -352,6 +356,7 @@ BFEC732D1AAECC4A00650035 /* Roxas.framework in Frameworks */, BFDE2CD3222DF36A008038E0 /* Alamofire.framework in Frameworks */, BF48F75B219A1F8A00BC2FC1 /* Harmony_Drive.framework in Frameworks */, + BFDF71DD22F94CF70074D92E /* DSDeltaCore.framework in Frameworks */, BFB359452278FD8100CFD920 /* N64DeltaCore_RSP.framework in Frameworks */, BF99C6941D0A9AA600BA92BC /* SNESDeltaCore.framework in Frameworks */, BF98C9822204D9AB006B95AC /* NESDeltaCore.framework in Frameworks */, @@ -653,6 +658,7 @@ BF9F4FCD1AAD7B25004C9500 /* Frameworks */ = { isa = PBXGroup; children = ( + BFDF71DA22F94CDF0074D92E /* DSDeltaCore.framework */, BFB359412278FD6700CFD920 /* N64DeltaCore_Video.framework */, BFB359422278FD6800CFD920 /* N64DeltaCore_RSP.framework */, BF79966C224C075A009B094F /* N64DeltaCore.framework */, diff --git a/Delta.xcworkspace/contents.xcworkspacedata b/Delta.xcworkspace/contents.xcworkspacedata index 1098b3f..fe30684 100644 --- a/Delta.xcworkspace/contents.xcworkspacedata +++ b/Delta.xcworkspace/contents.xcworkspacedata @@ -22,6 +22,9 @@ + + diff --git a/Delta/Base.lproj/Settings.storyboard b/Delta/Base.lproj/Settings.storyboard index ef81f25..7dc19c8 100644 --- a/Delta/Base.lproj/Settings.storyboard +++ b/Delta/Base.lproj/Settings.storyboard @@ -4,6 +4,7 @@ + @@ -18,7 +19,7 @@