Skip to content

Commit bb33944

Browse files
zaafarzaafar
authored
upgrade to 1.91.6 (#505)
* upgrade to 1.91.6 * bump up release version
1 parent 70a8702 commit bb33944

26 files changed

+2958
-2405
lines changed

Diff for: ‎deps/cimgui/linux-x64/cimgui.so

147 KB
Binary file not shown.

Diff for: ‎deps/cimgui/osx/cimgui.dylib

480 KB
Binary file not shown.

Diff for: ‎deps/cimgui/win-arm64/cimgui.dll

199 KB
Binary file not shown.

Diff for: ‎deps/cimgui/win-x64/cimgui.dll

172 KB
Binary file not shown.

Diff for: ‎deps/cimgui/win-x86/cimgui.dll

153 KB
Binary file not shown.

Diff for: ‎src/CodeGenerator/definitions/cimgui/definitions.json

+2,120-1,743
Large diffs are not rendered by default.

Diff for: ‎src/CodeGenerator/definitions/cimgui/structs_and_enums.json

+668-589
Large diffs are not rendered by default.

Diff for: ‎src/ImGui.NET/Generated/ImDrawCmd.gen.cs

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ public unsafe partial struct ImDrawCmd
1414
public uint ElemCount;
1515
public IntPtr UserCallback;
1616
public void* UserCallbackData;
17+
public int UserCallbackDataSize;
18+
public int UserCallbackDataOffset;
1719
}
1820
public unsafe partial struct ImDrawCmdPtr
1921
{
@@ -30,6 +32,8 @@ public unsafe partial struct ImDrawCmdPtr
3032
public ref uint ElemCount => ref Unsafe.AsRef<uint>(&NativePtr->ElemCount);
3133
public ref IntPtr UserCallback => ref Unsafe.AsRef<IntPtr>(&NativePtr->UserCallback);
3234
public IntPtr UserCallbackData { get => (IntPtr)NativePtr->UserCallbackData; set => NativePtr->UserCallbackData = (void*)value; }
35+
public ref int UserCallbackDataSize => ref Unsafe.AsRef<int>(&NativePtr->UserCallbackDataSize);
36+
public ref int UserCallbackDataOffset => ref Unsafe.AsRef<int>(&NativePtr->UserCallbackDataOffset);
3337
public void Destroy()
3438
{
3539
ImGuiNative.ImDrawCmd_destroy((ImDrawCmd*)(NativePtr));

Diff for: ‎src/ImGui.NET/Generated/ImDrawList.gen.cs

+15-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public unsafe partial struct ImDrawList
2020
public ImDrawListSplitter _Splitter;
2121
public ImVector _ClipRectStack;
2222
public ImVector _TextureIdStack;
23+
public ImVector _CallbacksDataBuf;
2324
public float _FringeScale;
2425
public byte* _OwnerName;
2526
}
@@ -44,6 +45,7 @@ public unsafe partial struct ImDrawListPtr
4445
public ref ImDrawListSplitter _Splitter => ref Unsafe.AsRef<ImDrawListSplitter>(&NativePtr->_Splitter);
4546
public ImVector<Vector4> _ClipRectStack => new ImVector<Vector4>(NativePtr->_ClipRectStack);
4647
public ImVector<IntPtr> _TextureIdStack => new ImVector<IntPtr>(NativePtr->_TextureIdStack);
48+
public ImVector<byte> _CallbacksDataBuf => new ImVector<byte>(NativePtr->_CallbacksDataBuf);
4749
public ref float _FringeScale => ref Unsafe.AsRef<float>(&NativePtr->_FringeScale);
4850
public NullTerminatedString _OwnerName => new NullTerminatedString(NativePtr->_OwnerName);
4951
public int _CalcCircleAutoSegmentCount(float radius)
@@ -83,6 +85,10 @@ public void _ResetForNewFrame()
8385
{
8486
ImGuiNative.ImDrawList__ResetForNewFrame((ImDrawList*)(NativePtr));
8587
}
88+
public void _SetTextureID(IntPtr texture_id)
89+
{
90+
ImGuiNative.ImDrawList__SetTextureID((ImDrawList*)(NativePtr), texture_id);
91+
}
8692
public void _TryMergeDrawCmds()
8793
{
8894
ImGuiNative.ImDrawList__TryMergeDrawCmds((ImDrawList*)(NativePtr));
@@ -105,10 +111,16 @@ public void AddBezierQuadratic(Vector2 p1, Vector2 p2, Vector2 p3, uint col, flo
105111
{
106112
ImGuiNative.ImDrawList_AddBezierQuadratic((ImDrawList*)(NativePtr), p1, p2, p3, col, thickness, num_segments);
107113
}
108-
public void AddCallback(IntPtr callback, IntPtr callback_data)
114+
public void AddCallback(IntPtr callback, IntPtr userdata)
115+
{
116+
void* native_userdata = (void*)userdata.ToPointer();
117+
uint userdata_size = 0;
118+
ImGuiNative.ImDrawList_AddCallback((ImDrawList*)(NativePtr), callback, native_userdata, userdata_size);
119+
}
120+
public void AddCallback(IntPtr callback, IntPtr userdata, uint userdata_size)
109121
{
110-
void* native_callback_data = (void*)callback_data.ToPointer();
111-
ImGuiNative.ImDrawList_AddCallback((ImDrawList*)(NativePtr), callback, native_callback_data);
122+
void* native_userdata = (void*)userdata.ToPointer();
123+
ImGuiNative.ImDrawList_AddCallback((ImDrawList*)(NativePtr), callback, native_userdata, userdata_size);
112124
}
113125
public void AddCircle(Vector2 center, float radius, uint col)
114126
{

Diff for: ‎src/ImGui.NET/Generated/ImFont.gen.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ public unsafe partial struct ImFont
1616
public ImFontAtlas* ContainerAtlas;
1717
public ImFontConfig* ConfigData;
1818
public short ConfigDataCount;
19-
public ushort FallbackChar;
20-
public ushort EllipsisChar;
2119
public short EllipsisCharCount;
20+
public ushort EllipsisChar;
21+
public ushort FallbackChar;
2222
public float EllipsisWidth;
2323
public float EllipsisCharStep;
2424
public byte DirtyLookupTables;
@@ -45,9 +45,9 @@ public unsafe partial struct ImFontPtr
4545
public ImFontAtlasPtr ContainerAtlas => new ImFontAtlasPtr(NativePtr->ContainerAtlas);
4646
public ImFontConfigPtr ConfigData => new ImFontConfigPtr(NativePtr->ConfigData);
4747
public ref short ConfigDataCount => ref Unsafe.AsRef<short>(&NativePtr->ConfigDataCount);
48-
public ref ushort FallbackChar => ref Unsafe.AsRef<ushort>(&NativePtr->FallbackChar);
49-
public ref ushort EllipsisChar => ref Unsafe.AsRef<ushort>(&NativePtr->EllipsisChar);
5048
public ref short EllipsisCharCount => ref Unsafe.AsRef<short>(&NativePtr->EllipsisCharCount);
49+
public ref ushort EllipsisChar => ref Unsafe.AsRef<ushort>(&NativePtr->EllipsisChar);
50+
public ref ushort FallbackChar => ref Unsafe.AsRef<ushort>(&NativePtr->FallbackChar);
5151
public ref float EllipsisWidth => ref Unsafe.AsRef<float>(&NativePtr->EllipsisWidth);
5252
public ref float EllipsisCharStep => ref Unsafe.AsRef<float>(&NativePtr->EllipsisCharStep);
5353
public ref bool DirtyLookupTables => ref Unsafe.AsRef<bool>(&NativePtr->DirtyLookupTables);

Diff for: ‎src/ImGui.NET/Generated/ImFontAtlasCustomRect.gen.cs

+6-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ namespace ImGuiNET
77
{
88
public unsafe partial struct ImFontAtlasCustomRect
99
{
10-
public ushort Width;
11-
public ushort Height;
1210
public ushort X;
1311
public ushort Y;
12+
public ushort Width;
13+
public ushort Height;
1414
public uint GlyphID;
15+
public uint GlyphColored;
1516
public float GlyphAdvanceX;
1617
public Vector2 GlyphOffset;
1718
public ImFont* Font;
@@ -24,11 +25,12 @@ public unsafe partial struct ImFontAtlasCustomRectPtr
2425
public static implicit operator ImFontAtlasCustomRectPtr(ImFontAtlasCustomRect* nativePtr) => new ImFontAtlasCustomRectPtr(nativePtr);
2526
public static implicit operator ImFontAtlasCustomRect* (ImFontAtlasCustomRectPtr wrappedPtr) => wrappedPtr.NativePtr;
2627
public static implicit operator ImFontAtlasCustomRectPtr(IntPtr nativePtr) => new ImFontAtlasCustomRectPtr(nativePtr);
27-
public ref ushort Width => ref Unsafe.AsRef<ushort>(&NativePtr->Width);
28-
public ref ushort Height => ref Unsafe.AsRef<ushort>(&NativePtr->Height);
2928
public ref ushort X => ref Unsafe.AsRef<ushort>(&NativePtr->X);
3029
public ref ushort Y => ref Unsafe.AsRef<ushort>(&NativePtr->Y);
30+
public ref ushort Width => ref Unsafe.AsRef<ushort>(&NativePtr->Width);
31+
public ref ushort Height => ref Unsafe.AsRef<ushort>(&NativePtr->Height);
3132
public ref uint GlyphID => ref Unsafe.AsRef<uint>(&NativePtr->GlyphID);
33+
public ref uint GlyphColored => ref Unsafe.AsRef<uint>(&NativePtr->GlyphColored);
3234
public ref float GlyphAdvanceX => ref Unsafe.AsRef<float>(&NativePtr->GlyphAdvanceX);
3335
public ref Vector2 GlyphOffset => ref Unsafe.AsRef<Vector2>(&NativePtr->GlyphOffset);
3436
public ImFontPtr Font => new ImFontPtr(NativePtr->Font);

Diff for: ‎src/ImGui.NET/Generated/ImGui.gen.cs

+32-14
Original file line numberDiff line numberDiff line change
@@ -3910,14 +3910,14 @@ public static void Columns()
39103910
{
39113911
int count = 1;
39123912
byte* native_id = null;
3913-
byte border = 1;
3914-
ImGuiNative.igColumns(count, native_id, border);
3913+
byte borders = 1;
3914+
ImGuiNative.igColumns(count, native_id, borders);
39153915
}
39163916
public static void Columns(int count)
39173917
{
39183918
byte* native_id = null;
3919-
byte border = 1;
3920-
ImGuiNative.igColumns(count, native_id, border);
3919+
byte borders = 1;
3920+
ImGuiNative.igColumns(count, native_id, borders);
39213921
}
39223922
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
39233923
public static void Columns(int count, ReadOnlySpan<char> id)
@@ -3940,8 +3940,8 @@ public static void Columns(int count, ReadOnlySpan<char> id)
39403940
native_id[native_id_offset] = 0;
39413941
}
39423942
else { native_id = null; }
3943-
byte border = 1;
3944-
ImGuiNative.igColumns(count, native_id, border);
3943+
byte borders = 1;
3944+
ImGuiNative.igColumns(count, native_id, borders);
39453945
if (id_byteCount > Util.StackAllocationSizeLimit)
39463946
{
39473947
Util.Free(native_id);
@@ -3968,15 +3968,15 @@ public static void Columns(int count, string id)
39683968
native_id[native_id_offset] = 0;
39693969
}
39703970
else { native_id = null; }
3971-
byte border = 1;
3972-
ImGuiNative.igColumns(count, native_id, border);
3971+
byte borders = 1;
3972+
ImGuiNative.igColumns(count, native_id, borders);
39733973
if (id_byteCount > Util.StackAllocationSizeLimit)
39743974
{
39753975
Util.Free(native_id);
39763976
}
39773977
}
39783978
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
3979-
public static void Columns(int count, ReadOnlySpan<char> id, bool border)
3979+
public static void Columns(int count, ReadOnlySpan<char> id, bool borders)
39803980
{
39813981
byte* native_id;
39823982
int id_byteCount = 0;
@@ -3996,15 +3996,15 @@ public static void Columns(int count, ReadOnlySpan<char> id, bool border)
39963996
native_id[native_id_offset] = 0;
39973997
}
39983998
else { native_id = null; }
3999-
byte native_border = border ? (byte)1 : (byte)0;
4000-
ImGuiNative.igColumns(count, native_id, native_border);
3999+
byte native_borders = borders ? (byte)1 : (byte)0;
4000+
ImGuiNative.igColumns(count, native_id, native_borders);
40014001
if (id_byteCount > Util.StackAllocationSizeLimit)
40024002
{
40034003
Util.Free(native_id);
40044004
}
40054005
}
40064006
#endif
4007-
public static void Columns(int count, string id, bool border)
4007+
public static void Columns(int count, string id, bool borders)
40084008
{
40094009
byte* native_id;
40104010
int id_byteCount = 0;
@@ -4024,8 +4024,8 @@ public static void Columns(int count, string id, bool border)
40244024
native_id[native_id_offset] = 0;
40254025
}
40264026
else { native_id = null; }
4027-
byte native_border = border ? (byte)1 : (byte)0;
4028-
ImGuiNative.igColumns(count, native_id, native_border);
4027+
byte native_borders = borders ? (byte)1 : (byte)0;
4028+
ImGuiNative.igColumns(count, native_id, native_borders);
40294029
if (id_byteCount > Util.StackAllocationSizeLimit)
40304030
{
40314031
Util.Free(native_id);
@@ -20258,6 +20258,14 @@ public static void PushStyleVar(ImGuiStyleVar idx, Vector2 val)
2025820258
{
2025920259
ImGuiNative.igPushStyleVar_Vec2(idx, val);
2026020260
}
20261+
public static void PushStyleVarX(ImGuiStyleVar idx, float val_x)
20262+
{
20263+
ImGuiNative.igPushStyleVarX(idx, val_x);
20264+
}
20265+
public static void PushStyleVarY(ImGuiStyleVar idx, float val_y)
20266+
{
20267+
ImGuiNative.igPushStyleVarY(idx, val_y);
20268+
}
2026120269
public static void PushTextWrapPos()
2026220270
{
2026320271
float wrap_local_pos_x = 0.0f;
@@ -21282,6 +21290,11 @@ public static void SetMouseCursor(ImGuiMouseCursor cursor_type)
2128221290
{
2128321291
ImGuiNative.igSetMouseCursor(cursor_type);
2128421292
}
21293+
public static void SetNavCursorVisible(bool visible)
21294+
{
21295+
byte native_visible = visible ? (byte)1 : (byte)0;
21296+
ImGuiNative.igSetNavCursorVisible(native_visible);
21297+
}
2128521298
public static void SetNextFrameWantCaptureKeyboard(bool want_capture_keyboard)
2128621299
{
2128721300
byte native_want_capture_keyboard = want_capture_keyboard ? (byte)1 : (byte)0;
@@ -28634,5 +28647,10 @@ public static bool VSliderScalar(string label, Vector2 size, ImGuiDataType data_
2863428647
}
2863528648
return ret != 0;
2863628649
}
28650+
public static IntPtr* GetBuilderForFreeType()
28651+
{
28652+
IntPtr* ret = ImGuiNative.ImGuiFreeType_GetBuilderForFreeType();
28653+
return ret;
28654+
}
2863728655
}
2863828656
}

Diff for: ‎src/ImGui.NET/Generated/ImGuiButtonFlags.gen.cs

+1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ public enum ImGuiButtonFlags
88
MouseButtonRight = 2,
99
MouseButtonMiddle = 4,
1010
MouseButtonMask = 7,
11+
EnableNav = 8,
1112
}
1213
}

Diff for: ‎src/ImGui.NET/Generated/ImGuiChildFlags.gen.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace ImGuiNET
44
public enum ImGuiChildFlags
55
{
66
None = 0,
7-
Border = 1,
7+
Borders = 1,
88
AlwaysUseWindowPadding = 2,
99
ResizeX = 4,
1010
ResizeY = 8,

Diff for: ‎src/ImGui.NET/Generated/ImGuiCol.gen.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public enum ImGuiCol
5656
TextLink = 51,
5757
TextSelectedBg = 52,
5858
DragDropTarget = 53,
59-
NavHighlight = 54,
59+
NavCursor = 54,
6060
NavWindowingHighlight = 55,
6161
NavWindowingDimBg = 56,
6262
ModalWindowDimBg = 57,

Diff for: ‎src/ImGui.NET/Generated/ImGuiConfigFlags.gen.cs

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ public enum ImGuiConfigFlags
66
None = 0,
77
NavEnableKeyboard = 1,
88
NavEnableGamepad = 2,
9-
NavEnableSetMousePos = 4,
10-
NavNoCaptureKeyboard = 8,
119
NoMouse = 16,
1210
NoMouseCursorChange = 32,
1311
NoKeyboard = 64,

Diff for: ‎src/ImGui.NET/Generated/ImGuiFreeTypeBuilderFlags.gen.cs

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
namespace ImGuiNET
2+
{
3+
[System.Flags]
4+
public enum ImGuiFreeTypeBuilderFlags
5+
{
6+
NoHinting = 1,
7+
NoAutoHint = 2,
8+
ForceAutoHint = 4,
9+
LightHinting = 8,
10+
MonoHinting = 16,
11+
Bold = 32,
12+
Oblique = 64,
13+
Monochrome = 128,
14+
LoadColor = 256,
15+
Bitmap = 512,
16+
}
17+
}

0 commit comments

Comments
 (0)