From 48de55f98760ef4c157cfd6c85c955a82d6fddf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= Date: Thu, 16 Sep 2021 18:13:10 +0200 Subject: [PATCH] Updated imgui --- .../src/EditWindows/EntityHierarchyWindow.bf | 2 +- GlitchyEngine/src/ImGui/ImGuiLayer.bf | 11 +++++------ GlitchyEngine/vendor/imgui-beef | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/GlitchyEditor/src/EditWindows/EntityHierarchyWindow.bf b/GlitchyEditor/src/EditWindows/EntityHierarchyWindow.bf index dc25580..81cb29d 100644 --- a/GlitchyEditor/src/EditWindows/EntityHierarchyWindow.bf +++ b/GlitchyEditor/src/EditWindows/EntityHierarchyWindow.bf @@ -160,7 +160,7 @@ namespace GlitchyEditor.EditWindows if(ImGui.BeginDragDropTarget()) { - ImGui.Payload* payload = &ImGui.AcceptDragDropPayload("DND_Entity"); + ImGui.Payload* payload = ImGui.AcceptDragDropPayload("DND_Entity"); if(payload != null) { diff --git a/GlitchyEngine/src/ImGui/ImGuiLayer.bf b/GlitchyEngine/src/ImGui/ImGuiLayer.bf index 70032ac..d2352e9 100644 --- a/GlitchyEngine/src/ImGui/ImGuiLayer.bf +++ b/GlitchyEngine/src/ImGui/ImGuiLayer.bf @@ -17,7 +17,7 @@ namespace GlitchyEngine.ImGui ImGui.CreateContext(); ImGui.StyleColorsDark(); - ref ImGui.IO io = ref ImGui.GetIO(); + ImGui.IO* io = ImGui.GetIO(); io.ConfigFlags |= .NavEnableKeyboard; io.ConfigFlags |= .DockingEnable; io.ConfigFlags |= .ViewportsEnable; @@ -27,7 +27,7 @@ namespace GlitchyEngine.ImGui //io.ConfigFlags |= .DpiEnableScaleViewports; // When viewports are enabled we tweak WindowRounding/WindowBg so platform windows can look identical to regular ones. - ref ImGui.Style style = ref ImGui.GetStyle(); + ImGui.Style* style = ImGui.GetStyle(); if(io.ConfigFlags.HasFlag(.ViewportsEnable)) { style.WindowRounding = 0.0f; @@ -36,13 +36,12 @@ namespace GlitchyEngine.ImGui #if GE_WINDOWS // Todo: temporary, needs to be platform independent - ImGuiImplWin32.Init((Windows.HWnd)(int)Application.Get().Window.NativeWindow); + ImGuiImplWin32.Init((void*)(uint)(Windows.HWnd)(int)Application.Get().Window.NativeWindow); var context = Application.Get().Window.Context; ImGuiImplDX11.Init(context.[Friend]nativeDevice, context.[Friend]nativeContext); #endif - } public override void OnDetach() @@ -200,13 +199,13 @@ namespace GlitchyEngine.ImGui public void End() { - ref ImGui.IO io = ref ImGui.GetIO(); + ImGui.IO* io = ImGui.GetIO(); let window = Application.Get().Window; io.DisplaySize = .(window.Width, window.Height); ImGui.Render(); - ImGuiImplDX11.RenderDrawData(ref ImGui.GetDrawData()); + ImGuiImplDX11.RenderDrawData(ImGui.GetDrawData()); if(io.ConfigFlags.HasFlag(.ViewportsEnable)) { diff --git a/GlitchyEngine/vendor/imgui-beef b/GlitchyEngine/vendor/imgui-beef index 5d3d175..38808d5 160000 --- a/GlitchyEngine/vendor/imgui-beef +++ b/GlitchyEngine/vendor/imgui-beef @@ -1 +1 @@ -Subproject commit 5d3d175be90f659a5ef6e97c7dbe487c172aa54e +Subproject commit 38808d5aab47f1ea4d7fee27a16067c3ec79fd15