Update to last 1.71

internals
Amer Koleci 6 years ago
parent 8e34c987ea
commit 88ca3dc6e9
  1. 2
      src/CodeGenerator/Properties/launchSettings.json
  2. 4152
      src/CodeGenerator/definitions.json
  3. 49
      src/CodeGenerator/structs_and_enums.json
  4. 8
      src/ImGui.NET/Generated/ImDrawChannel.gen.cs
  5. 4
      src/ImGui.NET/Generated/ImDrawCmd.gen.cs
  6. 18
      src/ImGui.NET/Generated/ImDrawList.gen.cs
  7. 1
      src/ImGui.NET/Generated/ImDrawListFlags.gen.cs
  8. 53
      src/ImGui.NET/Generated/ImDrawListSplitter.gen.cs
  9. 6
      src/ImGui.NET/Generated/ImFontGlyphRangesBuilder.gen.cs
  10. 16
      src/ImGui.NET/Generated/ImGui.gen.cs
  11. 1
      src/ImGui.NET/Generated/ImGuiBackendFlags.gen.cs
  12. 2
      src/ImGui.NET/Generated/ImGuiIO.gen.cs
  13. 1
      src/ImGui.NET/Generated/ImGuiInputTextFlags.gen.cs
  14. 26
      src/ImGui.NET/Generated/ImGuiNative.gen.cs
  15. 2
      src/ImGui.NET/Generated/ImGuiStyle.gen.cs
  16. 2
      src/ImGui.NET/ImGui.NET.csproj

@ -2,7 +2,7 @@
"profiles": {
"CodeGenerator": {
"commandName": "Project",
"commandLineArgs": "E:\\projects\\imgui.net\\src\\ImGui.NET\\Generated"
"commandLineArgs": "E:\\repositories\\github\\ImGui.NET\\src\\ImGui.NET\\Generated"
}
}
}

File diff suppressed because it is too large Load Diff

@ -62,6 +62,11 @@
"calc_value": 2,
"name": "ImDrawListFlags_AntiAliasedFill",
"value": "1 << 1"
},
{
"calc_value": 4,
"name": "ImDrawListFlags_AllowVtxOffset",
"value": "1 << 2"
}
],
"ImFontAtlasFlags_": [
@ -101,6 +106,11 @@
"calc_value": 4,
"name": "ImGuiBackendFlags_HasSetMousePos",
"value": "1 << 2"
},
{
"calc_value": 8,
"name": "ImGuiBackendFlags_RendererHasVtxOffset",
"value": "1 << 3"
}
],
"ImGuiCol_": [
@ -938,6 +948,11 @@
"calc_value": 1048576,
"name": "ImGuiInputTextFlags_Multiline",
"value": "1 << 20"
},
{
"calc_value": 2097152,
"name": "ImGuiInputTextFlags_NoMarkEdited",
"value": "1 << 21"
}
],
"ImGuiKey_": [
@ -1727,12 +1742,12 @@
],
"ImDrawChannel": [
{
"name": "CmdBuffer",
"name": "_CmdBuffer",
"template_type": "ImDrawCmd",
"type": "ImVector_ImDrawCmd"
},
{
"name": "IdxBuffer",
"name": "_IdxBuffer",
"template_type": "ImDrawIdx",
"type": "ImVector_ImDrawIdx"
}
@ -1750,6 +1765,14 @@
"name": "TextureId",
"type": "ImTextureID"
},
{
"name": "VtxOffset",
"type": "unsigned int"
},
{
"name": "IdxOffset",
"type": "unsigned int"
},
{
"name": "UserCallback",
"type": "ImDrawCallback"
@ -1821,6 +1844,10 @@
"name": "_OwnerName",
"type": "const char*"
},
{
"name": "_VtxCurrentOffset",
"type": "unsigned int"
},
{
"name": "_VtxCurrentIdx",
"type": "unsigned int"
@ -1849,11 +1876,17 @@
"type": "ImVector_ImVec2"
},
{
"name": "_ChannelsCurrent",
"name": "_Splitter",
"type": "ImDrawListSplitter"
}
],
"ImDrawListSplitter": [
{
"name": "_Current",
"type": "int"
},
{
"name": "_ChannelsCount",
"name": "_Count",
"type": "int"
},
{
@ -2131,8 +2164,8 @@
"ImFontGlyphRangesBuilder": [
{
"name": "UsedChars",
"template_type": "int",
"type": "ImVector_int"
"template_type": "ImU32",
"type": "ImVector_ImU32"
}
],
"ImGuiIO": [
@ -2628,6 +2661,10 @@
"name": "WindowTitleAlign",
"type": "ImVec2"
},
{
"name": "WindowMenuButtonPosition",
"type": "ImGuiDir"
},
{
"name": "ChildRounding",
"type": "float"

@ -7,8 +7,8 @@ namespace ImGuiNET
{
public unsafe partial struct ImDrawChannel
{
public ImVector CmdBuffer;
public ImVector IdxBuffer;
public ImVector _CmdBuffer;
public ImVector _IdxBuffer;
}
public unsafe partial struct ImDrawChannelPtr
{
@ -18,7 +18,7 @@ namespace ImGuiNET
public static implicit operator ImDrawChannelPtr(ImDrawChannel* nativePtr) => new ImDrawChannelPtr(nativePtr);
public static implicit operator ImDrawChannel* (ImDrawChannelPtr wrappedPtr) => wrappedPtr.NativePtr;
public static implicit operator ImDrawChannelPtr(IntPtr nativePtr) => new ImDrawChannelPtr(nativePtr);
public ImPtrVector<ImDrawCmdPtr> CmdBuffer => new ImPtrVector<ImDrawCmdPtr>(NativePtr->CmdBuffer, Unsafe.SizeOf<ImDrawCmd>());
public ImVector<ushort> IdxBuffer => new ImVector<ushort>(NativePtr->IdxBuffer);
public ImPtrVector<ImDrawCmdPtr> _CmdBuffer => new ImPtrVector<ImDrawCmdPtr>(NativePtr->_CmdBuffer, Unsafe.SizeOf<ImDrawCmd>());
public ImVector<ushort> _IdxBuffer => new ImVector<ushort>(NativePtr->_IdxBuffer);
}
}

@ -10,6 +10,8 @@ namespace ImGuiNET
public uint ElemCount;
public Vector4 ClipRect;
public IntPtr TextureId;
public uint VtxOffset;
public uint IdxOffset;
public IntPtr UserCallback;
public void* UserCallbackData;
}
@ -24,6 +26,8 @@ namespace ImGuiNET
public ref uint ElemCount => ref Unsafe.AsRef<uint>(&NativePtr->ElemCount);
public ref Vector4 ClipRect => ref Unsafe.AsRef<Vector4>(&NativePtr->ClipRect);
public ref IntPtr TextureId => ref Unsafe.AsRef<IntPtr>(&NativePtr->TextureId);
public ref uint VtxOffset => ref Unsafe.AsRef<uint>(&NativePtr->VtxOffset);
public ref uint IdxOffset => ref Unsafe.AsRef<uint>(&NativePtr->IdxOffset);
public ref IntPtr UserCallback => ref Unsafe.AsRef<IntPtr>(&NativePtr->UserCallback);
public IntPtr UserCallbackData { get => (IntPtr)NativePtr->UserCallbackData; set => NativePtr->UserCallbackData = (void*)value; }
public void Destroy()

@ -13,15 +13,14 @@ namespace ImGuiNET
public ImDrawListFlags Flags;
public IntPtr _Data;
public byte* _OwnerName;
public uint _VtxCurrentOffset;
public uint _VtxCurrentIdx;
public ImDrawVert* _VtxWritePtr;
public ushort* _IdxWritePtr;
public ImVector _ClipRectStack;
public ImVector _TextureIdStack;
public ImVector _Path;
public int _ChannelsCurrent;
public int _ChannelsCount;
public ImVector _Channels;
public ImDrawListSplitter _Splitter;
}
public unsafe partial struct ImDrawListPtr
{
@ -37,15 +36,14 @@ namespace ImGuiNET
public ref ImDrawListFlags Flags => ref Unsafe.AsRef<ImDrawListFlags>(&NativePtr->Flags);
public ref IntPtr _Data => ref Unsafe.AsRef<IntPtr>(&NativePtr->_Data);
public NullTerminatedString _OwnerName => new NullTerminatedString(NativePtr->_OwnerName);
public ref uint _VtxCurrentOffset => ref Unsafe.AsRef<uint>(&NativePtr->_VtxCurrentOffset);
public ref uint _VtxCurrentIdx => ref Unsafe.AsRef<uint>(&NativePtr->_VtxCurrentIdx);
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 int _ChannelsCurrent => ref Unsafe.AsRef<int>(&NativePtr->_ChannelsCurrent);
public ref int _ChannelsCount => ref Unsafe.AsRef<int>(&NativePtr->_ChannelsCount);
public ImPtrVector<ImDrawChannelPtr> _Channels => new ImPtrVector<ImDrawChannelPtr>(NativePtr->_Channels, Unsafe.SizeOf<ImDrawChannel>());
public ref ImDrawListSplitter _Splitter => ref Unsafe.AsRef<ImDrawListSplitter>(&NativePtr->_Splitter);
public void AddBezierCurve(Vector2 pos0, Vector2 cp0, Vector2 cp1, Vector2 pos1, uint col, float thickness)
{
int num_segments = 0;
@ -253,13 +251,13 @@ namespace ImGuiNET
{
ImGuiNative.ImDrawList_ChannelsMerge(NativePtr);
}
public void ChannelsSetCurrent(int channel_index)
public void ChannelsSetCurrent(int n)
{
ImGuiNative.ImDrawList_ChannelsSetCurrent(NativePtr, channel_index);
ImGuiNative.ImDrawList_ChannelsSetCurrent(NativePtr, n);
}
public void ChannelsSplit(int channels_count)
public void ChannelsSplit(int count)
{
ImGuiNative.ImDrawList_ChannelsSplit(NativePtr, channels_count);
ImGuiNative.ImDrawList_ChannelsSplit(NativePtr, count);
}
public void Clear()
{

@ -6,5 +6,6 @@ namespace ImGuiNET
None = 0,
AntiAliasedLines = 1 << 0,
AntiAliasedFill = 1 << 1,
AllowVtxOffset = 1 << 2,
}
}

@ -0,0 +1,53 @@
using System;
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Text;
namespace ImGuiNET
{
public unsafe partial struct ImDrawListSplitter
{
public int _Current;
public int _Count;
public ImVector _Channels;
}
public unsafe partial struct ImDrawListSplitterPtr
{
public ImDrawListSplitter* NativePtr { get; }
public ImDrawListSplitterPtr(ImDrawListSplitter* nativePtr) => NativePtr = nativePtr;
public ImDrawListSplitterPtr(IntPtr nativePtr) => NativePtr = (ImDrawListSplitter*)nativePtr;
public static implicit operator ImDrawListSplitterPtr(ImDrawListSplitter* nativePtr) => new ImDrawListSplitterPtr(nativePtr);
public static implicit operator ImDrawListSplitter* (ImDrawListSplitterPtr wrappedPtr) => wrappedPtr.NativePtr;
public static implicit operator ImDrawListSplitterPtr(IntPtr nativePtr) => new ImDrawListSplitterPtr(nativePtr);
public ref int _Current => ref Unsafe.AsRef<int>(&NativePtr->_Current);
public ref int _Count => ref Unsafe.AsRef<int>(&NativePtr->_Count);
public ImPtrVector<ImDrawChannelPtr> _Channels => new ImPtrVector<ImDrawChannelPtr>(NativePtr->_Channels, Unsafe.SizeOf<ImDrawChannel>());
public void Clear()
{
ImGuiNative.ImDrawListSplitter_Clear(NativePtr);
}
public void ClearFreeMemory()
{
ImGuiNative.ImDrawListSplitter_ClearFreeMemory(NativePtr);
}
public void Destroy()
{
ImGuiNative.ImDrawListSplitter_destroy(NativePtr);
}
public void Merge(ImDrawListPtr draw_list)
{
ImDrawList* native_draw_list = draw_list.NativePtr;
ImGuiNative.ImDrawListSplitter_Merge(NativePtr, native_draw_list);
}
public void SetCurrentChannel(ImDrawListPtr draw_list, int channel_idx)
{
ImDrawList* native_draw_list = draw_list.NativePtr;
ImGuiNative.ImDrawListSplitter_SetCurrentChannel(NativePtr, native_draw_list, channel_idx);
}
public void Split(ImDrawListPtr draw_list, int count)
{
ImDrawList* native_draw_list = draw_list.NativePtr;
ImGuiNative.ImDrawListSplitter_Split(NativePtr, native_draw_list, count);
}
}
}

@ -17,7 +17,7 @@ namespace ImGuiNET
public static implicit operator ImFontGlyphRangesBuilderPtr(ImFontGlyphRangesBuilder* nativePtr) => new ImFontGlyphRangesBuilderPtr(nativePtr);
public static implicit operator ImFontGlyphRangesBuilder* (ImFontGlyphRangesBuilderPtr wrappedPtr) => wrappedPtr.NativePtr;
public static implicit operator ImFontGlyphRangesBuilderPtr(IntPtr nativePtr) => new ImFontGlyphRangesBuilderPtr(nativePtr);
public ImVector<int> UsedChars => new ImVector<int>(NativePtr->UsedChars);
public ImVector<uint> UsedChars => new ImVector<uint>(NativePtr->UsedChars);
public void AddChar(ushort c)
{
ImGuiNative.ImFontGlyphRangesBuilder_AddChar(NativePtr, c);
@ -61,6 +61,10 @@ namespace ImGuiNET
ImGuiNative.ImFontGlyphRangesBuilder_BuildRanges(NativePtr, native_out_ranges);
}
}
public void Clear()
{
ImGuiNative.ImFontGlyphRangesBuilder_Clear(NativePtr);
}
public void Destroy()
{
ImGuiNative.ImFontGlyphRangesBuilder_destroy(NativePtr);

@ -10392,20 +10392,20 @@ namespace ImGuiNET
{
ImGuiNative.igSetMouseCursor(type);
}
public static void SetNextItemWidth(float item_width)
{
ImGuiNative.igSetNextItemWidth(item_width);
}
public static void SetNextTreeNodeOpen(bool is_open)
public static void SetNextItemOpen(bool is_open)
{
byte native_is_open = is_open ? (byte)1 : (byte)0;
ImGuiCond cond = 0;
ImGuiNative.igSetNextTreeNodeOpen(native_is_open, cond);
ImGuiNative.igSetNextItemOpen(native_is_open, cond);
}
public static void SetNextTreeNodeOpen(bool is_open, ImGuiCond cond)
public static void SetNextItemOpen(bool is_open, ImGuiCond cond)
{
byte native_is_open = is_open ? (byte)1 : (byte)0;
ImGuiNative.igSetNextTreeNodeOpen(native_is_open, cond);
ImGuiNative.igSetNextItemOpen(native_is_open, cond);
}
public static void SetNextItemWidth(float item_width)
{
ImGuiNative.igSetNextItemWidth(item_width);
}
public static void SetNextWindowBgAlpha(float alpha)
{

@ -7,5 +7,6 @@ namespace ImGuiNET
HasGamepad = 1 << 0,
HasMouseCursors = 1 << 1,
HasSetMousePos = 1 << 2,
RendererHasVtxOffset = 1 << 3,
}
}

@ -176,7 +176,7 @@ namespace ImGuiNET
public RangeAccessor<float> NavInputsDownDuration => new RangeAccessor<float>(NativePtr->NavInputsDownDuration, 22);
public RangeAccessor<float> NavInputsDownDurationPrev => new RangeAccessor<float>(NativePtr->NavInputsDownDurationPrev, 22);
public ImVector<ushort> InputQueueCharacters => new ImVector<ushort>(NativePtr->InputQueueCharacters);
public void AddInputCharacter(ushort c)
public void AddInputCharacter(uint c)
{
ImGuiNative.ImGuiIO_AddInputCharacter(NativePtr, c);
}

@ -24,5 +24,6 @@ namespace ImGuiNET
CharsScientific = 1 << 17,
CallbackResize = 1 << 18,
Multiline = 1 << 20,
NoMarkEdited = 1 << 21,
}
}

@ -531,9 +531,9 @@ namespace ImGuiNET
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetMouseCursor(ImGuiMouseCursor type);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetNextItemWidth(float item_width);
public static extern void igSetNextItemOpen(byte is_open, ImGuiCond cond);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetNextTreeNodeOpen(byte is_open, ImGuiCond cond);
public static extern void igSetNextItemWidth(float item_width);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetNextWindowBgAlpha(float alpha);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
@ -745,9 +745,9 @@ namespace ImGuiNET
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImDrawList_ChannelsMerge(ImDrawList* self);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImDrawList_ChannelsSetCurrent(ImDrawList* self, int channel_index);
public static extern void ImDrawList_ChannelsSetCurrent(ImDrawList* self, int n);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImDrawList_ChannelsSplit(ImDrawList* self, int channels_count);
public static extern void ImDrawList_ChannelsSplit(ImDrawList* self, int count);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImDrawList_Clear(ImDrawList* self);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
@ -809,6 +809,20 @@ namespace ImGuiNET
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImDrawList_UpdateTextureID(ImDrawList* self);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImDrawListSplitter_Clear(ImDrawListSplitter* self);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImDrawListSplitter_ClearFreeMemory(ImDrawListSplitter* self);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImDrawListSplitter_destroy(ImDrawListSplitter* self);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern ImDrawListSplitter* ImDrawListSplitter_ImDrawListSplitter();
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImDrawListSplitter_Merge(ImDrawListSplitter* self, ImDrawList* draw_list);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImDrawListSplitter_SetCurrentChannel(ImDrawListSplitter* self, ImDrawList* draw_list, int channel_idx);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImDrawListSplitter_Split(ImDrawListSplitter* self, ImDrawList* draw_list, int count);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImFont_AddGlyph(ImFont* self, ushort c, float x0, float y0, float x1, float y1, float u0, float v0, float u1, float v1, float advance_x);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImFont_AddRemapChar(ImFont* self, ushort dst, ushort src, byte overwrite_dst);
@ -915,6 +929,8 @@ namespace ImGuiNET
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImFontGlyphRangesBuilder_BuildRanges(ImFontGlyphRangesBuilder* self, ImVector* out_ranges);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImFontGlyphRangesBuilder_Clear(ImFontGlyphRangesBuilder* self);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImFontGlyphRangesBuilder_destroy(ImFontGlyphRangesBuilder* self);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern byte ImFontGlyphRangesBuilder_GetBit(ImFontGlyphRangesBuilder* self, int n);
@ -933,7 +949,7 @@ namespace ImGuiNET
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImGuiInputTextCallbackData_InsertChars(ImGuiInputTextCallbackData* self, int pos, byte* text, byte* text_end);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImGuiIO_AddInputCharacter(ImGuiIO* self, ushort c);
public static extern void ImGuiIO_AddInputCharacter(ImGuiIO* self, uint c);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self, byte* str);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]

@ -13,6 +13,7 @@ namespace ImGuiNET
public float WindowBorderSize;
public Vector2 WindowMinSize;
public Vector2 WindowTitleAlign;
public ImGuiDir WindowMenuButtonPosition;
public float ChildRounding;
public float ChildBorderSize;
public float PopupRounding;
@ -102,6 +103,7 @@ namespace ImGuiNET
public ref float WindowBorderSize => ref Unsafe.AsRef<float>(&NativePtr->WindowBorderSize);
public ref Vector2 WindowMinSize => ref Unsafe.AsRef<Vector2>(&NativePtr->WindowMinSize);
public ref Vector2 WindowTitleAlign => ref Unsafe.AsRef<Vector2>(&NativePtr->WindowTitleAlign);
public ref ImGuiDir WindowMenuButtonPosition => ref Unsafe.AsRef<ImGuiDir>(&NativePtr->WindowMenuButtonPosition);
public ref float ChildRounding => ref Unsafe.AsRef<float>(&NativePtr->ChildRounding);
public ref float ChildBorderSize => ref Unsafe.AsRef<float>(&NativePtr->ChildBorderSize);
public ref float PopupRounding => ref Unsafe.AsRef<float>(&NativePtr->PopupRounding);

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>A .NET wrapper for the Dear ImGui library.</Description>
<AssemblyVersion>1.70.0</AssemblyVersion>
<AssemblyVersion>1.71.0</AssemblyVersion>
<Authors>Eric Mellino</Authors>
<TargetFramework>netstandard2.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

Loading…
Cancel
Save