Skip to content

Commit 2d1fc76

Browse files
TillAlexTillAlex
committed
Using cimgui from docking_inter branch again
1 parent 7ab250f commit 2d1fc76

17 files changed

+5271
-1966
lines changed

‎src/CodeGenerator/definitions/cimgui/definitions.json‎

Lines changed: 3554 additions & 1627 deletions
Large diffs are not rendered by default.

‎src/CodeGenerator/definitions/cimgui/structs_and_enums.json‎

Lines changed: 1278 additions & 252 deletions
Large diffs are not rendered by default.

‎src/ImGui.NET/Generated/ImDrawData.gen.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public unsafe partial struct ImDrawData
1515
public Vector2 DisplayPos;
1616
public Vector2 DisplaySize;
1717
public Vector2 FramebufferScale;
18+
public ImGuiViewport* OwnerViewport;
1819
}
1920
public unsafe partial struct ImDrawDataPtr
2021
{
@@ -32,6 +33,7 @@ public unsafe partial struct ImDrawDataPtr
3233
public ref Vector2 DisplayPos => ref Unsafe.AsRef<Vector2>(&NativePtr->DisplayPos);
3334
public ref Vector2 DisplaySize => ref Unsafe.AsRef<Vector2>(&NativePtr->DisplaySize);
3435
public ref Vector2 FramebufferScale => ref Unsafe.AsRef<Vector2>(&NativePtr->FramebufferScale);
36+
public ImGuiViewportPtr OwnerViewport => new ImGuiViewportPtr(NativePtr->OwnerViewport);
3537
public void Clear()
3638
{
3739
ImGuiNative.ImDrawData_Clear((ImDrawData*)(NativePtr));

‎src/ImGui.NET/Generated/ImGui.gen.cs‎

Lines changed: 145 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,6 +2258,63 @@ public static void DestroyContext(IntPtr ctx)
22582258
{
22592259
ImGuiNative.igDestroyContext(ctx);
22602260
}
2261+
public static void DestroyPlatformWindows()
2262+
{
2263+
ImGuiNative.igDestroyPlatformWindows();
2264+
}
2265+
public static void DockSpace(uint id)
2266+
{
2267+
Vector2 size = new Vector2();
2268+
ImGuiDockNodeFlags flags = (ImGuiDockNodeFlags)0;
2269+
ImGuiWindowClass* window_class = null;
2270+
ImGuiNative.igDockSpace(id, size, flags, window_class);
2271+
}
2272+
public static void DockSpace(uint id, Vector2 size)
2273+
{
2274+
ImGuiDockNodeFlags flags = (ImGuiDockNodeFlags)0;
2275+
ImGuiWindowClass* window_class = null;
2276+
ImGuiNative.igDockSpace(id, size, flags, window_class);
2277+
}
2278+
public static void DockSpace(uint id, Vector2 size, ImGuiDockNodeFlags flags)
2279+
{
2280+
ImGuiWindowClass* window_class = null;
2281+
ImGuiNative.igDockSpace(id, size, flags, window_class);
2282+
}
2283+
public static void DockSpace(uint id, Vector2 size, ImGuiDockNodeFlags flags, ImGuiWindowClassPtr window_class)
2284+
{
2285+
ImGuiWindowClass* native_window_class = window_class.NativePtr;
2286+
ImGuiNative.igDockSpace(id, size, flags, native_window_class);
2287+
}
2288+
public static uint DockSpaceOverViewport()
2289+
{
2290+
ImGuiViewport* viewport = null;
2291+
ImGuiDockNodeFlags flags = (ImGuiDockNodeFlags)0;
2292+
ImGuiWindowClass* window_class = null;
2293+
uint ret = ImGuiNative.igDockSpaceOverViewport(viewport, flags, window_class);
2294+
return ret;
2295+
}
2296+
public static uint DockSpaceOverViewport(ImGuiViewportPtr viewport)
2297+
{
2298+
ImGuiViewport* native_viewport = viewport.NativePtr;
2299+
ImGuiDockNodeFlags flags = (ImGuiDockNodeFlags)0;
2300+
ImGuiWindowClass* window_class = null;
2301+
uint ret = ImGuiNative.igDockSpaceOverViewport(native_viewport, flags, window_class);
2302+
return ret;
2303+
}
2304+
public static uint DockSpaceOverViewport(ImGuiViewportPtr viewport, ImGuiDockNodeFlags flags)
2305+
{
2306+
ImGuiViewport* native_viewport = viewport.NativePtr;
2307+
ImGuiWindowClass* window_class = null;
2308+
uint ret = ImGuiNative.igDockSpaceOverViewport(native_viewport, flags, window_class);
2309+
return ret;
2310+
}
2311+
public static uint DockSpaceOverViewport(ImGuiViewportPtr viewport, ImGuiDockNodeFlags flags, ImGuiWindowClassPtr window_class)
2312+
{
2313+
ImGuiViewport* native_viewport = viewport.NativePtr;
2314+
ImGuiWindowClass* native_window_class = window_class.NativePtr;
2315+
uint ret = ImGuiNative.igDockSpaceOverViewport(native_viewport, flags, native_window_class);
2316+
return ret;
2317+
}
22612318
public static bool DragFloat(string label, ref float v)
22622319
{
22632320
byte* native_label;
@@ -5574,39 +5631,6 @@ public static bool DragIntRange2(string label, ref int v_current_min, ref int v_
55745631
}
55755632
}
55765633
}
5577-
public static bool DragScalar(string label, ImGuiDataType data_type, IntPtr p_data)
5578-
{
5579-
byte* native_label;
5580-
int label_byteCount = 0;
5581-
if (label != null)
5582-
{
5583-
label_byteCount = Encoding.UTF8.GetByteCount(label);
5584-
if (label_byteCount > Util.StackAllocationSizeLimit)
5585-
{
5586-
native_label = Util.Allocate(label_byteCount + 1);
5587-
}
5588-
else
5589-
{
5590-
byte* native_label_stackBytes = stackalloc byte[label_byteCount + 1];
5591-
native_label = native_label_stackBytes;
5592-
}
5593-
int native_label_offset = Util.GetUtf8(label, native_label, label_byteCount);
5594-
native_label[native_label_offset] = 0;
5595-
}
5596-
else { native_label = null; }
5597-
void* native_p_data = (void*)p_data.ToPointer();
5598-
float v_speed = 1.0f;
5599-
void* p_min = null;
5600-
void* p_max = null;
5601-
byte* native_format = null;
5602-
ImGuiSliderFlags flags = (ImGuiSliderFlags)0;
5603-
byte ret = ImGuiNative.igDragScalar(native_label, data_type, native_p_data, v_speed, p_min, p_max, native_format, flags);
5604-
if (label_byteCount > Util.StackAllocationSizeLimit)
5605-
{
5606-
Util.Free(native_label);
5607-
}
5608-
return ret != 0;
5609-
}
56105634
public static bool DragScalar(string label, ImGuiDataType data_type, IntPtr p_data, float v_speed)
56115635
{
56125636
byte* native_label;
@@ -5808,39 +5832,6 @@ public static bool DragScalar(string label, ImGuiDataType data_type, IntPtr p_da
58085832
}
58095833
return ret != 0;
58105834
}
5811-
public static bool DragScalarN(string label, ImGuiDataType data_type, IntPtr p_data, int components)
5812-
{
5813-
byte* native_label;
5814-
int label_byteCount = 0;
5815-
if (label != null)
5816-
{
5817-
label_byteCount = Encoding.UTF8.GetByteCount(label);
5818-
if (label_byteCount > Util.StackAllocationSizeLimit)
5819-
{
5820-
native_label = Util.Allocate(label_byteCount + 1);
5821-
}
5822-
else
5823-
{
5824-
byte* native_label_stackBytes = stackalloc byte[label_byteCount + 1];
5825-
native_label = native_label_stackBytes;
5826-
}
5827-
int native_label_offset = Util.GetUtf8(label, native_label, label_byteCount);
5828-
native_label[native_label_offset] = 0;
5829-
}
5830-
else { native_label = null; }
5831-
void* native_p_data = (void*)p_data.ToPointer();
5832-
float v_speed = 1.0f;
5833-
void* p_min = null;
5834-
void* p_max = null;
5835-
byte* native_format = null;
5836-
ImGuiSliderFlags flags = (ImGuiSliderFlags)0;
5837-
byte ret = ImGuiNative.igDragScalarN(native_label, data_type, native_p_data, components, v_speed, p_min, p_max, native_format, flags);
5838-
if (label_byteCount > Util.StackAllocationSizeLimit)
5839-
{
5840-
Util.Free(native_label);
5841-
}
5842-
return ret != 0;
5843-
}
58445835
public static bool DragScalarN(string label, ImGuiDataType data_type, IntPtr p_data, int components, float v_speed)
58455836
{
58465837
byte* native_label;
@@ -6114,6 +6105,17 @@ public static void EndTooltip()
61146105
{
61156106
ImGuiNative.igEndTooltip();
61166107
}
6108+
public static ImGuiViewportPtr FindViewportByID(uint id)
6109+
{
6110+
ImGuiViewport* ret = ImGuiNative.igFindViewportByID(id);
6111+
return new ImGuiViewportPtr(ret);
6112+
}
6113+
public static ImGuiViewportPtr FindViewportByPlatformHandle(IntPtr platform_handle)
6114+
{
6115+
void* native_platform_handle = (void*)platform_handle.ToPointer();
6116+
ImGuiViewport* ret = ImGuiNative.igFindViewportByPlatformHandle(native_platform_handle);
6117+
return new ImGuiViewportPtr(ret);
6118+
}
61176119
public static void GetAllocatorFunctions(ref IntPtr p_alloc_func, ref IntPtr p_free_func, ref void* p_user_data)
61186120
{
61196121
fixed (IntPtr* native_p_alloc_func = &p_alloc_func)
@@ -6132,6 +6134,12 @@ public static ImDrawListPtr GetBackgroundDrawList()
61326134
ImDrawList* ret = ImGuiNative.igGetBackgroundDrawListNil();
61336135
return new ImDrawListPtr(ret);
61346136
}
6137+
public static ImDrawListPtr GetBackgroundDrawList(ImGuiViewportPtr viewport)
6138+
{
6139+
ImGuiViewport* native_viewport = viewport.NativePtr;
6140+
ImDrawList* ret = ImGuiNative.igGetBackgroundDrawListViewportPtr(native_viewport);
6141+
return new ImDrawListPtr(ret);
6142+
}
61356143
public static string GetClipboardText()
61366144
{
61376145
byte* ret = ImGuiNative.igGetClipboardText();
@@ -6271,6 +6279,12 @@ public static ImDrawListPtr GetForegroundDrawList()
62716279
ImDrawList* ret = ImGuiNative.igGetForegroundDrawListNil();
62726280
return new ImDrawListPtr(ret);
62736281
}
6282+
public static ImDrawListPtr GetForegroundDrawList(ImGuiViewportPtr viewport)
6283+
{
6284+
ImGuiViewport* native_viewport = viewport.NativePtr;
6285+
ImDrawList* ret = ImGuiNative.igGetForegroundDrawListViewportPtr(native_viewport);
6286+
return new ImDrawListPtr(ret);
6287+
}
62746288
public static int GetFrameCount()
62756289
{
62766290
int ret = ImGuiNative.igGetFrameCount();
@@ -6395,6 +6409,11 @@ public static Vector2 GetMousePosOnOpeningCurrentPopup()
63956409
ImGuiNative.igGetMousePosOnOpeningCurrentPopup(&__retval);
63966410
return __retval;
63976411
}
6412+
public static ImGuiPlatformIOPtr GetPlatformIO()
6413+
{
6414+
ImGuiPlatformIO* ret = ImGuiNative.igGetPlatformIO();
6415+
return new ImGuiPlatformIOPtr(ret);
6416+
}
63986417
public static float GetScrollMaxX()
63996418
{
64006419
float ret = ImGuiNative.igGetScrollMaxX();
@@ -6477,6 +6496,16 @@ public static float GetWindowContentRegionWidth()
64776496
float ret = ImGuiNative.igGetWindowContentRegionWidth();
64786497
return ret;
64796498
}
6499+
public static uint GetWindowDockID()
6500+
{
6501+
uint ret = ImGuiNative.igGetWindowDockID();
6502+
return ret;
6503+
}
6504+
public static float GetWindowDpiScale()
6505+
{
6506+
float ret = ImGuiNative.igGetWindowDpiScale();
6507+
return ret;
6508+
}
64806509
public static ImDrawListPtr GetWindowDrawList()
64816510
{
64826511
ImDrawList* ret = ImGuiNative.igGetWindowDrawList();
@@ -6499,6 +6528,11 @@ public static Vector2 GetWindowSize()
64996528
ImGuiNative.igGetWindowSize(&__retval);
65006529
return __retval;
65016530
}
6531+
public static ImGuiViewportPtr GetWindowViewport()
6532+
{
6533+
ImGuiViewport* ret = ImGuiNative.igGetWindowViewport();
6534+
return new ImGuiViewportPtr(ret);
6535+
}
65026536
public static float GetWindowWidth()
65036537
{
65046538
float ret = ImGuiNative.igGetWindowWidth();
@@ -8860,6 +8894,11 @@ public static bool IsWindowCollapsed()
88608894
byte ret = ImGuiNative.igIsWindowCollapsed();
88618895
return ret != 0;
88628896
}
8897+
public static bool IsWindowDocked()
8898+
{
8899+
byte ret = ImGuiNative.igIsWindowDocked();
8900+
return ret != 0;
8901+
}
88638902
public static bool IsWindowFocused()
88648903
{
88658904
ImGuiFocusedFlags flags = (ImGuiFocusedFlags)0;
@@ -10533,6 +10572,24 @@ public static void Render()
1053310572
{
1053410573
ImGuiNative.igRender();
1053510574
}
10575+
public static void RenderPlatformWindowsDefault()
10576+
{
10577+
void* platform_render_arg = null;
10578+
void* renderer_render_arg = null;
10579+
ImGuiNative.igRenderPlatformWindowsDefault(platform_render_arg, renderer_render_arg);
10580+
}
10581+
public static void RenderPlatformWindowsDefault(IntPtr platform_render_arg)
10582+
{
10583+
void* native_platform_render_arg = (void*)platform_render_arg.ToPointer();
10584+
void* renderer_render_arg = null;
10585+
ImGuiNative.igRenderPlatformWindowsDefault(native_platform_render_arg, renderer_render_arg);
10586+
}
10587+
public static void RenderPlatformWindowsDefault(IntPtr platform_render_arg, IntPtr renderer_render_arg)
10588+
{
10589+
void* native_platform_render_arg = (void*)platform_render_arg.ToPointer();
10590+
void* native_renderer_render_arg = (void*)renderer_render_arg.ToPointer();
10591+
ImGuiNative.igRenderPlatformWindowsDefault(native_platform_render_arg, native_renderer_render_arg);
10592+
}
1053610593
public static void ResetMouseDragDelta()
1053710594
{
1053810595
ImGuiMouseButton button = (ImGuiMouseButton)0;
@@ -10976,6 +11033,11 @@ public static void SetNextWindowBgAlpha(float alpha)
1097611033
{
1097711034
ImGuiNative.igSetNextWindowBgAlpha(alpha);
1097811035
}
11036+
public static void SetNextWindowClass(ImGuiWindowClassPtr window_class)
11037+
{
11038+
ImGuiWindowClass* native_window_class = window_class.NativePtr;
11039+
ImGuiNative.igSetNextWindowClass(native_window_class);
11040+
}
1097911041
public static void SetNextWindowCollapsed(bool collapsed)
1098011042
{
1098111043
byte native_collapsed = collapsed ? (byte)1 : (byte)0;
@@ -10991,6 +11053,15 @@ public static void SetNextWindowContentSize(Vector2 size)
1099111053
{
1099211054
ImGuiNative.igSetNextWindowContentSize(size);
1099311055
}
11056+
public static void SetNextWindowDockID(uint dock_id)
11057+
{
11058+
ImGuiCond cond = (ImGuiCond)0;
11059+
ImGuiNative.igSetNextWindowDockID(dock_id, cond);
11060+
}
11061+
public static void SetNextWindowDockID(uint dock_id, ImGuiCond cond)
11062+
{
11063+
ImGuiNative.igSetNextWindowDockID(dock_id, cond);
11064+
}
1099411065
public static void SetNextWindowFocus()
1099511066
{
1099611067
ImGuiNative.igSetNextWindowFocus();
@@ -11035,6 +11106,10 @@ public static void SetNextWindowSizeConstraints(Vector2 size_min, Vector2 size_m
1103511106
void* native_custom_callback_data = (void*)custom_callback_data.ToPointer();
1103611107
ImGuiNative.igSetNextWindowSizeConstraints(size_min, size_max, custom_callback, native_custom_callback_data);
1103711108
}
11109+
public static void SetNextWindowViewport(uint viewport_id)
11110+
{
11111+
ImGuiNative.igSetNextWindowViewport(viewport_id);
11112+
}
1103811113
public static void SetScrollFromPosX(float local_x)
1103911114
{
1104011115
float center_x_ratio = 0.5f;
@@ -13976,6 +14051,10 @@ public static void Unindent(float indent_w)
1397614051
{
1397714052
ImGuiNative.igUnindent(indent_w);
1397814053
}
14054+
public static void UpdatePlatformWindows()
14055+
{
14056+
ImGuiNative.igUpdatePlatformWindows();
14057+
}
1397914058
public static void Value(string prefix, bool b)
1398014059
{
1398114060
byte* native_prefix;

‎src/ImGui.NET/Generated/ImGuiBackendFlags.gen.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ public enum ImGuiBackendFlags
88
HasMouseCursors = 2,
99
HasSetMousePos = 4,
1010
RendererHasVtxOffset = 8,
11+
PlatformHasViewports = 1024,
12+
HasMouseHoveredViewport = 2048,
13+
RendererHasViewports = 4096,
1114
}
1215
}

‎src/ImGui.NET/Generated/ImGuiCol.gen.cs‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,23 @@ public enum ImGuiCol
4040
TabActive = 35,
4141
TabUnfocused = 36,
4242
TabUnfocusedActive = 37,
43-
PlotLines = 38,
44-
PlotLinesHovered = 39,
45-
PlotHistogram = 40,
46-
PlotHistogramHovered = 41,
47-
TableHeaderBg = 42,
48-
TableBorderStrong = 43,
49-
TableBorderLight = 44,
50-
TableRowBg = 45,
51-
TableRowBgAlt = 46,
52-
TextSelectedBg = 47,
53-
DragDropTarget = 48,
54-
NavHighlight = 49,
55-
NavWindowingHighlight = 50,
56-
NavWindowingDimBg = 51,
57-
ModalWindowDimBg = 52,
58-
COUNT = 53,
43+
DockingPreview = 38,
44+
DockingEmptyBg = 39,
45+
PlotLines = 40,
46+
PlotLinesHovered = 41,
47+
PlotHistogram = 42,
48+
PlotHistogramHovered = 43,
49+
TableHeaderBg = 44,
50+
TableBorderStrong = 45,
51+
TableBorderLight = 46,
52+
TableRowBg = 47,
53+
TableRowBgAlt = 48,
54+
TextSelectedBg = 49,
55+
DragDropTarget = 50,
56+
NavHighlight = 51,
57+
NavWindowingHighlight = 52,
58+
NavWindowingDimBg = 53,
59+
ModalWindowDimBg = 54,
60+
COUNT = 55,
5961
}
6062
}

‎src/ImGui.NET/Generated/ImGuiConfigFlags.gen.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ public enum ImGuiConfigFlags
1010
NavNoCaptureKeyboard = 8,
1111
NoMouse = 16,
1212
NoMouseCursorChange = 32,
13+
DockingEnable = 64,
14+
ViewportsEnable = 1024,
15+
DpiEnableScaleViewports = 16384,
16+
DpiEnableScaleFonts = 32768,
1317
IsSRGB = 1048576,
1418
IsTouchScreen = 2097152,
1519
}

0 commit comments

Comments
 (0)