Skip to content

Commit bb33944

Browse files
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

deps/cimgui/linux-x64/cimgui.so

147 KB
Binary file not shown.

deps/cimgui/osx/cimgui.dylib

480 KB
Binary file not shown.

deps/cimgui/win-arm64/cimgui.dll

199 KB
Binary file not shown.

deps/cimgui/win-x64/cimgui.dll

172 KB
Binary file not shown.

deps/cimgui/win-x86/cimgui.dll

153 KB
Binary file not shown.

src/CodeGenerator/definitions/cimgui/definitions.json

Lines changed: 2120 additions & 1743 deletions
Large diffs are not rendered by default.

src/CodeGenerator/definitions/cimgui/structs_and_enums.json

Lines changed: 668 additions & 589 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 0 deletions
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));

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

Lines changed: 15 additions & 3 deletions
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
{

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

Lines changed: 4 additions & 4 deletions
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);

0 commit comments

Comments
 (0)