diff --git a/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libavcodec.so b/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libavcodec.so new file mode 100755 index 000000000..317a5f599 Binary files /dev/null and b/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libavcodec.so differ diff --git a/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libavutil.so b/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libavutil.so new file mode 100755 index 000000000..68d116e9c Binary files /dev/null and b/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libavutil.so differ diff --git a/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libm.so b/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libm.so deleted file mode 100755 index ff2adc3a4..000000000 Binary files a/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libm.so and /dev/null differ diff --git a/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libmain.so1 b/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libmain.so1 deleted file mode 100644 index 3b72dcc17..000000000 Binary files a/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libmain.so1 and /dev/null differ diff --git a/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libswresample.so b/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libswresample.so new file mode 100755 index 000000000..7e041d794 Binary files /dev/null and b/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libswresample.so differ diff --git a/src/MeloNX-Skip/melonx-native/Android/app/src/main/kotlin/Main.kt b/src/MeloNX-Skip/melonx-native/Android/app/src/main/kotlin/Main.kt index ac004340d..d506c1bb5 100644 --- a/src/MeloNX-Skip/melonx-native/Android/app/src/main/kotlin/Main.kt +++ b/src/MeloNX-Skip/melonx-native/Android/app/src/main/kotlin/Main.kt @@ -17,6 +17,7 @@ import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.size +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.SideEffect import androidx.compose.runtime.remember @@ -62,8 +63,9 @@ open class MainActivity: SDLActivity { setContent { val gameIsRunning = remember { GameState.shared._isGameRunning.projectedValue } val startGameConfig = remember { GameState.shared._startGameConfig.projectedValue } + val fps = remember { GameState.shared._fps.projectedValue } - Box { + Box(modifier = Modifier.fillMaxSize()) { SDLComposeSurface() if (gameIsRunning?.value != true) { val saveableStateHolder = rememberSaveableStateHolder() @@ -73,10 +75,13 @@ open class MainActivity: SDLActivity { } } } + Text( + "FPS: ${fps?.value ?: 0 }" + ) if (startGameConfig?.value != null) { runSimulator(GameState.shared.startGameConfig!!) -// GameState.shared.startGameConfig = null + GameState.shared.startGameConfig = null } } diff --git a/src/MeloNX-Skip/melonx-native/Sources/MeloNXModel/Ryujinx.swift b/src/MeloNX-Skip/melonx-native/Sources/MeloNXModel/Ryujinx.swift index 17b1f5e14..31ae2a5dd 100644 --- a/src/MeloNX-Skip/melonx-native/Sources/MeloNXModel/Ryujinx.swift +++ b/src/MeloNX-Skip/melonx-native/Sources/MeloNXModel/Ryujinx.swift @@ -349,7 +349,7 @@ public extension Ryujinx { resscale: Double = 1.00, maxAnisotropy: Double = 0, macroHLE: Bool = false, - ignoreMissingServices: Bool = false, + ignoreMissingServices: Bool = true, hypervisor: Bool = false, expandRam: Bool = false, dfsIntegrityChecks: Bool = false, diff --git a/src/MeloNX-Skip/melonx-native/Sources/melonx/ContentView.swift b/src/MeloNX-Skip/melonx-native/Sources/melonx/ContentView.swift index 5d7638601..74a7d26ac 100644 --- a/src/MeloNX-Skip/melonx-native/Sources/melonx/ContentView.swift +++ b/src/MeloNX-Skip/melonx-native/Sources/melonx/ContentView.swift @@ -10,6 +10,7 @@ enum ContentTab: String, Hashable { public static var shared = GameState() public var isGameRunning: Bool = false public var startGameConfig: Ryujinx.Configuration? + public var fps: Int = 0 } struct ContentView: View { @@ -81,14 +82,16 @@ private extension ContentView { Task { try await Task.sleep(nanoseconds: 5_000_000_000) Timer.scheduledTimer(withTimeInterval: 0.5, repeats: true) { timer in - if Ryujinx.shared.getCurrentFps() != 0 { + GameState.shared.fps = Ryujinx.shared.getCurrentFps() + logger.info("FPS: \(GameState.shared.fps)") + if GameState.shared.fps != 0, isLoading { withAnimation { isLoading = false } GameState.shared.isGameRunning = true // isAnimating = false - timer.invalidate() +// timer.invalidate() } } }