Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade imgui to 1.90.1 #456

Merged
merged 2 commits into from
Jan 13, 2024
Merged

Upgrade imgui to 1.90.1 #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fd4447
Upgrade imgui to 1.90.1
zaafar Jan 13, 2024
4c518c3
upgrade imgui.net version
zaafar Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified deps/cimgui/linux-x64/cimgui.so
View file
Open in desktop
Binary file not shown.
Binary file modified deps/cimgui/osx/cimgui.dylib
View file
Open in desktop
Binary file not shown.
Binary file modified deps/cimgui/win-arm64/cimgui.dll
View file
Open in desktop
Binary file not shown.
Binary file modified deps/cimgui/win-x64/cimgui.dll
View file
Open in desktop
Binary file not shown.
Binary file modified deps/cimgui/win-x86/cimgui.dll
View file
Open in desktop
Binary file not shown.
2,225 changes: 1,160 additions & 1,065 deletions src/CodeGenerator/definitions/cimgui/definitions.json
View file
Open in desktop

Large diffs are not rendered by default.

477 changes: 293 additions & 184 deletions src/CodeGenerator/definitions/cimgui/structs_and_enums.json
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 14 additions & 10 deletions src/ImGui.NET/Generated/ImGui.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4513,6 +4513,10 @@ public static bool DebugCheckVersionAndDataLayout(string version_str, uint sz_io
}
return ret != 0;
}
public static void DebugFlashStyleColor(ImGuiCol idx)
{
ImGuiNative.igDebugFlashStyleColor(idx);
}
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
public static void DebugTextEncoding(ReadOnlySpan<char> text)
{
Expand Down Expand Up @@ -12897,35 +12901,35 @@ public static float GetWindowWidth()
float ret = ImGuiNative.igGetWindowWidth();
return ret;
}
public static void Image(IntPtr user_texture_id, Vector2 size)
public static void Image(IntPtr user_texture_id, Vector2 image_size)
{
Vector2 uv0 = new Vector2();
Vector2 uv1 = new Vector2(1, 1);
Vector4 tint_col = new Vector4(1, 1, 1, 1);
Vector4 border_col = new Vector4();
ImGuiNative.igImage(user_texture_id, size, uv0, uv1, tint_col, border_col);
ImGuiNative.igImage(user_texture_id, image_size, uv0, uv1, tint_col, border_col);
}
public static void Image(IntPtr user_texture_id, Vector2 size, Vector2 uv0)
public static void Image(IntPtr user_texture_id, Vector2 image_size, Vector2 uv0)
{
Vector2 uv1 = new Vector2(1, 1);
Vector4 tint_col = new Vector4(1, 1, 1, 1);
Vector4 border_col = new Vector4();
ImGuiNative.igImage(user_texture_id, size, uv0, uv1, tint_col, border_col);
ImGuiNative.igImage(user_texture_id, image_size, uv0, uv1, tint_col, border_col);
}
public static void Image(IntPtr user_texture_id, Vector2 size, Vector2 uv0, Vector2 uv1)
public static void Image(IntPtr user_texture_id, Vector2 image_size, Vector2 uv0, Vector2 uv1)
{
Vector4 tint_col = new Vector4(1, 1, 1, 1);
Vector4 border_col = new Vector4();
ImGuiNative.igImage(user_texture_id, size, uv0, uv1, tint_col, border_col);
ImGuiNative.igImage(user_texture_id, image_size, uv0, uv1, tint_col, border_col);
}
public static void Image(IntPtr user_texture_id, Vector2 size, Vector2 uv0, Vector2 uv1, Vector4 tint_col)
public static void Image(IntPtr user_texture_id, Vector2 image_size, Vector2 uv0, Vector2 uv1, Vector4 tint_col)
{
Vector4 border_col = new Vector4();
ImGuiNative.igImage(user_texture_id, size, uv0, uv1, tint_col, border_col);
ImGuiNative.igImage(user_texture_id, image_size, uv0, uv1, tint_col, border_col);
}
public static void Image(IntPtr user_texture_id, Vector2 size, Vector2 uv0, Vector2 uv1, Vector4 tint_col, Vector4 border_col)
public static void Image(IntPtr user_texture_id, Vector2 image_size, Vector2 uv0, Vector2 uv1, Vector4 tint_col, Vector4 border_col)
{
ImGuiNative.igImage(user_texture_id, size, uv0, uv1, tint_col, border_col);
ImGuiNative.igImage(user_texture_id, image_size, uv0, uv1, tint_col, border_col);
}
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
public static bool ImageButton(ReadOnlySpan<char> str_id, IntPtr user_texture_id, Vector2 image_size)
Expand Down
2 changes: 2 additions & 0 deletions src/ImGui.NET/Generated/ImGuiIO.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public unsafe partial struct ImGuiIO
public float MouseDragThreshold;
public float KeyRepeatDelay;
public float KeyRepeatRate;
public byte ConfigDebugIsDebuggerPresent;
public byte ConfigDebugBeginReturnValueOnce;
public byte ConfigDebugBeginReturnValueLoop;
public byte ConfigDebugIgnoreFocusLoss;
Expand Down Expand Up @@ -311,6 +312,7 @@ public unsafe partial struct ImGuiIOPtr
public ref float MouseDragThreshold => ref Unsafe.AsRef<float>(&NativePtr->MouseDragThreshold);
public ref float KeyRepeatDelay => ref Unsafe.AsRef<float>(&NativePtr->KeyRepeatDelay);
public ref float KeyRepeatRate => ref Unsafe.AsRef<float>(&NativePtr->KeyRepeatRate);
public ref bool ConfigDebugIsDebuggerPresent => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugIsDebuggerPresent);
public ref bool ConfigDebugBeginReturnValueOnce => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugBeginReturnValueOnce);
public ref bool ConfigDebugBeginReturnValueLoop => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugBeginReturnValueLoop);
public ref bool ConfigDebugIgnoreFocusLoss => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugIgnoreFocusLoss);
Expand Down
4 changes: 3 additions & 1 deletion src/ImGui.NET/Generated/ImGuiNative.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ public static unsafe partial class ImGuiNative
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
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);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igDebugFlashStyleColor(ImGuiCol idx);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igDebugTextEncoding(byte* text);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igDestroyContext(IntPtr ctx);
Expand Down Expand Up @@ -323,7 +325,7 @@ public static unsafe partial class ImGuiNative
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern float igGetWindowWidth();
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igImage(IntPtr user_texture_id, Vector2 size, Vector2 uv0, Vector2 uv1, Vector4 tint_col, Vector4 border_col);
public static extern void igImage(IntPtr user_texture_id, Vector2 image_size, Vector2 uv0, Vector2 uv1, Vector4 tint_col, Vector4 border_col);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
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);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
Expand Down
1 change: 1 addition & 0 deletions src/ImGui.NET/Generated/ImGuiTabItemFlags.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ public enum ImGuiTabItemFlags
NoReorder = 32,
Leading = 64,
Trailing = 128,
NoAssumedClosure = 256,
}
}
2 changes: 1 addition & 1 deletion src/ImGui.NET/ImGui.NET.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>A .NET wrapper for the Dear ImGui library.</Description>
<AssemblyVersion>1.90.0.1</AssemblyVersion>
<AssemblyVersion>1.90.1.1</AssemblyVersion>
<Authors>Eric Mellino</Authors>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
Loading