Skip to content

Commit

Permalink
Got ImGui update partially working.
Browse files Browse the repository at this point in the history 
Fixed incorrect matching for ImGui.End(Child).
  • Loading branch information
@bryanedds
bryanedds committed Dec 9, 2024
1 parent 0407274 commit 6f24daf
Show file tree
Hide file tree
Showing 18 changed files with 1,079 additions and 1,084 deletions.
2,093 changes: 1,061 additions & 1,032 deletions Nu/Nu.Gaia/Gaia.fs
View file

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions Nu/Nu.Gaia/Nu.Gaia.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="FSharp.Compiler.Service" Version="43.9.100" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Nu/Nu.Pipe/Nu.Pipe.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Nu/Nu.Template.ImNui.Empty/Nu.Template.ImNui.Empty.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Nu/Nu.Template.ImNui.Game/Nu.Template.ImNui.Game.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Nu/Nu.Template.Mmcc.Empty/Nu.Template.Mmcc.Empty.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Nu/Nu.Template.Mmcc.Game/Nu.Template.Mmcc.Game.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Nu/Nu.Tests/Nu.Tests.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
<PackageReference Include="FsCheck" Version="2.16.6" />
<PackageReference Include="FsCheck.NUnit" Version="2.16.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
Expand Down
4 changes: 1 addition & 3 deletions Nu/Nu/Nu.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions Nu/Nu/World/WorldImGui.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ module WorldImGui =
itemOpt|]
let items = Array.definitize itemOpts
ImGui.Unindent ()
ImGui.PopID ()
(changed, items)

/// Edit a list value via ImGui.
Expand Down Expand Up @@ -182,7 +181,6 @@ module WorldImGui =
itemOpt]
let items = List.definitize itemOpts
ImGui.Unindent ()
ImGui.PopID ()
(changed, items)

/// Edit a record value via ImGui, optionally replacing the instructed fields.
Expand Down
4 changes: 1 addition & 3 deletions Projects/Blaze Vector/Blaze Vector.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 2 additions & 4 deletions Projects/Breakout ImNui/Breakout ImNui.fsproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down Expand Up @@ -75,9 +75,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Projects/Breakout Mmcc/Breakout Mmcc.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 2 additions & 4 deletions Projects/Jump Box/Jump Box.fsproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down Expand Up @@ -72,9 +72,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Projects/Metrics/Metrics.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Projects/Nelmish/Nelmish.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Projects/Terra Firma/Terra Firma.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Projects/Twenty 48/Twenty 48.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@
<PackageReference Include="Prime" Version="10.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Twizzle.ImGui.NET" Version="1.91.5" />
<PackageReference Include="Twizzle.ImGuizmo.NET" Version="1.89.4.1" />
<PackageReference Include="Twizzle.ImPlot.NET" Version="1.89.4" />
<PackageReference Include="Twizzle.ImGui-Bundle.NET" Version="1.91.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 6f24daf

Please sign in to comment.