XITRIX/MeloNX
Archived
1
0
Fork 0
forked from MeloNX/MeloNX
Code Pull Requests Activity

WIP

Browse Source
This commit is contained in:
Daniil Vinogradov 2025-03-07 01:21:05 +01:00
parent 2b290f5153
commit 877a3b3dd7
7 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/MeloNX-Skip/melonx-native/Android/app/src/main/jniLibs/arm64-v8a/libRyujinx.Headless.SDL2.so
View File

Binary file not shown.

12
src/MeloNX-Skip/melonx-native/Android/app/src/main/kotlin/Main.kt
View File

@ -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) }
}
}
}
}

5
src/MeloNX-Skip/melonx-native/Sources/MeloNXModel/Ryujinx.swift
View File

@ -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")
}

2
src/MeloNX-Skip/melonx-native/Sources/melonx/Screens/GamesView.swift
View File

@ -82,7 +82,7 @@ struct GamesView: View {
}
}
}
.animation(.easeInOut, value: searchQuery)
// .animation(.easeInOut, value: searchQuery)
.navigationTitle("Games")
.navigationBarTitleDisplayMode(.large)
.searchable(text: $searchQuery)

2
src/MeloNX-Skip/melonx-native/Sources/melonx/melonxApp.swift
View File

@ -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)
}
}

2
src/Ryujinx.Headless.SDL2/Options.cs
View File

@ -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; }

28
src/Ryujinx.Headless.SDL2/Program.cs
View File

@ -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)
{