forked from MeloNX/MeloNX
WIP
This commit is contained in:
parent
2b290f5153
commit
877a3b3dd7
Binary file not shown.
@ -21,6 +21,7 @@ import androidx.compose.runtime.saveable.rememberSaveableStateHolder
|
|||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import androidx.compose.ui.graphics.graphicsLayer
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.viewinterop.AndroidView
|
import androidx.compose.ui.viewinterop.AndroidView
|
||||||
import androidx.core.app.ActivityCompat
|
import androidx.core.app.ActivityCompat
|
||||||
@ -57,7 +58,7 @@ open class MainActivity: SDLActivity {
|
|||||||
setContent {
|
setContent {
|
||||||
Box {
|
Box {
|
||||||
SDLComposeSurface()
|
SDLComposeSurface()
|
||||||
|
Box(Modifier.graphicsLayer(alpha = 0.5f)) {
|
||||||
val saveableStateHolder = rememberSaveableStateHolder()
|
val saveableStateHolder = rememberSaveableStateHolder()
|
||||||
saveableStateHolder.SaveableStateProvider(true) {
|
saveableStateHolder.SaveableStateProvider(true) {
|
||||||
PresentationRootView(ComposeContext())
|
PresentationRootView(ComposeContext())
|
||||||
@ -65,6 +66,7 @@ open class MainActivity: SDLActivity {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Example of requesting permissions on startup.
|
// Example of requesting permissions on startup.
|
||||||
// These must match the permissions in the AndroidManifest.xml file.
|
// These must match the permissions in the AndroidManifest.xml file.
|
||||||
|
@ -144,7 +144,7 @@ private extension Ryujinx {
|
|||||||
|
|
||||||
args.append(contentsOf: ["--memory-manager-mode", config.memoryManagerMode])
|
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-width", "\(Int(UIScreen.main.bounds.width))"])
|
||||||
// args.append(contentsOf: ["--exclusive-fullscreen-height", "\(Int(UIScreen.main.bounds.height))"])
|
// args.append(contentsOf: ["--exclusive-fullscreen-height", "\(Int(UIScreen.main.bounds.height))"])
|
||||||
// We don't need this. Ryujinx should handle it fine :3
|
// We don't need this. Ryujinx should handle it fine :3
|
||||||
@ -213,6 +213,9 @@ private extension Ryujinx {
|
|||||||
if config.debuglogs {
|
if config.debuglogs {
|
||||||
args.append("--enable-debug-logs")
|
args.append("--enable-debug-logs")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
args.append("--disable-info-logs")
|
||||||
|
|
||||||
if config.tracelogs {
|
if config.tracelogs {
|
||||||
args.append("--enable-trace-logs")
|
args.append("--enable-trace-logs")
|
||||||
}
|
}
|
||||||
|
@ -82,7 +82,7 @@ struct GamesView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.animation(.easeInOut, value: searchQuery)
|
// .animation(.easeInOut, value: searchQuery)
|
||||||
.navigationTitle("Games")
|
.navigationTitle("Games")
|
||||||
.navigationBarTitleDisplayMode(.large)
|
.navigationBarTitleDisplayMode(.large)
|
||||||
.searchable(text: $searchQuery)
|
.searchable(text: $searchQuery)
|
||||||
|
@ -22,7 +22,7 @@ public struct melonxRootView : View {
|
|||||||
logger.info("Welcome to Skip on \(androidSDK != nil ? "Android" : "Darwin")!")
|
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")
|
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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -171,7 +171,7 @@ namespace Ryujinx.Headless.SDL2
|
|||||||
public bool LoggingDisableWarning { get; set; }
|
public bool LoggingDisableWarning { get; set; }
|
||||||
|
|
||||||
[Option("disable-error-logs", Required = false, HelpText = "Disables printing error log messages.")]
|
[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.")]
|
[Option("enable-trace-logs", Required = false, Default = false, HelpText = "Enables printing trace log messages.")]
|
||||||
public bool LoggingEnableTrace { get; set; }
|
public bool LoggingEnableTrace { get; set; }
|
||||||
|
@ -123,17 +123,14 @@ namespace Ryujinx.Headless.SDL2
|
|||||||
{
|
{
|
||||||
string[] args = new string[argCount];
|
string[] args = new string[argCount];
|
||||||
|
|
||||||
Logger.Info?.Print(LogClass.Application, $"Start Emu Test 1");
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Logger.Info?.Print(LogClass.Application, $"Start Emu Test 2");
|
|
||||||
for (int i = 0; i < argCount; i++)
|
for (int i = 0; i < argCount; i++)
|
||||||
{
|
{
|
||||||
args[i] = Marshal.PtrToStringAnsi(pArgs[i]);
|
args[i] = Marshal.PtrToStringAnsi(pArgs[i]);
|
||||||
|
|
||||||
Logger.Info?.Print(LogClass.Application, args[i]);
|
Logger.Info?.Print(LogClass.Application, args[i]);
|
||||||
}
|
}
|
||||||
Logger.Info?.Print(LogClass.Application, $"Start Emu Test 3");
|
|
||||||
|
|
||||||
Main(args);
|
Main(args);
|
||||||
}
|
}
|
||||||
@ -1274,23 +1271,14 @@ namespace Ryujinx.Headless.SDL2
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Setup logging level
|
// Setup logging level
|
||||||
// Logger.SetEnable(LogLevel.Debug, option.LoggingEnableDebug);
|
Logger.SetEnable(LogLevel.Debug, option.LoggingEnableDebug);
|
||||||
// Logger.SetEnable(LogLevel.Stub, !option.LoggingDisableStub);
|
Logger.SetEnable(LogLevel.Stub, !option.LoggingDisableStub);
|
||||||
// Logger.SetEnable(LogLevel.Info, !option.LoggingDisableInfo);
|
Logger.SetEnable(LogLevel.Info, !option.LoggingDisableInfo);
|
||||||
// Logger.SetEnable(LogLevel.Warning, !option.LoggingDisableWarning);
|
Logger.SetEnable(LogLevel.Warning, !option.LoggingDisableWarning);
|
||||||
// Logger.SetEnable(LogLevel.Error, option.LoggingEnableError);
|
Logger.SetEnable(LogLevel.Error, !option.LoggingDisableError);
|
||||||
// Logger.SetEnable(LogLevel.Trace, option.LoggingEnableTrace);
|
Logger.SetEnable(LogLevel.Trace, option.LoggingEnableTrace);
|
||||||
// Logger.SetEnable(LogLevel.Guest, !option.LoggingDisableGuest);
|
Logger.SetEnable(LogLevel.Guest, !option.LoggingDisableGuest);
|
||||||
// Logger.SetEnable(LogLevel.AccessLog, option.LoggingEnableFsAccessLog);
|
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);
|
|
||||||
|
|
||||||
if (!option.DisableFileLog)
|
if (!option.DisableFileLog)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user