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.

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 imgui.net to 1.90.6 #478

Merged
merged 2 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
Binary file modified deps/cimgui/osx/cimgui.dylib
Binary file not shown.
Binary file modified deps/cimgui/win-arm64/cimgui.dll
Binary file not shown.
Binary file modified deps/cimgui/win-x64/cimgui.dll
Binary file not shown.
Binary file modified deps/cimgui/win-x86/cimgui.dll
Binary file not shown.
2,915 changes: 1,497 additions & 1,418 deletions src/CodeGenerator/definitions/cimgui/definitions.json

Large diffs are not rendered by default.

501 changes: 288 additions & 213 deletions src/CodeGenerator/definitions/cimgui/structs_and_enums.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions src/ImGui.NET/Generated/ImDrawList.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ public unsafe partial struct ImDrawList
public ImDrawListFlags Flags;
public uint _VtxCurrentIdx;
public IntPtr _Data;
public byte* _OwnerName;
public ImDrawVert* _VtxWritePtr;
public ushort* _IdxWritePtr;
public ImVector _ClipRectStack;
public ImVector _TextureIdStack;
public ImVector _Path;
public ImDrawCmdHeader _CmdHeader;
public ImDrawListSplitter _Splitter;
public ImVector _ClipRectStack;
public ImVector _TextureIdStack;
public float _FringeScale;
public byte* _OwnerName;
}
public unsafe partial struct ImDrawListPtr
{
Expand All @@ -37,15 +37,15 @@ public unsafe partial struct ImDrawListPtr
public ref ImDrawListFlags Flags => ref Unsafe.AsRef<ImDrawListFlags>(&NativePtr->Flags);
public ref uint _VtxCurrentIdx => ref Unsafe.AsRef<uint>(&NativePtr->_VtxCurrentIdx);
public ref IntPtr _Data => ref Unsafe.AsRef<IntPtr>(&NativePtr->_Data);
public NullTerminatedString _OwnerName => new NullTerminatedString(NativePtr->_OwnerName);
public ImDrawVertPtr _VtxWritePtr => new ImDrawVertPtr(NativePtr->_VtxWritePtr);
public IntPtr _IdxWritePtr { get => (IntPtr)NativePtr->_IdxWritePtr; set => NativePtr->_IdxWritePtr = (ushort*)value; }
public ImVector<Vector4> _ClipRectStack => new ImVector<Vector4>(NativePtr->_ClipRectStack);
public ImVector<IntPtr> _TextureIdStack => new ImVector<IntPtr>(NativePtr->_TextureIdStack);
public ImVector<Vector2> _Path => new ImVector<Vector2>(NativePtr->_Path);
public ref ImDrawCmdHeader _CmdHeader => ref Unsafe.AsRef<ImDrawCmdHeader>(&NativePtr->_CmdHeader);
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 ref float _FringeScale => ref Unsafe.AsRef<float>(&NativePtr->_FringeScale);
public NullTerminatedString _OwnerName => new NullTerminatedString(NativePtr->_OwnerName);
public int _CalcCircleAutoSegmentCount(float radius)
{
int ret = ImGuiNative.ImDrawList__CalcCircleAutoSegmentCount((ImDrawList*)(NativePtr), radius);
Expand Down
2 changes: 2 additions & 0 deletions src/ImGui.NET/Generated/ImGuiStyle.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public unsafe partial struct ImGuiStyle
public float TabMinWidthForCloseButton;
public float TabBarBorderSize;
public float TableAngledHeadersAngle;
public Vector2 TableAngledHeadersTextAlign;
public ImGuiDir ColorButtonPosition;
public Vector2 ButtonTextAlign;
public Vector2 SelectableTextAlign;
Expand Down Expand Up @@ -153,6 +154,7 @@ public unsafe partial struct ImGuiStylePtr
public ref float TabMinWidthForCloseButton => ref Unsafe.AsRef<float>(&NativePtr->TabMinWidthForCloseButton);
public ref float TabBarBorderSize => ref Unsafe.AsRef<float>(&NativePtr->TabBarBorderSize);
public ref float TableAngledHeadersAngle => ref Unsafe.AsRef<float>(&NativePtr->TableAngledHeadersAngle);
public ref Vector2 TableAngledHeadersTextAlign => ref Unsafe.AsRef<Vector2>(&NativePtr->TableAngledHeadersTextAlign);
public ref ImGuiDir ColorButtonPosition => ref Unsafe.AsRef<ImGuiDir>(&NativePtr->ColorButtonPosition);
public ref Vector2 ButtonTextAlign => ref Unsafe.AsRef<Vector2>(&NativePtr->ButtonTextAlign);
public ref Vector2 SelectableTextAlign => ref Unsafe.AsRef<Vector2>(&NativePtr->SelectableTextAlign);
Expand Down
15 changes: 8 additions & 7 deletions src/ImGui.NET/Generated/ImGuiStyleVar.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@ public enum ImGuiStyleVar
TabBorderSize = 23,
TabBarBorderSize = 24,
TableAngledHeadersAngle = 25,
ButtonTextAlign = 26,
SelectableTextAlign = 27,
SeparatorTextBorderSize = 28,
SeparatorTextAlign = 29,
SeparatorTextPadding = 30,
DockingSeparatorSize = 31,
COUNT = 32,
TableAngledHeadersTextAlign = 26,
ButtonTextAlign = 27,
SelectableTextAlign = 28,
SeparatorTextBorderSize = 29,
SeparatorTextAlign = 30,
SeparatorTextPadding = 31,
DockingSeparatorSize = 32,
COUNT = 33,
}
}
5 changes: 3 additions & 2 deletions src/ImGui.NET/Generated/ImGuiTreeNodeFlags.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ public enum ImGuiTreeNodeFlags
FramePadding = 1024,
SpanAvailWidth = 2048,
SpanFullWidth = 4096,
SpanAllColumns = 8192,
NavLeftJumpsBackHere = 16384,
SpanTextWidth = 8192,
SpanAllColumns = 16384,
NavLeftJumpsBackHere = 32768,
CollapsingHeader = 26,
}
}
2 changes: 1 addition & 1 deletion src/ImGui.NET/ImGui.NET.csproj
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.5.1</AssemblyVersion>
<AssemblyVersion>1.90.6.1</AssemblyVersion>
<Authors>Eric Mellino</Authors>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
Loading