Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 13:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated imgui

Browse Source
This commit is contained in:
Simon Lübeß
2021-09-16 18:13:10 +02:00
parent 0079b80b1c
commit 48de55f987
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEditor/src/EditWindows/EntityHierarchyWindow.bf
+1 -1
View File
@@ -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)
{
GlitchyEngine/src/ImGui/ImGuiLayer.bf
+5 -6
View File
@@ -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))
{
GlitchyEngine/vendor/imgui-beef
Vendored
+1 -1
Submodule GlitchyEngine/vendor/imgui-beef updated: 5d3d175be9...38808d5aab