Dear ImGui integration

Ported the example win32 & d3d11 backends from the main imgui repo. I didn't bother implementing gamepads or multi-viewport yet since Nanoforge doesn't use them yet. Multi viewports also looks like a pain to convert.

Author: Moneyl

.gitignore

@@ -285,3 +285,4 @@ recovery/
 build/
 
 BeefSpace_User.toml
+imgui.ini

Assets/fonts/NotoSans-SemiBold.ttf

@@ -3,5 +3,4 @@ Dependencies = {corlib = "*", ImGui = "*"}
 
 [Project]
 Name = "Nanoforge"
-TargetType = "BeefGUIApplication"
 StartupObject = "Nanoforge.Program"

Assets/fonts/NotoSansDisplay-Medium.ttf

@@ -1,11 +1,13 @@
 using System.Collections;
 using System.Diagnostics;
 using System.Reflection;
+using Nanoforge.Misc;
 using Nanoforge.Math;
 using System;
 
 namespace Nanoforge.App
 {
+    [ReflectAll]
     public enum AppState
     {
         None,

BeefProj.toml

@@ -16,7 +16,7 @@ namespace Nanoforge.Gui
         private static append List<u16> _iconRanges = .();
         public static bool EnableNonLatinGlyphs = false; //Currently disabled by default since I (only dev) only use english & enabling these increases boot time. Will enable when necessary
 
-		public static void RegisterFonts(BuildConfig buildConfig)
+		public static void LoadFonts(BuildConfig buildConfig)
 		{
             static bool firstRun = true;
             if (firstRun) //Build glyph list the first time this is called

Dependencies/imgui-beef

@@ -32,9 +32,9 @@ namespace Nanoforge.Gui
 		[SystemStage(.Update)]
 		void Update(App app)
 		{
-			/*for (var layer in Layers)
+			for (var layer in Layers)
 				if (layer.Enabled)
-					layer.Update(app);*/
+					layer.Update(app);
 		}
 
 		//Destroys all gui layers and their modules
@@ -94,7 +94,7 @@ namespace Nanoforge.Gui
 		}
 
 		//Helper functions & constants
-		public static Vec4<f32> SecondaryTextColor => .(0.2f, 0.7f, 1.0f, 1.00f) * 0.92f; //Light blue;
+		public static Vec4<f32> SecondaryTextColor => .(0.32f, 0.67f, 1.0f, 1.00f);//.(0.2f, 0.7f, 1.0f, 1.00f) * 0.92f; //Light blue;
 		public static Vec4<f32> TertiaryTextColor => .(0.64f, 0.67f, 0.69f, 1.00f); //Light grey;
 		public static Vec4<f32> Red => .(0.784f, 0.094f, 0.035f, 1.0f);
 

src/App/App.bf

@@ -60,12 +60,10 @@ namespace Nanoforge.Gui.Panels
 		private void DrawDockspace(App app)
 		{
 			//Dockspace flags
-			dockspaceFlags = ImGui.DockNodeFlags.None | ImGui.DockNodeFlags.PassthruCentralNode;
+			dockspaceFlags = ImGui.DockNodeFlags.None;
 
 			//Parent window flags
-			ImGui.WindowFlags windowFlags = ImGui.WindowFlags.NoDocking | ImGui.WindowFlags.NoTitleBar | ImGui.WindowFlags.NoCollapse
-			    | ImGui.WindowFlags.NoResize | ImGui.WindowFlags.NoMove
-			    | ImGui.WindowFlags.NoBringToFrontOnFocus | ImGui.WindowFlags.NoNavFocus | ImGui.WindowFlags.NoBackground;
+			ImGui.WindowFlags windowFlags = .NoDocking | .NoTitleBar | .NoCollapse | .NoResize | .NoMove | .NoBringToFrontOnFocus | .NoNavFocus | .NoBackground;
 
 			//Set dockspace size and params
 			var viewport = ImGui.GetMainViewport();

src/Gui/FontManager.bf

@@ -24,9 +24,9 @@ namespace System
             return str;
         }
 
-        public static String ValueToString<T>(String str, T value)
+        public static String ValueToString<T>(String str, T value) where T : operator explicit int, enum
         {
-            T val = value;
+            int val = (int)value;
             Type type = typeof(T);
             Runtime.Assert(type.IsEnum);
             for (var enumField in type.GetFields())

src/Gui/Gui.bf

@@ -158,7 +158,6 @@ namespace Nanoforge.Misc
         //X2MouseButton = 6,
         Backspace = 8,
         Tab = 9,
-        Clear = 0x10,
         Enter = 0xD,
         Shift = 0x10,
         Control = 0x11,
@@ -219,7 +218,7 @@ namespace Nanoforge.Misc
         Y = 0x59,
         Z = 0x5A,
         WindowsLeft = 0x5B,
-        WindowRight = 0x5C,
+        WindowsRight = 0x5C,
         Applications = 0x5D,
         Sleep = 0x5F,
         Numpad0 = 0x60,
@@ -232,12 +231,12 @@ namespace Nanoforge.Misc
         Numpad7 = 0x67,
         Numpad8 = 0x68,
         Numpad9 = 0x69,
-        Multiply = 0x6A,
-        Add = 0x6B,
+        NumpadMultiply = 0x6A,
+        NumpadAdd = 0x6B,
         Separator = 0x6C,
-        Subtract = 0x6D,
-        Decimal = 0x6E,
-        Divide = 0x6F,
+        NumpadSubtract = 0x6D,
+        NumpadDecimal = 0x6E,
+        NumpadDivide = 0x6F,
         F1 = 0x70,
         F2 = 0x71,
         F3 = 0x72,
@@ -262,6 +261,8 @@ namespace Nanoforge.Misc
         F22 = 0x85,
         F23 = 0x86,
         F24 = 0x87,
+        NumLock = 0x90,
+        ScrollLock = 0x91,
         LeftShift = 0xA0,
         RightShift = 0xA1,
         LeftControl = 0xA2,
@@ -275,6 +276,17 @@ namespace Nanoforge.Misc
         MediaPreviousTrack = 0xB1,
         MediaStop = 0xB2,
         MediaPlayPause = 0xB3,
+        Comma = 0xBC,
+        Minus = 0xBD,
+        Period = 0xBE,
+        Slash = 0xBF,
+        Semicolon = 0xBA,
+        AccentGrave = 0xC0,
+        LeftBracket = 0xDB,
+        BackSlash = 0xDC,
+        RightBracket = 0xDD,
+        Apostrophe = 0xDE,
+        Equal = 0xBB,
         Play = 0xFA,
         Zoom = 0xFB
     }

src/Gui/Panels/MainMenuBar.bf

@@ -3,7 +3,7 @@ using System;
 
 namespace Nanoforge.Misc
 {
-    [AttributeUsage(.Class | .Interface, .AlwaysIncludeTarget | .ReflectAttribute, ReflectUser = .All, AlwaysIncludeUser = .IncludeAllMethods | .AssumeInstantiated)]
+    [AttributeUsage(.Class | .Interface | .Enum, .AlwaysIncludeTarget | .ReflectAttribute, ReflectUser = .All, AlwaysIncludeUser = .IncludeAllMethods | .AssumeInstantiated)]
     public struct ReflectAllAttribute : Attribute
     {
 

src/Misc/Extensions.bf

@@ -18,6 +18,8 @@ namespace Nanoforge.Misc
         public HWND Handle { get; private set; } = 0;
         public bool Focused { get; private set; } = true;
         public bool ShouldClose { get; private set; } = false;
+        //Use to add other functions to pass window messages to
+        public Event<delegate LRESULT(HWND hwnd, uint32 msg, WPARAM wParam, LPARAM lParam)> WndProcExtensions ~ _.Dispose();
         private Input _input = null;
 
         ///The actual WndProc logic is in a member function called by this delegate. That way it has access to the window fields
@@ -43,13 +45,13 @@ namespace Nanoforge.Misc
             //Define window class
             WNDCLASSEXW wc = .();
             wc.cbSize = sizeof(WNDCLASSEXW);
-            wc.style = .HREDRAW | .VREDRAW | .DROPSHADOW;
+            wc.style = .HREDRAW | .VREDRAW;
             wc.lpfnWndProc = => WNDPROC;
             wc.cbClsExtra = 0;
             wc.cbWndExtra = 0;
             wc.hInstance = hInstance;
             wc.hIcon = Win32.LoadIconW(0, Win32.IDI_WINLOGO);
-            wc.hCursor = Win32.LoadCursorW(0, Win32.IDC_ARROW);
+            wc.hCursor = Win32.LoadCursorW(0, Win32.IDC_SIZEWE);
             wc.hbrBackground = (int)SYS_COLOR_INDEX.COLOR_MENUTEXT;
             wc.lpszMenuName = null;
             wc.lpszClassName = &windowClassName;
@@ -62,8 +64,8 @@ namespace Nanoforge.Misc
             if (Handle == 0)
                 Win32.FatalError!("CreateWindowExW() failed while creating window");
 
-            //Maximize window
-            Win32.ShowWindow(Handle, .MAXIMIZE);
+            //Show window
+            Win32.ShowWindow(Handle, .SHOW);
         }
 
         //Process window events
@@ -87,9 +89,13 @@ namespace Nanoforge.Misc
 
         LRESULT InstanceWNDPROC(HWND hwnd, uint32 msg, WPARAM wParam, LPARAM lParam)
         {
+            for (var dlg in WndProcExtensions)
+                if (dlg(hwnd, msg, wParam, lParam) != 0)
+                    return 1;
+
             switch (msg)
             {
-                case Win32.WM_CLOSE,Win32.WM_QUIT,Win32.WM_DESTROY:
+                case Win32.WM_CLOSE, Win32.WM_QUIT, Win32.WM_DESTROY:
                     ShouldClose = true;
                     return 0;
                 case Win32.WM_SIZE:
@@ -125,6 +131,11 @@ namespace Nanoforge.Misc
         {
             return WndProcDelegate(hwnd, msg, wParam, lParam);
         }
+
+        public void Maximize()
+        {
+            Win32.ShowWindow(Handle, .MAXIMIZE);
+        }    
     }
 
     //Matches wParam of WndProc WM_SIZE message: https://docs.microsoft.com/en-us/windows/win32/winmsg/wm-size

src/Misc/Generators/MirrorClassGenerator.bf renamed to src/Misc/Generators/NanoforgeClassGenerator.bf

@@ -1,3 +1,4 @@
+using Nanoforge.Systems;
 using Nanoforge.Render;
 using Nanoforge.Misc;
 using Nanoforge.App;
@@ -25,6 +26,7 @@ namespace Nanoforge
                 ..AddSystem<Input>(isResource: true)
                 ..AddSystem<Renderer>()
                 ..AddSystem<Gui>(isResource: true)
+                ..AddSystem<AppLogic>()
 				.Run();
 		}
 	}