diff --git a/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libRyujinx.Headless.SDL2.so b/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libRyujinx.Headless.SDL2.so index fcd96d292..2dbafcf59 100644 Binary files a/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libRyujinx.Headless.SDL2.so and b/src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libRyujinx.Headless.SDL2.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 b6f918bfa..896008bea 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 @@ -21,6 +21,7 @@ import androidx.compose.runtime.saveable.rememberSaveableStateHolder import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.unit.dp import androidx.compose.ui.viewinterop.AndroidView import androidx.core.app.ActivityCompat @@ -57,11 +58,12 @@ open class MainActivity: SDLActivity { setContent { Box { SDLComposeSurface() - - val saveableStateHolder = rememberSaveableStateHolder() - saveableStateHolder.SaveableStateProvider(true) { - PresentationRootView(ComposeContext()) - SideEffect { saveableStateHolder.removeState(true) } + Box(Modifier.graphicsLayer(alpha = 0.5f)) { + val saveableStateHolder = rememberSaveableStateHolder() + saveableStateHolder.SaveableStateProvider(true) { + PresentationRootView(ComposeContext()) + SideEffect { saveableStateHolder.removeState(true) } + } } } } diff --git a/src/MeloNX-Skip/melonx-native/Sources/MeloNXModel/Ryujinx.swift b/src/MeloNX-Skip/melonx-native/Sources/MeloNXModel/Ryujinx.swift index 8e1316346..aef639c4e 100644 --- a/src/MeloNX-Skip/melonx-native/Sources/MeloNXModel/Ryujinx.swift +++ b/src/MeloNX-Skip/melonx-native/Sources/MeloNXModel/Ryujinx.swift @@ -144,7 +144,7 @@ private extension Ryujinx { args.append(contentsOf: ["--memory-manager-mode", config.memoryManagerMode]) - args.append(contentsOf: ["--exclusive-fullscreen", String(true)]) +// 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 @@ -213,6 +213,9 @@ private extension Ryujinx { if config.debuglogs { args.append("--enable-debug-logs") } + + args.append("--disable-info-logs") + if config.tracelogs { args.append("--enable-trace-logs") } diff --git a/src/MeloNX-Skip/melonx-native/Sources/melonx/Screens/GamesView.swift b/src/MeloNX-Skip/melonx-native/Sources/melonx/Screens/GamesView.swift index 519284bf8..4618978e4 100644 --- a/src/MeloNX-Skip/melonx-native/Sources/melonx/Screens/GamesView.swift +++ b/src/MeloNX-Skip/melonx-native/Sources/melonx/Screens/GamesView.swift @@ -82,7 +82,7 @@ struct GamesView: View { } } } - .animation(.easeInOut, value: searchQuery) +// .animation(.easeInOut, value: searchQuery) .navigationTitle("Games") .navigationBarTitleDisplayMode(.large) .searchable(text: $searchQuery) diff --git a/src/MeloNX-Skip/melonx-native/Sources/melonx/melonxApp.swift b/src/MeloNX-Skip/melonx-native/Sources/melonx/melonxApp.swift index 0224352b1..9db20394c 100644 --- a/src/MeloNX-Skip/melonx-native/Sources/melonx/melonxApp.swift +++ b/src/MeloNX-Skip/melonx-native/Sources/melonx/melonxApp.swift @@ -22,7 +22,7 @@ public struct melonxRootView : View { logger.info("Welcome to Skip on \(androidSDK != nil ? "Android" : "Darwin")!") logger.info("Skip app logs are viewable in the Xcode console for iOS; Android logs can be viewed in Studio or using adb logcat") } - .opacity(0.3) +// .opacity(0.3) } } diff --git a/src/Ryujinx.Headless.SDL2/Options.cs b/src/Ryujinx.Headless.SDL2/Options.cs index bd3ad4c17..3d8193367 100644 --- a/src/Ryujinx.Headless.SDL2/Options.cs +++ b/src/Ryujinx.Headless.SDL2/Options.cs @@ -171,7 +171,7 @@ namespace Ryujinx.Headless.SDL2 public bool LoggingDisableWarning { get; set; } [Option("disable-error-logs", Required = false, HelpText = "Disables printing error log messages.")] - public bool LoggingEnableError { get; set; } + public bool LoggingDisableError { get; set; } [Option("enable-trace-logs", Required = false, Default = false, HelpText = "Enables printing trace log messages.")] public bool LoggingEnableTrace { get; set; } diff --git a/src/Ryujinx.Headless.SDL2/Program.cs b/src/Ryujinx.Headless.SDL2/Program.cs index 89ce1062b..d02e884cf 100644 --- a/src/Ryujinx.Headless.SDL2/Program.cs +++ b/src/Ryujinx.Headless.SDL2/Program.cs @@ -123,17 +123,14 @@ namespace Ryujinx.Headless.SDL2 { string[] args = new string[argCount]; - Logger.Info?.Print(LogClass.Application, $"Start Emu Test 1"); try { - Logger.Info?.Print(LogClass.Application, $"Start Emu Test 2"); for (int i = 0; i < argCount; i++) { args[i] = Marshal.PtrToStringAnsi(pArgs[i]); Logger.Info?.Print(LogClass.Application, args[i]); } - Logger.Info?.Print(LogClass.Application, $"Start Emu Test 3"); Main(args); } @@ -1274,23 +1271,14 @@ namespace Ryujinx.Headless.SDL2 } // Setup logging level - // Logger.SetEnable(LogLevel.Debug, option.LoggingEnableDebug); - // Logger.SetEnable(LogLevel.Stub, !option.LoggingDisableStub); - // Logger.SetEnable(LogLevel.Info, !option.LoggingDisableInfo); - // Logger.SetEnable(LogLevel.Warning, !option.LoggingDisableWarning); - // Logger.SetEnable(LogLevel.Error, option.LoggingEnableError); - // Logger.SetEnable(LogLevel.Trace, option.LoggingEnableTrace); - // Logger.SetEnable(LogLevel.Guest, !option.LoggingDisableGuest); - // Logger.SetEnable(LogLevel.AccessLog, option.LoggingEnableFsAccessLog); - - Logger.SetEnable(LogLevel.Debug, true); - Logger.SetEnable(LogLevel.Stub, true); - Logger.SetEnable(LogLevel.Info, true); - Logger.SetEnable(LogLevel.Warning, true); - Logger.SetEnable(LogLevel.Error, true); - Logger.SetEnable(LogLevel.Trace, false); - Logger.SetEnable(LogLevel.Guest, false); - Logger.SetEnable(LogLevel.AccessLog, true); + Logger.SetEnable(LogLevel.Debug, option.LoggingEnableDebug); + Logger.SetEnable(LogLevel.Stub, !option.LoggingDisableStub); + Logger.SetEnable(LogLevel.Info, !option.LoggingDisableInfo); + Logger.SetEnable(LogLevel.Warning, !option.LoggingDisableWarning); + Logger.SetEnable(LogLevel.Error, !option.LoggingDisableError); + Logger.SetEnable(LogLevel.Trace, option.LoggingEnableTrace); + Logger.SetEnable(LogLevel.Guest, !option.LoggingDisableGuest); + Logger.SetEnable(LogLevel.AccessLog, option.LoggingEnableFsAccessLog); if (!option.DisableFileLog) {