Skip to content

Commit 186cd51

Browse files
committed
Updated to Dear ImGui 1.91.9b and fixed an issue with non internal functions getting classified as such.
1 parent c2d257e commit 186cd51

File tree

242 files changed

+274998
-274955
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+274998
-274955
lines changed

ExampleFramework/ImGuiDemo/OpenFileDialog.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ void Display(string? rel, string str)
271271
selectedFile = file.Filename;
272272
}
273273

274-
if (ImGui.IsItemClicked(0) && ImGuiP.IsMouseDoubleClicked(0))
274+
if (ImGui.IsItemClicked(0) && ImGui.IsMouseDoubleClicked(0))
275275
{
276276
Result = OpenFileResult.Ok;
277277
ImGui.EndChild();

ExampleFramework/ImGuizmoDemo/ImGuizmoDemo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ private void HandleInput()
141141
{
142142
if (ImGui.IsWindowHovered())
143143
{
144-
bool mouseMiddlePressed = ImGuiP.IsMouseDown(ImGuiMouseButton.Middle);
145-
bool lCtrlPressed = ImGuiP.IsKeyPressed(ImGuiKey.LeftCtrl);
144+
bool mouseMiddlePressed = ImGui.IsMouseDown(ImGuiMouseButton.Middle);
145+
bool lCtrlPressed = ImGui.IsKeyPressed(ImGuiKey.LeftCtrl);
146146
if (mouseMiddlePressed || lCtrlPressed || first)
147147
{
148148
Vector2 delta = Vector2.Zero;

ExampleFramework/NodeEditor/NodeEditor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public void Draw()
180180
{
181181
GetLink(idLink).Destroy();
182182
}
183-
if (ImGuiP.IsKeyPressed(ImGuiKey.Delete))
183+
if (ImGui.IsKeyPressed(ImGuiKey.Delete))
184184
{
185185
int numLinks = ImNodes.NumSelectedLinks();
186186
if (numLinks != 0)

ExampleGLFWD3D11/ExampleGLFWD3D11.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<PackageReference Include="Silk.NET.Direct3D.Compilers" Version="2.22.0" />
1717
<PackageReference Include="Silk.NET.Direct3D11" Version="2.22.0" />
1818
<PackageReference Include="Silk.NET.DXGI" Version="2.22.0" />
19+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
1920
</ItemGroup>
2021

2122

ExampleWin32D3D9/ExampleWin32D3D9.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Silk.NET.Direct3D9" Version="2.22.0" />
13+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
1314
</ItemGroup>
1415

1516
<ItemGroup>

Generator/ImGuiDefinitionsPatch.cs

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,24 @@ protected override void PatchCompilation(CsCodeGeneratorConfig settings, CppComp
3636
{
3737
var functionDefinition = imguiDefinitions.Functions[i];
3838

39-
if (generationType != InternalsGenerationType.BothOrDontCare)
39+
for (int j = 0; j < functionDefinition.Overloads.Length; j++)
4040
{
41-
bool isInternal = functionDefinition.Overloads.Any(x => x.Internal);
42-
if (isInternal && generationType == InternalsGenerationType.SkipInternalsMetadata)
43-
{
44-
continue;
45-
}
41+
var overload = functionDefinition.Overloads[j];
4642

47-
if (generationType == InternalsGenerationType.NoInternals && isInternal || generationType == InternalsGenerationType.OnlyInternals && !isInternal)
43+
if (generationType != InternalsGenerationType.BothOrDontCare)
4844
{
49-
// removes internals.
50-
for (int j = 0; j < functionDefinition.Overloads.Length; j++)
45+
bool isInternal = overload.Internal;
46+
if (isInternal && generationType == InternalsGenerationType.SkipInternalsMetadata)
5147
{
52-
var overload = functionDefinition.Overloads[j];
53-
settings.IgnoredFunctions.Add(overload.ExportedName);
48+
continue;
5449
}
5550

56-
continue;
51+
if (generationType == InternalsGenerationType.NoInternals && isInternal || generationType == InternalsGenerationType.OnlyInternals && !isInternal)
52+
{
53+
settings.IgnoredFunctions.Add(overload.ExportedName);
54+
continue;
55+
}
5756
}
58-
}
59-
60-
for (int j = 0; j < functionDefinition.Overloads.Length; j++)
61-
{
62-
var overload = functionDefinition.Overloads[j];
6357

6458
var signature = $"{overload.ReturnType} {overload.FriendlyName} {overload.Args}";
6559
bool useName = false;

0 commit comments

Comments
 (0)