Update to v1.66 of Dear ImGui.

Still marking this as a beta until the final autogen work items are completed.
internals
Eric Mellino 6 years ago
parent 7f9b7d3baa
commit bab93b731c
  1. BIN
      deps/cimgui/linux-x64/cimgui.so
  2. BIN
      deps/cimgui/osx-x64/cimgui.dylib
  3. BIN
      deps/cimgui/win-x64/cimgui.dll
  4. BIN
      deps/cimgui/win-x86/cimgui.dll
  5. 6176
      src/CodeGenerator/definitions.json
  6. 26
      src/CodeGenerator/structs_and_enums.json
  7. 80
      src/ImGui.NET/Generated/ImGui.gen.cs
  8. 6
      src/ImGui.NET/Generated/ImGuiNative.gen.cs
  9. 2
      src/ImGui.NET/Generated/ImGuiTextBuffer.gen.cs
  10. 5
      src/ImGui.NET/Generated/ImGuiWindowFlags.gen.cs
  11. 4
      src/ImGui.NET/ImGui.NET.csproj

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

@ -494,6 +494,11 @@
"name": "ImGuiWindowFlags_AlwaysAutoResize",
"value": "1 << 6"
},
{
"calc_value": 128,
"name": "ImGuiWindowFlags_NoBackground",
"value": "1 << 7"
},
{
"calc_value": 256,
"name": "ImGuiWindowFlags_NoSavedSettings",
@ -501,7 +506,7 @@
},
{
"calc_value": 512,
"name": "ImGuiWindowFlags_NoInputs",
"name": "ImGuiWindowFlags_NoMouseInputs",
"value": "1 << 9"
},
{
@ -554,6 +559,16 @@
"name": "ImGuiWindowFlags_NoNav",
"value": "ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus"
},
{
"calc_value": 43,
"name": "ImGuiWindowFlags_NoDecoration",
"value": "ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse"
},
{
"calc_value": 786944,
"name": "ImGuiWindowFlags_NoInputs",
"value": "ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus"
},
{
"calc_value": 8388608,
"name": "ImGuiWindowFlags_NavFlattened",
@ -1608,8 +1623,8 @@
"name": "IndexAdvanceX"
},
{
"type": "ImVector_unsigned_short",
"template_type": "unsigned short",
"type": "ImVector_ImWchar",
"template_type": "ImWchar",
"name": "IndexLookup"
},
{
@ -1963,6 +1978,11 @@
"type": "ImVector_char",
"template_type": "char",
"name": "Buf"
},
{
"type": "static char",
"size": 1,
"name": "EmptyString[1]"
}
],
"ImGuiStyle": [

@ -3799,6 +3799,11 @@ namespace ImGuiNET
Vector2 ret = ImGuiNative.igGetCursorStartPos();
return ret;
}
public static ImGuiPayloadPtr GetDragDropPayload()
{
ImGuiPayload* ret = ImGuiNative.igGetDragDropPayload();
return new ImGuiPayloadPtr(ret);
}
public static ImDrawDataPtr GetDrawData()
{
ImDrawData* ret = ImGuiNative.igGetDrawData();
@ -7132,14 +7137,14 @@ namespace ImGuiNET
{
ImGuiNative.igSetScrollFromPosY(pos_y, center_y_ratio);
}
public static void SetScrollHere()
public static void SetScrollHereY()
{
float center_y_ratio = 0.5f;
ImGuiNative.igSetScrollHere(center_y_ratio);
ImGuiNative.igSetScrollHereY(center_y_ratio);
}
public static void SetScrollHere(float center_y_ratio)
public static void SetScrollHereY(float center_y_ratio)
{
ImGuiNative.igSetScrollHere(center_y_ratio);
ImGuiNative.igSetScrollHereY(center_y_ratio);
}
public static void SetScrollX(float scroll_x)
{
@ -7422,9 +7427,18 @@ namespace ImGuiNET
else { native_label = null; }
float v_degrees_min = -360.0f;
float v_degrees_max = +360.0f;
byte* native_format;
int format_byteCount = Encoding.UTF8.GetByteCount("%.0f deg");
byte* native_format_stackBytes = stackalloc byte[format_byteCount + 1];
native_format = native_format_stackBytes;
fixed (char* format_ptr = "%.0f deg")
{
int native_format_offset = Encoding.UTF8.GetBytes(format_ptr, "%.0f deg".Length, native_format, format_byteCount);
native_format[native_format_offset] = 0;
}
fixed (float* native_v_rad = &v_rad)
{
byte ret = ImGuiNative.igSliderAngle(native_label, native_v_rad, v_degrees_min, v_degrees_max);
byte ret = ImGuiNative.igSliderAngle(native_label, native_v_rad, v_degrees_min, v_degrees_max, native_format);
return ret != 0;
}
}
@ -7444,9 +7458,18 @@ namespace ImGuiNET
}
else { native_label = null; }
float v_degrees_max = +360.0f;
byte* native_format;
int format_byteCount = Encoding.UTF8.GetByteCount("%.0f deg");
byte* native_format_stackBytes = stackalloc byte[format_byteCount + 1];
native_format = native_format_stackBytes;
fixed (char* format_ptr = "%.0f deg")
{
int native_format_offset = Encoding.UTF8.GetBytes(format_ptr, "%.0f deg".Length, native_format, format_byteCount);
native_format[native_format_offset] = 0;
}
fixed (float* native_v_rad = &v_rad)
{
byte ret = ImGuiNative.igSliderAngle(native_label, native_v_rad, v_degrees_min, v_degrees_max);
byte ret = ImGuiNative.igSliderAngle(native_label, native_v_rad, v_degrees_min, v_degrees_max, native_format);
return ret != 0;
}
}
@ -7465,9 +7488,52 @@ namespace ImGuiNET
}
}
else { native_label = null; }
byte* native_format;
int format_byteCount = Encoding.UTF8.GetByteCount("%.0f deg");
byte* native_format_stackBytes = stackalloc byte[format_byteCount + 1];
native_format = native_format_stackBytes;
fixed (char* format_ptr = "%.0f deg")
{
int native_format_offset = Encoding.UTF8.GetBytes(format_ptr, "%.0f deg".Length, native_format, format_byteCount);
native_format[native_format_offset] = 0;
}
fixed (float* native_v_rad = &v_rad)
{
byte ret = ImGuiNative.igSliderAngle(native_label, native_v_rad, v_degrees_min, v_degrees_max, native_format);
return ret != 0;
}
}
public static bool SliderAngle(string label, ref float v_rad, float v_degrees_min, float v_degrees_max, string format)
{
byte* native_label;
if (label != null)
{
int label_byteCount = Encoding.UTF8.GetByteCount(label);
byte* native_label_stackBytes = stackalloc byte[label_byteCount + 1];
native_label = native_label_stackBytes;
fixed (char* label_ptr = label)
{
int native_label_offset = Encoding.UTF8.GetBytes(label_ptr, label.Length, native_label, label_byteCount);
native_label[native_label_offset] = 0;
}
}
else { native_label = null; }
byte* native_format;
if (format != null)
{
int format_byteCount = Encoding.UTF8.GetByteCount(format);
byte* native_format_stackBytes = stackalloc byte[format_byteCount + 1];
native_format = native_format_stackBytes;
fixed (char* format_ptr = format)
{
int native_format_offset = Encoding.UTF8.GetBytes(format_ptr, format.Length, native_format, format_byteCount);
native_format[native_format_offset] = 0;
}
}
else { native_format = null; }
fixed (float* native_v_rad = &v_rad)
{
byte ret = ImGuiNative.igSliderAngle(native_label, native_v_rad, v_degrees_min, v_degrees_max);
byte ret = ImGuiNative.igSliderAngle(native_label, native_v_rad, v_degrees_min, v_degrees_max, native_format);
return ret != 0;
}
}

@ -207,6 +207,8 @@ namespace ImGuiNET
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl, EntryPoint = "igGetCursorStartPos_nonUDT2")]
public static extern Vector2 igGetCursorStartPos();
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern ImGuiPayload* igGetDragDropPayload();
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern ImDrawData* igGetDrawData();
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern IntPtr igGetDrawListSharedData();
@ -547,7 +549,7 @@ namespace ImGuiNET
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetScrollFromPosY(float pos_y, float center_y_ratio);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetScrollHere(float center_y_ratio);
public static extern void igSetScrollHereY(float center_y_ratio);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetScrollX(float scroll_x);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
@ -587,7 +589,7 @@ namespace ImGuiNET
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igShowUserGuide();
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern byte igSliderAngle(byte* label, float* v_rad, float v_degrees_min, float v_degrees_max);
public static extern byte igSliderAngle(byte* label, float* v_rad, float v_degrees_min, float v_degrees_max, byte* format);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern byte igSliderFloat(byte* label, float* v, float v_min, float v_max, byte* format, float power);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]

@ -8,6 +8,7 @@ namespace ImGuiNET
public unsafe partial struct ImGuiTextBuffer
{
public ImVector Buf;
public static char EmptyString_0;
}
public unsafe partial struct ImGuiTextBufferPtr
{
@ -18,6 +19,7 @@ namespace ImGuiNET
public static implicit operator ImGuiTextBuffer* (ImGuiTextBufferPtr wrappedPtr) => wrappedPtr.NativePtr;
public static implicit operator ImGuiTextBufferPtr(IntPtr nativePtr) => new ImGuiTextBufferPtr(nativePtr);
public ImVector<byte> Buf => new ImVector<byte>(NativePtr->Buf);
public RangeAccessor<static char> EmptyString => new RangeAccessor<static char>(&NativePtr->EmptyString_0, 1);
public void appendf(string fmt)
{
byte* native_fmt;

@ -11,8 +11,9 @@ namespace ImGuiNET
NoScrollWithMouse = 1 << 4,
NoCollapse = 1 << 5,
AlwaysAutoResize = 1 << 6,
NoBackground = 1 << 7,
NoSavedSettings = 1 << 8,
NoInputs = 1 << 9,
NoMouseInputs = 1 << 9,
MenuBar = 1 << 10,
HorizontalScrollbar = 1 << 11,
NoFocusOnAppearing = 1 << 12,
@ -23,6 +24,8 @@ namespace ImGuiNET
NoNavInputs = 1 << 18,
NoNavFocus = 1 << 19,
NoNav = NoNavInputs | NoNavFocus,
NoDecoration = NoTitleBar | NoResize | NoScrollbar | NoCollapse,
NoInputs = NoMouseInputs | NoNavInputs | NoNavFocus,
NavFlattened = 1 << 23,
ChildWindow = 1 << 24,
Tooltip = 1 << 25,

@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>A .NET wrapper for the Dear ImGui library.</Description>
<AssemblyVersion>1.65.0</AssemblyVersion>
<AssemblyVersion>1.66.0</AssemblyVersion>
<Authors>Eric Mellino</Authors>
<TargetFramework>netstandard2.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>portable</DebugType>
<AssemblyName>ImGui.NET</AssemblyName>
<PackageId>ImGui.NET</PackageId>
<PackagePrereleaseIdentifier>-beta4</PackagePrereleaseIdentifier>
<PackagePrereleaseIdentifier>-beta0</PackagePrereleaseIdentifier>
<PackageVersion>$(AssemblyVersion)$(PackagePrereleaseIdentifier)</PackageVersion>
<PackageTags>ImGui ImGui.NET Immediate Mode GUI</PackageTags>
<PackageProjectUrl>https://github.com/mellinoe/imgui.net</PackageProjectUrl>

Loading…
Cancel
Save