chore - Add command line arguments for overriding certain configurations (#886)

Author: DragonRatTiger

FDK/src/01.Framework/Core/Game.cs

@@ -40,12 +40,20 @@ namespace FDK;
 public abstract class Game : IDisposable {
 	public static GL Gl { get; private set; }
 	public static Silk.NET.Core.Contexts.IGLContext Context { get; private set; }
+	
+	private static string[] parameters;
+	private static string GetParameterValue(string parameter = "", string parameter_full = "") {
+		if (parameters.Length == 0) return "";
+		int index = parameters.Contains(parameter) || parameters.Contains(parameter_full)
+		? Array.FindIndex(parameters, x => x.Equals(parameter) || x.Equals(parameter_full))
+		: -1;
+		return index > -1 && parameters.Length > index ? parameters[index + 1] : "";
+	}
 
 	public static ImGuiController ImGuiController { get; private set; }
 	public static ImGuiIOPtr ImGuiIO { get; private set; }
 	private static CTexture ImGuiFontAtlas;
 
-	static string _test = "";
 	public static void InitImGuiController(IView window, IInputContext context) {
 		if (ImGuiController != null) return;
 
@@ -265,8 +273,9 @@ private RawImage GetIconData(string fileName) {
 	/// <summary>
 	/// Initializes a new instance of the <see cref="Game"/> class.
 	/// </summary>
-	protected Game(string iconFileName) {
+	protected Game(string iconFileName, params string[] args) {
 		strIconFileName = iconFileName;
+		parameters = args;
 
 		MainThreadID = Thread.CurrentThread.ManagedThreadId;
 		Configuration();
@@ -287,15 +296,27 @@ protected Game(string iconFileName) {
 		options.WindowBorder = WindowBorder.Resizable;
 		options.Title = Text;
 
+		#region Override Windowing
+		string windowing_override = GetParameterValue("-w", "--windowing");
+		#endregion
 
 		// Use SDL on Linux with Wayland, otherwise use GLFW for everything else
-		if (OperatingSystem.IsLinux() && Environment.GetEnvironmentVariable("XDG_SESSION_TYPE") == "wayland") {
-		    Silk.NET.Windowing.Sdl.SdlWindowing.Use();
+		if ((OperatingSystem.IsLinux() && Environment.GetEnvironmentVariable("XDG_SESSION_TYPE") == "wayland" && windowing_override != "glfw")
+		|| windowing_override == "sdl") {
+			Silk.NET.Windowing.Sdl.SdlWindowing.Use();
+			Console.WriteLine("SDL selected for Windowing");
 		} else {
-		    Silk.NET.Windowing.Glfw.GlfwWindowing.Use();
+			Silk.NET.Windowing.Glfw.GlfwWindowing.Use();
+			Console.WriteLine("GLFW selected for Windowing");
 		}
 
-		Window_ = Window.Create(options);
+		try {
+			Window_ = Window.Create(options);
+		}
+		catch {
+			Console.WriteLine("The window failed to be created.\nYou can attempt to fix this by overriding the default windowing.\nTry launching OpenTaiko with args, using '-w glfw' to force GLFW or '-w sdl' to force SDL.");
+			throw;
+        }
 
 		ViewPortSize.X = Window_.Size.X;
 		ViewPortSize.Y = Window_.Size.Y;
@@ -416,7 +437,20 @@ public void Window_Load() {
 
 			Context = Window_.GLContext;
 		} else {
-			Context = new AngleContext(GraphicsDeviceType_, Window_);
+			#region Override Platform
+			GraphicsDeviceType_ = GetParameterValue("-p", "--platform") switch {
+				"opengl" => AnglePlatformType.OpenGL,
+				"opengles" => AnglePlatformType.OpenGLES,
+				"d3d9" => AnglePlatformType.D3D9,
+				"d3d11" => AnglePlatformType.D3D11,
+				"vulkan" => AnglePlatformType.Vulkan,
+				"metal" => AnglePlatformType.Metal,
+				_ => GraphicsDeviceType_
+			};
+			Console.WriteLine("Platform set to " + GraphicsDeviceType_);
+			#endregion
+
+			Context = new AngleContext(GraphicsDeviceType_, Window_, GetParameterValue("-f", "--flag"));
 
 			Context.MakeCurrent();
 		}

FDK/src/01.Framework/Rendering/Angle/AngleContext.cs

@@ -11,35 +11,41 @@ public class AngleContext : IGLContext {
 	private nint Context;
 	private nint Surface;
 
-	public AngleContext(AnglePlatformType anglePlatformType, IWindow window) {
+	public AngleContext(AnglePlatformType anglePlatformType, IWindow window, string flag_override = "") {
 		nint windowHandle;
 		nint display;
 		NativeWindowFlags selectedflag; // For logging
 
-		if (window.Native.Kind.HasFlag(NativeWindowFlags.Win32)) {
+		bool flag_has_override = !string.IsNullOrWhiteSpace(flag_override);
+		if ((window.Native.Kind.HasFlag(NativeWindowFlags.Win32) && !flag_has_override) || flag_override == "win32") {
 			selectedflag = NativeWindowFlags.Win32;
 			windowHandle = window.Native.Win32.Value.Hwnd;
 			display = window.Native.Win32.Value.HDC;
-		} else if (window.Native.Kind.HasFlag(NativeWindowFlags.X11)) {
+			Console.WriteLine("Handle set to Win32");
+		} else if ((window.Native.Kind.HasFlag(NativeWindowFlags.X11) && !flag_has_override) || flag_override == "x11") {
 			selectedflag = NativeWindowFlags.X11;
 			windowHandle = (nint)window.Native.X11.Value.Window;
 			// Temporary fix for the segfaults
 			// Note than X11 Display number is NOT always 0, it can be 1, 2 and so on for example in cases of user switching
 			display = 0;// Egl.GetDisplay(window.Native.X11.Value.Display);
-		} else if (window.Native.Kind.HasFlag(NativeWindowFlags.Cocoa)) {
+			Console.WriteLine("Handle set to X11");
+		} else if ((window.Native.Kind.HasFlag(NativeWindowFlags.Cocoa) && !flag_has_override) || flag_override == "cocoa") {
 			selectedflag = NativeWindowFlags.Cocoa;
 			windowHandle = window.Native.Cocoa.Value;
 			display = 0;
-		} else if (window.Native.Kind.HasFlag(NativeWindowFlags.Wayland)) {
+			Console.WriteLine("Handle set to Cocoa");
+		} else if ((window.Native.Kind.HasFlag(NativeWindowFlags.Wayland) && !flag_has_override) || flag_override == "wayland") {
 			selectedflag = NativeWindowFlags.Wayland;
 			windowHandle = window.Native.Wayland.Value.Surface;
 			display = window.Native.Wayland.Value.Display;
+			Console.WriteLine("Handle set to Wayland");
 		} else {
+			if (flag_has_override) throw new Exception("Override flag provided is invalid, please check for spelling errors or remove your argument.");
 			throw new Exception("Window not found");
 		}
 
 		Source = window;
-
+		
 		int platform = 0;
 		switch (anglePlatformType) {
 			case AnglePlatformType.OpenGL: