Skip to content

Commit e20751b

Browse files
authored
Upgrade imgui to 1.90.1 (#456)
* Upgrade imgui to 1.90.1 * upgrade imgui.net version
1 parent f04c11e commit e20751b

File tree

12 files changed

+1474
-1261
lines changed

12 files changed

+1474
-1261
lines changed

deps/cimgui/linux-x64/cimgui.so

8.69 KB
Binary file not shown.

deps/cimgui/osx/cimgui.dylib

512 Bytes
Binary file not shown.

deps/cimgui/win-arm64/cimgui.dll

4 KB
Binary file not shown.

deps/cimgui/win-x64/cimgui.dll

4.5 KB
Binary file not shown.

deps/cimgui/win-x86/cimgui.dll

3.5 KB
Binary file not shown.

src/CodeGenerator/definitions/cimgui/definitions.json

Lines changed: 1160 additions & 1065 deletions
Large diffs are not rendered by default.

src/CodeGenerator/definitions/cimgui/structs_and_enums.json

Lines changed: 293 additions & 184 deletions
Large diffs are not rendered by default.

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4513,6 +4513,10 @@ public static bool DebugCheckVersionAndDataLayout(string version_str, uint sz_io
45134513
}
45144514
return ret != 0;
45154515
}
4516+
public static void DebugFlashStyleColor(ImGuiCol idx)
4517+
{
4518+
ImGuiNative.igDebugFlashStyleColor(idx);
4519+
}
45164520
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
45174521
public static void DebugTextEncoding(ReadOnlySpan<char> text)
45184522
{
@@ -12897,35 +12901,35 @@ public static float GetWindowWidth()
1289712901
float ret = ImGuiNative.igGetWindowWidth();
1289812902
return ret;
1289912903
}
12900-
public static void Image(IntPtr user_texture_id, Vector2 size)
12904+
public static void Image(IntPtr user_texture_id, Vector2 image_size)
1290112905
{
1290212906
Vector2 uv0 = new Vector2();
1290312907
Vector2 uv1 = new Vector2(1, 1);
1290412908
Vector4 tint_col = new Vector4(1, 1, 1, 1);
1290512909
Vector4 border_col = new Vector4();
12906-
ImGuiNative.igImage(user_texture_id, size, uv0, uv1, tint_col, border_col);
12910+
ImGuiNative.igImage(user_texture_id, image_size, uv0, uv1, tint_col, border_col);
1290712911
}
12908-
public static void Image(IntPtr user_texture_id, Vector2 size, Vector2 uv0)
12912+
public static void Image(IntPtr user_texture_id, Vector2 image_size, Vector2 uv0)
1290912913
{
1291012914
Vector2 uv1 = new Vector2(1, 1);
1291112915
Vector4 tint_col = new Vector4(1, 1, 1, 1);
1291212916
Vector4 border_col = new Vector4();
12913-
ImGuiNative.igImage(user_texture_id, size, uv0, uv1, tint_col, border_col);
12917+
ImGuiNative.igImage(user_texture_id, image_size, uv0, uv1, tint_col, border_col);
1291412918
}
12915-
public static void Image(IntPtr user_texture_id, Vector2 size, Vector2 uv0, Vector2 uv1)
12919+
public static void Image(IntPtr user_texture_id, Vector2 image_size, Vector2 uv0, Vector2 uv1)
1291612920
{
1291712921
Vector4 tint_col = new Vector4(1, 1, 1, 1);
1291812922
Vector4 border_col = new Vector4();
12919-
ImGuiNative.igImage(user_texture_id, size, uv0, uv1, tint_col, border_col);
12923+
ImGuiNative.igImage(user_texture_id, image_size, uv0, uv1, tint_col, border_col);
1292012924
}
12921-
public static void Image(IntPtr user_texture_id, Vector2 size, Vector2 uv0, Vector2 uv1, Vector4 tint_col)
12925+
public static void Image(IntPtr user_texture_id, Vector2 image_size, Vector2 uv0, Vector2 uv1, Vector4 tint_col)
1292212926
{
1292312927
Vector4 border_col = new Vector4();
12924-
ImGuiNative.igImage(user_texture_id, size, uv0, uv1, tint_col, border_col);
12928+
ImGuiNative.igImage(user_texture_id, image_size, uv0, uv1, tint_col, border_col);
1292512929
}
12926-
public static void Image(IntPtr user_texture_id, Vector2 size, Vector2 uv0, Vector2 uv1, Vector4 tint_col, Vector4 border_col)
12930+
public static void Image(IntPtr user_texture_id, Vector2 image_size, Vector2 uv0, Vector2 uv1, Vector4 tint_col, Vector4 border_col)
1292712931
{
12928-
ImGuiNative.igImage(user_texture_id, size, uv0, uv1, tint_col, border_col);
12932+
ImGuiNative.igImage(user_texture_id, image_size, uv0, uv1, tint_col, border_col);
1292912933
}
1293012934
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
1293112935
public static bool ImageButton(ReadOnlySpan<char> str_id, IntPtr user_texture_id, Vector2 image_size)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public unsafe partial struct ImGuiIO
4242
public float MouseDragThreshold;
4343
public float KeyRepeatDelay;
4444
public float KeyRepeatRate;
45+
public byte ConfigDebugIsDebuggerPresent;
4546
public byte ConfigDebugBeginReturnValueOnce;
4647
public byte ConfigDebugBeginReturnValueLoop;
4748
public byte ConfigDebugIgnoreFocusLoss;
@@ -311,6 +312,7 @@ public unsafe partial struct ImGuiIOPtr
311312
public ref float MouseDragThreshold => ref Unsafe.AsRef<float>(&NativePtr->MouseDragThreshold);
312313
public ref float KeyRepeatDelay => ref Unsafe.AsRef<float>(&NativePtr->KeyRepeatDelay);
313314
public ref float KeyRepeatRate => ref Unsafe.AsRef<float>(&NativePtr->KeyRepeatRate);
315+
public ref bool ConfigDebugIsDebuggerPresent => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugIsDebuggerPresent);
314316
public ref bool ConfigDebugBeginReturnValueOnce => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugBeginReturnValueOnce);
315317
public ref bool ConfigDebugBeginReturnValueLoop => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugBeginReturnValueLoop);
316318
public ref bool ConfigDebugIgnoreFocusLoss => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugIgnoreFocusLoss);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ public static unsafe partial class ImGuiNative
107107
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
108108
public static extern byte igDebugCheckVersionAndDataLayout(byte* version_str, uint sz_io, uint sz_style, uint sz_vec2, uint sz_vec4, uint sz_drawvert, uint sz_drawidx);
109109
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
110+
public static extern void igDebugFlashStyleColor(ImGuiCol idx);
111+
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
110112
public static extern void igDebugTextEncoding(byte* text);
111113
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
112114
public static extern void igDestroyContext(IntPtr ctx);
@@ -323,7 +325,7 @@ public static unsafe partial class ImGuiNative
323325
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
324326
public static extern float igGetWindowWidth();
325327
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
326-
public static extern void igImage(IntPtr user_texture_id, Vector2 size, Vector2 uv0, Vector2 uv1, Vector4 tint_col, Vector4 border_col);
328+
public static extern void igImage(IntPtr user_texture_id, Vector2 image_size, Vector2 uv0, Vector2 uv1, Vector4 tint_col, Vector4 border_col);
327329
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
328330
public static extern byte igImageButton(byte* str_id, IntPtr user_texture_id, Vector2 image_size, Vector2 uv0, Vector2 uv1, Vector4 bg_col, Vector4 tint_col);
329331
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ public enum ImGuiTabItemFlags
1212
NoReorder = 32,
1313
Leading = 64,
1414
Trailing = 128,
15+
NoAssumedClosure = 256,
1516
}
1617
}

src/ImGui.NET/ImGui.NET.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>A .NET wrapper for the Dear ImGui library.</Description>
4-
<AssemblyVersion>1.90.0.1</AssemblyVersion>
4+
<AssemblyVersion>1.90.1.1</AssemblyVersion>
55
<Authors>Eric Mellino</Authors>
66
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

0 commit comments

Comments
 (0)