diff --git a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj index 40576d397..1786c24bd 100644 --- a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj +++ b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj @@ -494,7 +494,7 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportsDocumentBrowser = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -559,6 +559,12 @@ "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", ); MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX; @@ -591,7 +597,7 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportsDocumentBrowser = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -656,6 +662,12 @@ "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", ); MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX; diff --git a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate index d2352d7bb..a2a950573 100644 Binary files a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate and b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/src/MeloNX/MeloNX/Views/ContentView.swift b/src/MeloNX/MeloNX/Views/ContentView.swift index ff163bbf1..f716d2c49 100644 --- a/src/MeloNX/MeloNX/Views/ContentView.swift +++ b/src/MeloNX/MeloNX/Views/ContentView.swift @@ -150,20 +150,19 @@ struct ContentView: View { private func setupEmulation() { virtualController?.disconnect() + guard let game = game else { return } + if controllersList.first(where: { $0 == onscreencontroller}) != nil { controllerCallback = { DispatchQueue.main.async { controllersList = Ryujinx.shared.getConnectedControllers() - print(currentControllers) start(displayid: 1) } } - showVirtualController() } else { - DispatchQueue.main.async { print(currentControllers) start(displayid: 1) @@ -172,16 +171,17 @@ struct ContentView: View { } private func refreshControllersList() { - Timer.scheduledTimer(withTimeInterval: 0.5, repeats: false) { _ in - controllersList = Ryujinx.shared.getConnectedControllers() - var controller = controllersList.first(where: { $0.name.hasPrefix("Apple")}) - self.onscreencontroller = (controller ?? Controller(id: "", name: "")) - if controllersList.count > 2 { - let controller = controllersList[2] - currentControllers.append(controller) - - } else if let controller = controllersList.first(where: { $0.id == onscreencontroller.id }), !controllersList.isEmpty { - currentControllers.append(controller) + Timer.scheduledTimer(withTimeInterval: 1, repeats: false) { _ in + DispatchQueue.main.async { + controllersList = Ryujinx.shared.getConnectedControllers() + var controller = controllersList.first(where: { $0.name.hasPrefix("Apple")}) + self.onscreencontroller = (controller ?? Controller(id: "", name: "")) + if controllersList.count > 2 { + let controller = controllersList[2] + currentControllers.append(controller) + } else if let controller = controllersList.first(where: { $0.id == onscreencontroller.id }), !controllersList.isEmpty { + currentControllers.append(controller) + } } } } @@ -200,7 +200,6 @@ struct ContentView: View { config.gamepath = game.path config.inputids = currentControllers.map(\.id) - allocateMemory() do { try Ryujinx.shared.start(with: config) @@ -209,16 +208,6 @@ struct ContentView: View { } } - private func allocateMemory() { - let physicalMemory = ProcessInfo.processInfo.physicalMemory - let totalMemoryInGB = Double(physicalMemory) / (1024 * 1024 * 1024) - - let pointer = UnsafeMutableRawPointer.allocate( - byteCount: Int(totalMemoryInGB), - alignment: MemoryLayout.alignment - ) - pointer.initializeMemory(as: UInt8.self, repeating: 0, count: Int(totalMemoryInGB)) - } private func setMoltenVKSettings() { if let configs = loadSettings() { diff --git a/src/MeloNX/MeloNX/Views/SDLView/SDLView.swift b/src/MeloNX/MeloNX/Views/SDLView/SDLView.swift index 1f89ffaf8..fbbb445d2 100644 --- a/src/MeloNX/MeloNX/Views/SDLView/SDLView.swift +++ b/src/MeloNX/MeloNX/Views/SDLView/SDLView.swift @@ -9,6 +9,7 @@ import UIKit import MetalKit import SDL2 +/* class SDLView: UIView { var sdlwin: OpaquePointer? @@ -82,3 +83,6 @@ class SDLView: UIView { syncSDLWindowPosition() } } + +*/ + diff --git a/src/MeloNX/MeloNX/Views/SDLView/SDLViewRepresentable.swift b/src/MeloNX/MeloNX/Views/SDLView/SDLViewRepresentable.swift index be04a2581..f80d974ec 100644 --- a/src/MeloNX/MeloNX/Views/SDLView/SDLViewRepresentable.swift +++ b/src/MeloNX/MeloNX/Views/SDLView/SDLViewRepresentable.swift @@ -9,7 +9,7 @@ import UIKit import SwiftUI import SDL2 import GameController - +/* struct SDLViewRepresentable: UIViewRepresentable { let configure: (UInt32) -> Void func makeUIView(context: Context) -> SDLView { @@ -25,3 +25,5 @@ struct SDLViewRepresentable: UIViewRepresentable { } } +*/ +