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

upgrade to 1.91.6 #505

Merged
merged 2 commits into from
Jan 6, 2025
Merged

upgrade to 1.91.6 #505

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
813bfdd
upgrade to 1.91.6
zaafar Jan 6, 2025
9cd2f07
bump up release version
zaafar Jan 6, 2025
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.
3,863 changes: 2,120 additions & 1,743 deletions src/CodeGenerator/definitions/cimgui/definitions.json
View file
Open in desktop

Large diffs are not rendered by default.

1,257 changes: 668 additions & 589 deletions src/CodeGenerator/definitions/cimgui/structs_and_enums.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/ImGui.NET/Generated/ImDrawCmd.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ public unsafe partial struct ImDrawCmd
public uint ElemCount;
public IntPtr UserCallback;
public void* UserCallbackData;
public int UserCallbackDataSize;
public int UserCallbackDataOffset;
}
public unsafe partial struct ImDrawCmdPtr
{
Expand All @@ -30,6 +32,8 @@ public unsafe partial struct ImDrawCmdPtr
public ref uint ElemCount => ref Unsafe.AsRef<uint>(&NativePtr->ElemCount);
public ref IntPtr UserCallback => ref Unsafe.AsRef<IntPtr>(&NativePtr->UserCallback);
public IntPtr UserCallbackData { get => (IntPtr)NativePtr->UserCallbackData; set => NativePtr->UserCallbackData = (void*)value; }
public ref int UserCallbackDataSize => ref Unsafe.AsRef<int>(&NativePtr->UserCallbackDataSize);
public ref int UserCallbackDataOffset => ref Unsafe.AsRef<int>(&NativePtr->UserCallbackDataOffset);
public void Destroy()
{
ImGuiNative.ImDrawCmd_destroy((ImDrawCmd*)(NativePtr));
Expand Down
18 changes: 15 additions & 3 deletions src/ImGui.NET/Generated/ImDrawList.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public unsafe partial struct ImDrawList
public ImDrawListSplitter _Splitter;
public ImVector _ClipRectStack;
public ImVector _TextureIdStack;
public ImVector _CallbacksDataBuf;
public float _FringeScale;
public byte* _OwnerName;
}
Expand All @@ -44,6 +45,7 @@ public unsafe partial struct ImDrawListPtr
public ref ImDrawListSplitter _Splitter => ref Unsafe.AsRef<ImDrawListSplitter>(&NativePtr->_Splitter);
public ImVector<Vector4> _ClipRectStack => new ImVector<Vector4>(NativePtr->_ClipRectStack);
public ImVector<IntPtr> _TextureIdStack => new ImVector<IntPtr>(NativePtr->_TextureIdStack);
public ImVector<byte> _CallbacksDataBuf => new ImVector<byte>(NativePtr->_CallbacksDataBuf);
public ref float _FringeScale => ref Unsafe.AsRef<float>(&NativePtr->_FringeScale);
public NullTerminatedString _OwnerName => new NullTerminatedString(NativePtr->_OwnerName);
public int _CalcCircleAutoSegmentCount(float radius)
Expand Down Expand Up @@ -83,6 +85,10 @@ public void _ResetForNewFrame()
{
ImGuiNative.ImDrawList__ResetForNewFrame((ImDrawList*)(NativePtr));
}
public void _SetTextureID(IntPtr texture_id)
{
ImGuiNative.ImDrawList__SetTextureID((ImDrawList*)(NativePtr), texture_id);
}
public void _TryMergeDrawCmds()
{
ImGuiNative.ImDrawList__TryMergeDrawCmds((ImDrawList*)(NativePtr));
Expand All @@ -105,10 +111,16 @@ public void AddBezierQuadratic(Vector2 p1, Vector2 p2, Vector2 p3, uint col, flo
{
ImGuiNative.ImDrawList_AddBezierQuadratic((ImDrawList*)(NativePtr), p1, p2, p3, col, thickness, num_segments);
}
public void AddCallback(IntPtr callback, IntPtr callback_data)
public void AddCallback(IntPtr callback, IntPtr userdata)
{
void* native_userdata = (void*)userdata.ToPointer();
uint userdata_size = 0;
ImGuiNative.ImDrawList_AddCallback((ImDrawList*)(NativePtr), callback, native_userdata, userdata_size);
}
public void AddCallback(IntPtr callback, IntPtr userdata, uint userdata_size)
{
void* native_callback_data = (void*)callback_data.ToPointer();
ImGuiNative.ImDrawList_AddCallback((ImDrawList*)(NativePtr), callback, native_callback_data);
void* native_userdata = (void*)userdata.ToPointer();
ImGuiNative.ImDrawList_AddCallback((ImDrawList*)(NativePtr), callback, native_userdata, userdata_size);
}
public void AddCircle(Vector2 center, float radius, uint col)
{
Expand Down
8 changes: 4 additions & 4 deletions src/ImGui.NET/Generated/ImFont.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ public unsafe partial struct ImFont
public ImFontAtlas* ContainerAtlas;
public ImFontConfig* ConfigData;
public short ConfigDataCount;
public ushort FallbackChar;
public ushort EllipsisChar;
public short EllipsisCharCount;
public ushort EllipsisChar;
public ushort FallbackChar;
public float EllipsisWidth;
public float EllipsisCharStep;
public byte DirtyLookupTables;
Expand All @@ -45,9 +45,9 @@ public unsafe partial struct ImFontPtr
public ImFontAtlasPtr ContainerAtlas => new ImFontAtlasPtr(NativePtr->ContainerAtlas);
public ImFontConfigPtr ConfigData => new ImFontConfigPtr(NativePtr->ConfigData);
public ref short ConfigDataCount => ref Unsafe.AsRef<short>(&NativePtr->ConfigDataCount);
public ref ushort FallbackChar => ref Unsafe.AsRef<ushort>(&NativePtr->FallbackChar);
public ref ushort EllipsisChar => ref Unsafe.AsRef<ushort>(&NativePtr->EllipsisChar);
public ref short EllipsisCharCount => ref Unsafe.AsRef<short>(&NativePtr->EllipsisCharCount);
public ref ushort EllipsisChar => ref Unsafe.AsRef<ushort>(&NativePtr->EllipsisChar);
public ref ushort FallbackChar => ref Unsafe.AsRef<ushort>(&NativePtr->FallbackChar);
public ref float EllipsisWidth => ref Unsafe.AsRef<float>(&NativePtr->EllipsisWidth);
public ref float EllipsisCharStep => ref Unsafe.AsRef<float>(&NativePtr->EllipsisCharStep);
public ref bool DirtyLookupTables => ref Unsafe.AsRef<bool>(&NativePtr->DirtyLookupTables);
Expand Down
10 changes: 6 additions & 4 deletions src/ImGui.NET/Generated/ImFontAtlasCustomRect.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ namespace ImGuiNET
{
public unsafe partial struct ImFontAtlasCustomRect
{
public ushort Width;
public ushort Height;
public ushort X;
public ushort Y;
public ushort Width;
public ushort Height;
public uint GlyphID;
public uint GlyphColored;
public float GlyphAdvanceX;
public Vector2 GlyphOffset;
public ImFont* Font;
Expand All @@ -24,11 +25,12 @@ public unsafe partial struct ImFontAtlasCustomRectPtr
public static implicit operator ImFontAtlasCustomRectPtr(ImFontAtlasCustomRect* nativePtr) => new ImFontAtlasCustomRectPtr(nativePtr);
public static implicit operator ImFontAtlasCustomRect* (ImFontAtlasCustomRectPtr wrappedPtr) => wrappedPtr.NativePtr;
public static implicit operator ImFontAtlasCustomRectPtr(IntPtr nativePtr) => new ImFontAtlasCustomRectPtr(nativePtr);
public ref ushort Width => ref Unsafe.AsRef<ushort>(&NativePtr->Width);
public ref ushort Height => ref Unsafe.AsRef<ushort>(&NativePtr->Height);
public ref ushort X => ref Unsafe.AsRef<ushort>(&NativePtr->X);
public ref ushort Y => ref Unsafe.AsRef<ushort>(&NativePtr->Y);
public ref ushort Width => ref Unsafe.AsRef<ushort>(&NativePtr->Width);
public ref ushort Height => ref Unsafe.AsRef<ushort>(&NativePtr->Height);
public ref uint GlyphID => ref Unsafe.AsRef<uint>(&NativePtr->GlyphID);
public ref uint GlyphColored => ref Unsafe.AsRef<uint>(&NativePtr->GlyphColored);
public ref float GlyphAdvanceX => ref Unsafe.AsRef<float>(&NativePtr->GlyphAdvanceX);
public ref Vector2 GlyphOffset => ref Unsafe.AsRef<Vector2>(&NativePtr->GlyphOffset);
public ImFontPtr Font => new ImFontPtr(NativePtr->Font);
Expand Down
46 changes: 32 additions & 14 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 @@ -3910,14 +3910,14 @@ public static void Columns()
{
int count = 1;
byte* native_id = null;
byte border = 1;
ImGuiNative.igColumns(count, native_id, border);
byte borders = 1;
ImGuiNative.igColumns(count, native_id, borders);
}
public static void Columns(int count)
{
byte* native_id = null;
byte border = 1;
ImGuiNative.igColumns(count, native_id, border);
byte borders = 1;
ImGuiNative.igColumns(count, native_id, borders);
}
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
public static void Columns(int count, ReadOnlySpan<char> id)
Expand All @@ -3940,8 +3940,8 @@ public static void Columns(int count, ReadOnlySpan<char> id)
native_id[native_id_offset] = 0;
}
else { native_id = null; }
byte border = 1;
ImGuiNative.igColumns(count, native_id, border);
byte borders = 1;
ImGuiNative.igColumns(count, native_id, borders);
if (id_byteCount > Util.StackAllocationSizeLimit)
{
Util.Free(native_id);
Expand All @@ -3968,15 +3968,15 @@ public static void Columns(int count, string id)
native_id[native_id_offset] = 0;
}
else { native_id = null; }
byte border = 1;
ImGuiNative.igColumns(count, native_id, border);
byte borders = 1;
ImGuiNative.igColumns(count, native_id, borders);
if (id_byteCount > Util.StackAllocationSizeLimit)
{
Util.Free(native_id);
}
}
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
public static void Columns(int count, ReadOnlySpan<char> id, bool border)
public static void Columns(int count, ReadOnlySpan<char> id, bool borders)
{
byte* native_id;
int id_byteCount = 0;
Expand All @@ -3996,15 +3996,15 @@ public static void Columns(int count, ReadOnlySpan<char> id, bool border)
native_id[native_id_offset] = 0;
}
else { native_id = null; }
byte native_border = border ? (byte)1 : (byte)0;
ImGuiNative.igColumns(count, native_id, native_border);
byte native_borders = borders ? (byte)1 : (byte)0;
ImGuiNative.igColumns(count, native_id, native_borders);
if (id_byteCount > Util.StackAllocationSizeLimit)
{
Util.Free(native_id);
}
}
#endif
public static void Columns(int count, string id, bool border)
public static void Columns(int count, string id, bool borders)
{
byte* native_id;
int id_byteCount = 0;
Expand All @@ -4024,8 +4024,8 @@ public static void Columns(int count, string id, bool border)
native_id[native_id_offset] = 0;
}
else { native_id = null; }
byte native_border = border ? (byte)1 : (byte)0;
ImGuiNative.igColumns(count, native_id, native_border);
byte native_borders = borders ? (byte)1 : (byte)0;
ImGuiNative.igColumns(count, native_id, native_borders);
if (id_byteCount > Util.StackAllocationSizeLimit)
{
Util.Free(native_id);
Expand Down Expand Up @@ -20258,6 +20258,14 @@ public static void PushStyleVar(ImGuiStyleVar idx, Vector2 val)
{
ImGuiNative.igPushStyleVar_Vec2(idx, val);
}
public static void PushStyleVarX(ImGuiStyleVar idx, float val_x)
{
ImGuiNative.igPushStyleVarX(idx, val_x);
}
public static void PushStyleVarY(ImGuiStyleVar idx, float val_y)
{
ImGuiNative.igPushStyleVarY(idx, val_y);
}
public static void PushTextWrapPos()
{
float wrap_local_pos_x = 0.0f;
Expand Down Expand Up @@ -21282,6 +21290,11 @@ public static void SetMouseCursor(ImGuiMouseCursor cursor_type)
{
ImGuiNative.igSetMouseCursor(cursor_type);
}
public static void SetNavCursorVisible(bool visible)
{
byte native_visible = visible ? (byte)1 : (byte)0;
ImGuiNative.igSetNavCursorVisible(native_visible);
}
public static void SetNextFrameWantCaptureKeyboard(bool want_capture_keyboard)
{
byte native_want_capture_keyboard = want_capture_keyboard ? (byte)1 : (byte)0;
Expand Down Expand Up @@ -28634,5 +28647,10 @@ public static bool VSliderScalar(string label, Vector2 size, ImGuiDataType data_
}
return ret != 0;
}
public static IntPtr* GetBuilderForFreeType()
{
IntPtr* ret = ImGuiNative.ImGuiFreeType_GetBuilderForFreeType();
return ret;
}
}
}
1 change: 1 addition & 0 deletions src/ImGui.NET/Generated/ImGuiButtonFlags.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ public enum ImGuiButtonFlags
MouseButtonRight = 2,
MouseButtonMiddle = 4,
MouseButtonMask = 7,
EnableNav = 8,
}
}
2 changes: 1 addition & 1 deletion src/ImGui.NET/Generated/ImGuiChildFlags.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace ImGuiNET
public enum ImGuiChildFlags
{
None = 0,
Border = 1,
Borders = 1,
AlwaysUseWindowPadding = 2,
ResizeX = 4,
ResizeY = 8,
Expand Down
2 changes: 1 addition & 1 deletion src/ImGui.NET/Generated/ImGuiCol.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public enum ImGuiCol
TextLink = 51,
TextSelectedBg = 52,
DragDropTarget = 53,
NavHighlight = 54,
NavCursor = 54,
NavWindowingHighlight = 55,
NavWindowingDimBg = 56,
ModalWindowDimBg = 57,
Expand Down
2 changes: 0 additions & 2 deletions src/ImGui.NET/Generated/ImGuiConfigFlags.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ public enum ImGuiConfigFlags
None = 0,
NavEnableKeyboard = 1,
NavEnableGamepad = 2,
NavEnableSetMousePos = 4,
NavNoCaptureKeyboard = 8,
NoMouse = 16,
NoMouseCursorChange = 32,
NoKeyboard = 64,
Expand Down
17 changes: 17 additions & 0 deletions src/ImGui.NET/Generated/ImGuiFreeTypeBuilderFlags.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
namespace ImGuiNET
{
[System.Flags]
public enum ImGuiFreeTypeBuilderFlags
{
NoHinting = 1,
NoAutoHint = 2,
ForceAutoHint = 4,
LightHinting = 8,
MonoHinting = 16,
Bold = 32,
Oblique = 64,
Monochrome = 128,
LoadColor = 256,
Bitmap = 512,
}
}
Loading
Loading