diff --git a/README.md b/README.md index 640527850..cf186e833 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,6 @@ MeloNX works on iPhone XS/XR and later and iPad 8th Gen and later. Check out the - Recommended Device: iPhone 15 Pro or newer. - Low-End Recommended Device: iPhone 13 Pro. -## Discord Server - -We have a discord server! - - https://discord.gg/melonx ## How to install @@ -145,12 +141,12 @@ If having Issues installing firmware (Make sure your keys are installed first) - **GPU** - The GPU emulator emulates the Switch's Maxwell GPU using Metal (via MoltenVK) APIs through a custom build of Silk.NET. + The GPU emulator emulates the Switch's Maxwell GPU using Metal (via MoltenVK) APIs through a custom build of OpenTK or Silk.NET respectively. - **Input** - We currently have support for keyboard, touch input, JoyCon input support, and nearly all MFI controllers. - Motion controls are natively supported in most cases, however JoyCons do not have motion support doe to an iOS limitation. + We currently have support for keyboard, touch input, JoyCon input support, and nearly all controllers. + Motion controls are natively supported in most cases. - **DLC & Modifications** @@ -161,13 +157,14 @@ If having Issues installing firmware (Make sure your keys are installed first) The emulator has settings for enabling or disabling some logging, remapping controllers, and more. -# License +## License -This software is licensed under the terms of the [MeloNX license](LICENSE.txt). +This software is licensed under the terms of the [MeloNX license (Based on MIT License)](LICENSE.txt). This project makes use of code authored by the libvpx project, licensed under BSD and the ffmpeg project, licensed under LGPLv3. See [LICENSE.txt](LICENSE.txt) and [THIRDPARTY.md](distribution/legal/THIRDPARTY.md) for more details. -# Credits +## Credits + - [Ryujinx](https://github.com/ryujinx-mirror/ryujinx) is used for the base of this emulator. (link is to ryujinx-mirror since they were supportive) - [LibHac](https://github.com/Thealexbarney/LibHac) is used for our file-system. - [AmiiboAPI](https://www.amiiboapi.com) is used in our Amiibo emulation. diff --git a/src/MeloNX/MeloNX.xcconfig b/src/MeloNX/MeloNX.xcconfig index 2adb67484..42fd383c3 100644 --- a/src/MeloNX/MeloNX.xcconfig +++ b/src/MeloNX/MeloNX.xcconfig @@ -8,4 +8,4 @@ // Configuration settings file format documentation can be found at: // https://help.apple.com/xcode/#/dev745c5c974 -VERSION = 2.0.1 +VERSION = 2.0 diff --git a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj index b4c4648c6..f0485b609 100644 --- a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj +++ b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj @@ -788,9 +788,6 @@ "$(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", ); GCC_OPTIMIZATION_LEVEL = z; GENERATE_INFOPLIST_FILE = YES; @@ -1042,10 +1039,6 @@ "$(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 = "$(VERSION)"; PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX; @@ -1204,9 +1197,6 @@ "$(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", ); GCC_OPTIMIZATION_LEVEL = z; GENERATE_INFOPLIST_FILE = YES; @@ -1458,10 +1448,6 @@ "$(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 = "$(VERSION)"; 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 b4c024fa9..78f3b1f5a 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.xcodeproj/xcshareddata/xcschemes/MeloNX.xcscheme b/src/MeloNX/MeloNX.xcodeproj/xcshareddata/xcschemes/MeloNX.xcscheme index f79f4ed54..ae7c58c0b 100644 --- a/src/MeloNX/MeloNX.xcodeproj/xcshareddata/xcschemes/MeloNX.xcscheme +++ b/src/MeloNX/MeloNX.xcodeproj/xcshareddata/xcschemes/MeloNX.xcscheme @@ -58,7 +58,6 @@ buildConfiguration = "Release" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - disableMainThreadChecker = "YES" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" @@ -69,8 +68,7 @@ allowLocationSimulation = "YES" queueDebuggingEnabled = "No" consoleMode = "0" - structuredConsoleMode = "2" - disablePerformanceAntipatternChecker = "YES"> + structuredConsoleMode = "2"> #include - #ifdef __cplusplus extern "C" { #endif - struct GameInfo { long FileSize; char TitleName[512]; @@ -43,10 +41,6 @@ struct DlcNcaList { struct DlcNcaListItem* items; }; -typedef void (^SwiftCallback)(NSString *result); - -void RegisterCallback(NSString *identifier, SwiftCallback callback); - extern struct GameInfo get_game_info(int, char*); extern struct DlcNcaList get_dlc_nca_list(const char* titleIdPtr, const char* pathPtr); diff --git a/src/MeloNX/MeloNX/App/Core/JIT/IsJITEnabled.swift b/src/MeloNX/MeloNX/App/Core/JIT/IsJITEnabled.swift index fd5b7c68e..385457516 100644 --- a/src/MeloNX/MeloNX/App/Core/JIT/IsJITEnabled.swift +++ b/src/MeloNX/MeloNX/App/Core/JIT/IsJITEnabled.swift @@ -62,6 +62,7 @@ func allocateTest() -> Bool { memcpy(jitMemory, code, code.count) + if mprotect(jitMemory, pageSize, PROT_READ | PROT_EXEC) != 0 { return false } diff --git a/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/NativeController.swift b/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/NativeController.swift index d0cdc47e3..fae70410c 100644 --- a/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/NativeController.swift +++ b/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/NativeController.swift @@ -12,7 +12,8 @@ class NativeController: Hashable, BaseController { private var instanceID: SDL_JoystickID = -1 private var controller: OpaquePointer? private var nativeController: GCController - private var controllerMotionProvider: DSUMotionProvider? + private var controllerMotionProvider: ControllerMotionProvider? + private var deviceMotionProvider: DeviceMotionProvider? private let controllerHaptics: CHHapticEngine? private let rumbleController: RumbleController? @@ -21,21 +22,21 @@ class NativeController: Hashable, BaseController { init(_ controller: GCController) { nativeController = controller - var ncontrollerHaptics = nativeController.haptics?.createEngine(withLocality: .default) - - let vendorName = nativeController.vendorName ?? "Unknown" - var usesdeviceHaptics = (ncontrollerHaptics == nil || vendorName.lowercased().hasSuffix("backbone") || vendorName.lowercased() == "backbone one") - controllerHaptics = usesdeviceHaptics ? ncontrollerHaptics : try? CHHapticEngine() + controllerHaptics = nativeController.haptics?.createEngine(withLocality: .default) // Make sure the haptic engine exists before attempting to start it or initialize the controller. if let hapticsEngine = controllerHaptics { do { try hapticsEngine.start() - rumbleController = RumbleController(engine: hapticsEngine, rumbleMultiplier: 1.2) + rumbleController = RumbleController(engine: hapticsEngine, rumbleMultiplier: 2.5) + + // print("CHHapticEngine started and RumbleController initialized.") } catch { + // print("Error starting CHHapticEngine: \(error.localizedDescription)") rumbleController = nil } } else { + // print("CHHapticEngine is nil. Cannot initialize RumbleController.") rumbleController = nil } setupHandheldController() @@ -48,17 +49,27 @@ class NativeController: Hashable, BaseController { internal func tryRegisterMotion(slot: UInt8) { // Setup Motion let dsuServer = DSUServer.shared - let vendorName = nativeController.vendorName ?? "Unknown" - var usesdevicemotion = (vendorName.lowercased() == "Joy-Con (l/R)".lowercased() || vendorName.lowercased().hasSuffix("backbone") || vendorName.lowercased() == "backbone one") - controllerMotionProvider = usesdevicemotion ? DeviceMotionProvider(slot: slot) : ControllerMotionProvider(controller: nativeController, slot: slot) - - if let provider = controllerMotionProvider { - dsuServer.register(provider) + if nativeController.vendorName?.lowercased() == "Joy-Con (l/R)".lowercased() { + deviceMotionProvider = DeviceMotionProvider(slot: slot) + if let provider = deviceMotionProvider { + dsuServer.register(provider) + } + } else { + controllerMotionProvider = ControllerMotionProvider(controller: nativeController, slot: slot) + if let provider = controllerMotionProvider { + dsuServer.register(provider) + } } } - internal func tryGetMotionProvider() -> DSUMotionProvider? { return controllerMotionProvider } + internal func tryGetMotionProvider() -> DSUMotionProvider? { + if nativeController.vendorName == "Joy-Con (l/R)" { + return deviceMotionProvider + } else { + return controllerMotionProvider + } + } private func setupHandheldController() { if SDL_WasInit(Uint32(SDL_INIT_GAMECONTROLLER)) == 0 { @@ -83,39 +94,38 @@ class NativeController: Hashable, BaseController { }, SetPlayerIndex: { userdata, playerIndex in // print("Player index set to \(playerIndex)") - guard let userdata, let player = GCControllerPlayerIndex(rawValue: Int(playerIndex)) else { return } - let _self = Unmanaged.fromOpaque(userdata).takeUnretainedValue() - _self.nativeController.playerIndex = player }, Rumble: { userdata, lowFreq, highFreq in + // print("Rumble with \(lowFreq), \(highFreq)") guard let userdata else { return 0 } let _self = Unmanaged.fromOpaque(userdata).takeUnretainedValue() _self.rumbleController?.rumble(lowFreq: Float(lowFreq), highFreq: Float(highFreq)) return 0 }, RumbleTriggers: { userdata, leftRumble, rightRumble in + // print("Trigger rumble with \(leftRumble), \(rightRumble)") return 0 }, SetLED: { userdata, red, green, blue in - guard let userdata else { return 0 } - let _self = Unmanaged.fromOpaque(userdata).takeUnretainedValue() - guard let light = _self.nativeController.light else { return 0 } - light.color = .init(red: Float(red), green: Float(green), blue: Float(blue)) + // print("Set LED to RGB(\(red), \(green), \(blue))") return 0 }, SendEffect: { userdata, data, size in + // print("Effect sent with size \(size)") return 0 } ) - instanceID = SDL_JoystickAttachVirtualEx(&joystickDesc) + instanceID = SDL_JoystickAttachVirtualEx(&joystickDesc)// SDL_JoystickAttachVirtual(SDL_JoystickType(SDL_JOYSTICK_TYPE_GAMECONTROLLER.rawValue), 6, 15, 1) if instanceID < 0 { + // print("Failed to create virtual joystick: \(String(cString: SDL_GetError()))") return } controller = SDL_GameControllerOpen(Int32(instanceID)) if controller == nil { + // print("Failed to create virtual controller: \(String(cString: SDL_GetError()))") return } @@ -204,6 +214,7 @@ class NativeController: Hashable, BaseController { func setButtonState(_ state: Uint8, for button: VirtualControllerButton) { guard controller != nil else { return } +// // print("Button: \(button.rawValue) {state: \(state)}") if (button == .leftTrigger || button == .rightTrigger) && (state == 1 || state == 0) { let axis: SDL_GameControllerAxis = (button == .leftTrigger) ? SDL_CONTROLLER_AXIS_TRIGGERLEFT : SDL_CONTROLLER_AXIS_TRIGGERRIGHT let value: Int = (state == 1) ? 32767 : 0 diff --git a/src/MeloNX/MeloNX/App/Core/Ryujinx/Ryujinx.swift b/src/MeloNX/MeloNX/App/Core/Ryujinx/Ryujinx.swift index 3c09d1905..6e3bd3361 100644 --- a/src/MeloNX/MeloNX/App/Core/Ryujinx/Ryujinx.swift +++ b/src/MeloNX/MeloNX/App/Core/Ryujinx/Ryujinx.swift @@ -535,9 +535,9 @@ class Ryujinx : ObservableObject { args.append(contentsOf: ["--memory-manager-mode", config.memoryManagerMode]) - args.append(contentsOf: ["--exclusive-fullscreen", String(true)]) - args.append(contentsOf: ["--exclusive-fullscreen-width", "\(Int(UIScreen.main.bounds.width))"]) - args.append(contentsOf: ["--exclusive-fullscreen-height", "\(Int(UIScreen.main.bounds.height))"]) + // args.append(contentsOf: ["--exclusive-fullscreen", String(true)]) + // args.append(contentsOf: ["--exclusive-fullscreen-width", "\(Int(UIScreen.main.bounds.width))"]) + // args.append(contentsOf: ["--exclusive-fullscreen-height", "\(Int(UIScreen.main.bounds.height))"]) // We don't need this. Ryujinx should handle it fine :3 // this also causes crashes in some games :3 @@ -565,9 +565,9 @@ class Ryujinx : ObservableObject { args.append(contentsOf: ["--aspect-ratio", config.aspectRatio.rawValue]) - args.append(contentsOf: ["--system-timezone", TimeZone.current.identifier]) + // args.append(contentsOf: ["--system-timezone", TimeZone.current.identifier]) - // args.append(contentsOf: ["--system-time-offset", String(TimeZone.current.secondsFromGMT())]) + args.append(contentsOf: ["--system-time-offset", String(TimeZone.current.secondsFromGMT())]) if config.nintendoinput { diff --git a/src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/EmulationView.swift b/src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/EmulationView.swift index 58a2b6d49..43043a43c 100644 --- a/src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/EmulationView.swift +++ b/src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/EmulationView.swift @@ -142,15 +142,6 @@ struct EmulationView: View { // print(cool) } } - - RegisterCallback("exit-emulation") { cool in - DispatchQueue.main.async { - print(cool) - startgame = nil - stop_emulation() - try? Ryujinx.shared.stop() - } - } } .onChange(of: scenePhase) { newPhase in // Detect when the app enters the background diff --git a/src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/InGameSettingsManager/InGameSettingsManager.swift b/src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/InGameSettingsManager/InGameSettingsManager.swift index acbb15195..10958d1e8 100644 --- a/src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/InGameSettingsManager/InGameSettingsManager.swift +++ b/src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/InGameSettingsManager/InGameSettingsManager.swift @@ -35,6 +35,7 @@ class InGameSettingsManager: PerGameSettingsManaging { Ryujinx.shared.config = config[currentgame.titleId] let args = Ryujinx.shared.buildCommandLineArgs(from: config[currentgame.titleId] ?? Ryujinx.Arguments()) + // Convert Arguments to ones that Ryujinx can Read let cArgs = args.map { strdup($0) } defer { cArgs.forEach { free($0) } } var argvPtrs = cArgs diff --git a/src/MeloNX/MeloNX/App/Views/Main/Emulation/MetalView/MeloMTKView.swift b/src/MeloNX/MeloNX/App/Views/Main/Emulation/MetalView/MeloMTKView.swift index 25d296012..442065c85 100644 --- a/src/MeloNX/MeloNX/App/Views/Main/Emulation/MetalView/MeloMTKView.swift +++ b/src/MeloNX/MeloNX/App/Views/Main/Emulation/MetalView/MeloMTKView.swift @@ -9,10 +9,10 @@ import MetalKit import UIKit class MeloMTKView: MTKView { + private var activeTouches: [UITouch] = [] private var ignoredTouches: Set = [] - private var touchIndexMap: [UITouch: Int] = [:] - + private let baseWidth: CGFloat = 1280 private let baseHeight: CGFloat = 720 private var aspectRatio: AspectRatio = .fixed16x9 @@ -84,112 +84,83 @@ class MeloMTKView: MTKView { return CGPoint(x: scaledX, y: scaledY) } - private func getNextAvailableIndex() -> Int { - for i in 0.., with event: UIEvent?) { super.touchesBegan(touches, with: event) - + let disabled = UserDefaults.standard.bool(forKey: "disableTouch") - guard !disabled else { return } setAspectRatio(Ryujinx.shared.config?.aspectRatio ?? .fixed16x9) - - for touch in touches { - let location = touch.location(in: self) - guard let scaledLocation = scaleToTargetResolution(location) else { - ignoredTouches.insert(touch) - continue + + if !disabled { + for touch in touches { + let location = touch.location(in: self) + if scaleToTargetResolution(location) == nil { + ignoredTouches.insert(touch) + continue + } + + activeTouches.append(touch) + let index = activeTouches.firstIndex(of: touch)! + + let scaledLocation = scaleToTargetResolution(location)! + // // print("Touch began at: \(scaledLocation) and \(self.aspectRatio)") + touch_began(Float(scaledLocation.x), Float(scaledLocation.y), Int32(index)) } - - let index = getNextAvailableIndex() - touchIndexMap[touch] = index - activeTouches.append(touch) - - touch_began(Float(scaledLocation.x), Float(scaledLocation.y), Int32(index)) } } override func touchesEnded(_ touches: Set, with event: UIEvent?) { super.touchesEnded(touches, with: event) - + let disabled = UserDefaults.standard.bool(forKey: "disableTouch") - guard !disabled else { + + setAspectRatio(Ryujinx.shared.config?.aspectRatio ?? .fixed16x9) + + if !disabled { for touch in touches { - ignoredTouches.remove(touch) + if ignoredTouches.contains(touch) { + ignoredTouches.remove(touch) + continue + } + if let index = activeTouches.firstIndex(of: touch) { activeTouches.remove(at: index) + + // // print("Touch ended for index \(index)") + touch_ended(Int32(index)) } - touchIndexMap.removeValue(forKey: touch) - } - return - } - - for touch in touches { - if ignoredTouches.remove(touch) != nil { - continue - } - - if let touchIndex = touchIndexMap[touch] { - touch_ended(Int32(touchIndex)) - - if let arrayIndex = activeTouches.firstIndex(of: touch) { - activeTouches.remove(at: arrayIndex) - } - touchIndexMap.removeValue(forKey: touch) } } } override func touchesMoved(_ touches: Set, with event: UIEvent?) { super.touchesMoved(touches, with: event) - + let disabled = UserDefaults.standard.bool(forKey: "disableTouch") - guard !disabled else { return } setAspectRatio(Ryujinx.shared.config?.aspectRatio ?? .fixed16x9) - - for touch in touches { - if ignoredTouches.contains(touch) { - continue - } - - guard let touchIndex = touchIndexMap[touch] else { - continue - } - - let location = touch.location(in: self) - guard let scaledLocation = scaleToTargetResolution(location) else { - touch_ended(Int32(touchIndex)) - - if let arrayIndex = activeTouches.firstIndex(of: touch) { - activeTouches.remove(at: arrayIndex) + + if !disabled { + for touch in touches { + if ignoredTouches.contains(touch) { + continue + } + + let location = touch.location(in: self) + guard let scaledLocation = scaleToTargetResolution(location) else { + if let index = activeTouches.firstIndex(of: touch) { + activeTouches.remove(at: index) + // // print("Touch left active area, removed index \(index)") + touch_ended(Int32(index)) + } + continue + } + + if let index = activeTouches.firstIndex(of: touch) { + // // print("Touch moved to: \(scaledLocation)") + touch_moved(Float(scaledLocation.x), Float(scaledLocation.y), Int32(index)) } - touchIndexMap.removeValue(forKey: touch) - ignoredTouches.insert(touch) - continue } - - touch_moved(Float(scaledLocation.x), Float(scaledLocation.y), Int32(touchIndex)) } } - - override func touchesCancelled(_ touches: Set, with event: UIEvent?) { - super.touchesCancelled(touches, with: event) - touchesEnded(touches, with: event) - } - - - func resetTouchTracking() { - activeTouches.removeAll() - ignoredTouches.removeAll() - touchIndexMap.removeAll() - } } - diff --git a/src/MeloNX/MeloNX/App/Views/Main/UI/ContentView.swift b/src/MeloNX/MeloNX/App/Views/Main/UI/ContentView.swift index 1eb05187d..0c5e6f02e 100644 --- a/src/MeloNX/MeloNX/App/Views/Main/UI/ContentView.swift +++ b/src/MeloNX/MeloNX/App/Views/Main/UI/ContentView.swift @@ -81,6 +81,8 @@ struct ContentView: View { _settings = State(initialValue: defaultSettings) + // print(SDL_CONTROLLER_BUTTON_LEFTSTICK.rawValue) + initializeSDL() } @@ -130,6 +132,7 @@ struct ContentView: View { JITPopover() { ryujinx.jitenabled = false } + // .interactiveDismissDisabled() } } @@ -150,8 +153,11 @@ struct ContentView: View { refreshControllersList() } + UserDefaults.standard.set(false, forKey: "lockInApp") + // print(MTLHud.shared.isEnabled) + initControllerObservers() Air.play(AnyView( @@ -160,6 +166,7 @@ struct ContentView: View { refreshControllersList() + ryujinx.addGames() checkJitStatus() @@ -280,6 +287,7 @@ struct ContentView: View { queue: .main ) { notification in if let controller = notification.object as? GCController { + // print("Controller connected: \(controller.productCategory)") nativeControllers[controller] = .init(controller) refreshControllersList() } @@ -291,8 +299,7 @@ struct ContentView: View { queue: .main ) { notification in if let controller = notification.object as? GCController { - currentControllers = [] - controllersList = [] + // print("Controller disconnected: \(controller.productCategory)") nativeControllers[controller]?.cleanup() nativeControllers[controller] = nil refreshControllersList() @@ -309,9 +316,6 @@ struct ContentView: View { } private func refreshControllersList() { - currentControllers = [] - controllersList = [] - controllersList = ryujinx.getConnectedControllers() if let onscreen = controllersList.first(where: { $0.name == ryujinx.virtualController.controllername }) { @@ -320,6 +324,8 @@ struct ContentView: View { controllersList.removeAll(where: { $0.id == "0" || (!$0.name.starts(with: "GC - ") && $0 != onscreencontroller) }) controllersList.mutableForEach { $0.name = $0.name.replacingOccurrences(of: "GC - ", with: "") } + + currentControllers = [] if controllersList.count == 1 { currentControllers.append(controllersList[0]) diff --git a/src/MeloNX/MeloNX/App/Views/Main/UI/GamesList/GameListView.swift b/src/MeloNX/MeloNX/App/Views/Main/UI/GamesList/GameListView.swift index 47124f48e..6125bdae9 100644 --- a/src/MeloNX/MeloNX/App/Views/Main/UI/GamesList/GameListView.swift +++ b/src/MeloNX/MeloNX/App/Views/Main/UI/GamesList/GameListView.swift @@ -1252,16 +1252,3 @@ extension View { } } } - - -extension View { - @available(iOS, introduced: 14.0, deprecated: 19.0, message: "") - func glassEffect(_ style: Glass, in shape: some Shape) -> some View { - return self - } -} - -@available(iOS, introduced: 14.0, deprecated: 19.0, message: "") -struct Glass: Hashable { - static var regular = Glass() -} diff --git a/src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/Info.plist b/src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/Info.plist index 176855fa8..6b69c67ad 100644 Binary files a/src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/Info.plist and b/src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/Info.plist differ diff --git a/src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/RyujinxHelper b/src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/RyujinxHelper index b411095c9..b89e9d5b0 100755 Binary files a/src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/RyujinxHelper and b/src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/RyujinxHelper differ diff --git a/src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/_CodeSignature/CodeResources b/src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/_CodeSignature/CodeResources index a342a7acb..0483b32cc 100644 --- a/src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/_CodeSignature/CodeResources +++ b/src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/_CodeSignature/CodeResources @@ -10,7 +10,7 @@ Info.plist - GYWZONTCP5su4yOAk0d5jCd2K88= + RTwvCLsTMs+YfZ9ZeF25QYe7/LE= Modules/module.modulemap diff --git a/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs b/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs index e7fb5f1f7..3fe20950c 100644 --- a/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs +++ b/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs @@ -702,12 +702,11 @@ namespace Ryujinx.Graphics.Vulkan if (true) { try - { - UpdateAndBind(cbs, program, PipelineBase.TextureSetIndex, pbp); - } - catch (Exception e) { UpdateAndBindTexturesWithoutTemplate(cbs, program, pbp); + } catch (Exception e) + { + UpdateAndBind(cbs, program, PipelineBase.TextureSetIndex, pbp); } } else @@ -764,7 +763,7 @@ namespace Ryujinx.Graphics.Vulkan if (info.Buffer.Handle == 0) { info.Buffer = dummyBuffer?.Get(cbs).Value ?? default; - // info.Offset = 0; + info.Offset = 0; info.Range = Vk.WholeSize; } @@ -799,13 +798,6 @@ namespace Ryujinx.Graphics.Vulkan } } - var dummyImageInfo = new DescriptorImageInfo - { - ImageView = _dummyTexture.GetImageView().Get(cbs).Value, - Sampler = _dummySampler.GetSampler().Get(cbs).Value, - ImageLayout = ImageLayout.General - }; - DescriptorSetTemplate template = program.Templates[setIndex]; DescriptorSetTemplateWriter tu = _templateUpdater.Begin(template); @@ -879,12 +871,12 @@ namespace Ryujinx.Graphics.Vulkan if (texture.ImageView.Handle == 0) { - texture.ImageView = dummyImageInfo.ImageView; + texture.ImageView = _dummyTexture.GetImageView().Get(cbs).Value; } if (texture.Sampler.Handle == 0) { - texture.Sampler = dummyImageInfo.Sampler; + texture.Sampler = _dummySampler.GetSampler().Get(cbs).Value; } } @@ -924,7 +916,7 @@ namespace Ryujinx.Graphics.Vulkan for (int i = 0; i < count; i++) { - images[i].ImageView = _imageRefs[binding + i].ImageView?.Get(cbs).Value ?? dummyImageInfo.ImageView; + images[i].ImageView = _imageRefs[binding + i].ImageView?.Get(cbs).Value ?? default; } tu.Push(images[..count]); diff --git a/src/Ryujinx.Graphics.Vulkan/ImageArray.cs b/src/Ryujinx.Graphics.Vulkan/ImageArray.cs index 205be5aeb..439fcb8ea 100644 --- a/src/Ryujinx.Graphics.Vulkan/ImageArray.cs +++ b/src/Ryujinx.Graphics.Vulkan/ImageArray.cs @@ -188,21 +188,15 @@ namespace Ryujinx.Graphics.Vulkan var dsc = program.GetNewDescriptorSetCollection(setIndex, out var isNew).Get(cbs); - DescriptorSetTemplate template = program.Templates[setIndex]; - - DescriptorSetTemplateWriter tu = templateUpdater.Begin(template); - if (!_isBuffer) { - tu.Push(GetImageInfos(_gd, cbs, dummyTexture)); + dsc.UpdateImages(0, 0, GetImageInfos(_gd, cbs, dummyTexture), DescriptorType.StorageImage); } else { - tu.Push(GetBufferViews(cbs)); + dsc.UpdateBufferImages(0, 0, GetBufferViews(cbs), DescriptorType.StorageTexelBuffer); } - templateUpdater.Commit(_gd, device, sets[0]); - sets = dsc.GetSets(); return sets; diff --git a/src/Ryujinx.Graphics.Vulkan/TextureArray.cs b/src/Ryujinx.Graphics.Vulkan/TextureArray.cs index d2e16fc32..99238b1f5 100644 --- a/src/Ryujinx.Graphics.Vulkan/TextureArray.cs +++ b/src/Ryujinx.Graphics.Vulkan/TextureArray.cs @@ -159,8 +159,8 @@ namespace Ryujinx.Graphics.Vulkan } texture.ImageLayout = ImageLayout.General; - texture.ImageView = refs.View?.Get(cbs).Value ?? dummyTexture.GetImageView().Get(cbs).Value; - texture.Sampler = refs.Sampler?.Get(cbs).Value ?? dummySampler.GetSampler().Get(cbs).Value; + texture.ImageView = refs.View?.Get(cbs).Value ?? default; + texture.Sampler = refs.Sampler?.Get(cbs).Value ?? default; if (texture.ImageView.Handle == 0) { diff --git a/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs b/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs index 231d61718..5f3e91cdc 100644 --- a/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs +++ b/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs @@ -647,14 +647,6 @@ namespace Ryujinx.Graphics.Vulkan Format.Bc7Srgb, Format.Bc7Unorm); - if (!OperatingSystem.IsIOSVersionAtLeast(16, 4)) - { - // On iOS 16.3.1 and earlier, these formats are not supported. - supportsBc123CompressionFormat = false; - supportsBc45CompressionFormat = false; - supportsBc67CompressionFormat = false; - } - bool supportsEtc2CompressionFormat = FormatCapabilities.OptimalFormatsSupport(compressedFormatFeatureFlags, Format.Etc2RgbaSrgb, Format.Etc2RgbaUnorm, @@ -722,7 +714,7 @@ namespace Ryujinx.Graphics.Vulkan SystemMemoryType memoryType; - if (IsSharedMemory && !IsMoltenVk) + if (IsSharedMemory) { memoryType = SystemMemoryType.UnifiedMemory; } diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryAppletSelfAccessor.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryAppletSelfAccessor.cs index d0f1f8da3..fc02ea172 100644 --- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryAppletSelfAccessor.cs +++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryAppletSelfAccessor.cs @@ -1,14 +1,10 @@ using Ryujinx.Common; -using System.Runtime.InteropServices; using System; namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.LibraryAppletProxy { class ILibraryAppletSelfAccessor : IpcService { - [DllImport("RyujinxHelper.framework/RyujinxHelper", CallingConvention = CallingConvention.Cdecl)] - public static extern void TriggerCallback(string cIdentifier); - private readonly AppletStandalone _appletStandalone = new(); public ILibraryAppletSelfAccessor(ServiceCtx context) @@ -49,14 +45,6 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib return ResultCode.Success; } - [CommandCmif(1)] - public ResultCode PushOutData(ServiceCtx context) - { - TriggerCallback("exit-emulation"); - return ResultCode.Success; - } - - [CommandCmif(11)] // GetLibraryAppletInfo() -> nn::am::service::LibraryAppletInfo public ResultCode GetLibraryAppletInfo(ServiceCtx context) diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorage.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorage.cs index 664ff07bd..311084aa1 100644 --- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorage.cs +++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorage.cs @@ -11,11 +11,6 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE Data = data; } - public byte[] GetData() - { - return Data; - } - [CommandCmif(0)] // Open() -> object public ResultCode Open(ServiceCtx context)