Skip to content

Commit 06c2b88

Browse files
RedImp1470RedImp1470
committed
Merge branch 'housekeeping' into develop
2 parents bf44908 + 124670f commit 06c2b88

19 files changed

+39
-39
lines changed

‎Examples/Complete/Camera/Blazor/Fusee.Examples.Camera.Blazor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.12" />
1515
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.1" PrivateAssets="all" />
1616
</ItemGroup>
1717

‎Examples/Complete/Deferred/Blazor/Fusee.Examples.Deferred.Blazor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.12" />
1515
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.1" PrivateAssets="all" />
1616
</ItemGroup>
1717

‎Examples/Complete/ImGui/Desktop/ImGuiApp.cs

+7-6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ private async void Load()
3434
{
3535
SetImGuiDesign();
3636

37+
// Enable Dockspace
38+
ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.DockingEnable;
39+
3740
_fuControl = new SceneToTexture(RC);
3841
_fuControl.Init();
3942

@@ -68,9 +71,6 @@ public override void Resize(ResizeEventArgs e)
6871

6972
public override void RenderAFrame()
7073
{
71-
// Enable Dockspace
72-
ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.DockingEnable;
73-
7474
// Set Window flags for Dockspace
7575
var wndDockspaceFlags =
7676
ImGuiWindowFlags.NoDocking
@@ -126,8 +126,9 @@ public override void RenderAFrame()
126126
// check if mouse is inside window, if true, accept update() inputs
127127
_isMouseInsideFuControl = ImGui.IsItemHovered();
128128

129-
ImGui.EndChild();
130-
ImGui.End();
129+
ImGui.EndChild(); //GameRender
130+
ImGui.End(); //Viewport
131+
ImGui.End(); //DockSpace
131132

132133
ImGui.Begin("ImageWnd");
133134

@@ -316,7 +317,7 @@ internal static void SetImGuiDesign()
316317
colors[(int)ImGuiCol.TextSelectedBg] = new Vector4(0.26f, 0.59f, 0.98f, 0.35f);
317318
//colors[(int)ImGuiCol.ModalWindowDarkening] = new Vector4(0.20f, 0.20f, 0.20f, 0.35f);
318319
colors[(int)ImGuiCol.DragDropTarget] = new Vector4(0.26f, 0.59f, 0.98f, 0.95f);
319-
colors[(int)ImGuiCol.NavHighlight] = colors[(int)ImGuiCol.HeaderHovered];
320+
//colors[(int)ImGuiCol.NavHighlight] = colors[(int)ImGuiCol.HeaderHovered];
320321
colors[(int)ImGuiCol.NavWindowingHighlight] = new Vector4(0.70f, 0.70f, 0.70f, 0.70f);
321322

322323
colors[(int)ImGuiCol.TableBorderLight] = new Vector4(0.70f, 0.70f, 0.70f, 0.70f);

‎Examples/Complete/Picking/Blazor/Fusee.Examples.Picking.Blazor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.12" />
1515
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.1" PrivateAssets="all" />
1616
</ItemGroup>
1717

‎Examples/Complete/PickingRayCast/Blazor/Fusee.Examples.PickingRayCast.Blazor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.12" />
1515
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.1" PrivateAssets="all" />
1616
</ItemGroup>
1717

‎Examples/Complete/PointCloudPotree2/ImGui/ImGuiApp.cs

+9-8
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ public override async Task InitAsync()
5151
{
5252
SetImGuiDesign();
5353

54+
// Enable Dockspace
55+
ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.DockingEnable;
56+
5457
_fuControl = new PointCloudRenderingControl(RC);
5558
ApplicationIsShuttingDown += OnShuttingDown;
5659
EndOfFrame += _fuControl.OnLoadNewFile;
@@ -86,12 +89,9 @@ public override void Resize(ResizeEventArgs e)
8689

8790
public override void RenderAFrame()
8891
{
89-
// Enable Dockspace
90-
ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.DockingEnable;
91-
9292
// Set Window flags for Dockspace
93-
var wndDockspaceFlags =
94-
ImGuiWindowFlags.NoDocking
93+
var wndDockspaceFlags =
94+
ImGuiWindowFlags.NoDocking
9595
| ImGuiWindowFlags.NoTitleBar
9696
| ImGuiWindowFlags.NoCollapse
9797
| ImGuiWindowFlags.NoResize
@@ -148,8 +148,9 @@ public override void RenderAFrame()
148148
// check if mouse is inside window, if true, accept update() inputs
149149
_isMouseInsideFuControl = ImGui.IsItemHovered();
150150

151-
ImGui.EndChild();
152-
ImGui.End();
151+
ImGui.EndChild(); // GameRender
152+
ImGui.End(); // Viewport
153+
ImGui.End(); // DockSpace
153154

154155
Draw();
155156
DrawFilePickerDialog();
@@ -382,7 +383,7 @@ private static void SetImGuiDesign()
382383
colors[(int)ImGuiCol.TextSelectedBg] = new Vector4(0.26f, 0.59f, 0.98f, 0.35f);
383384
//colors[(int)ImGuiCol.ModalWindowDarkening] = new Vector4(0.20f, 0.20f, 0.20f, 0.35f);
384385
colors[(int)ImGuiCol.DragDropTarget] = new Vector4(0.26f, 0.59f, 0.98f, 0.95f);
385-
colors[(int)ImGuiCol.NavHighlight] = colors[(int)ImGuiCol.HeaderHovered];
386+
//colors[(int)ImGuiCol.NavHighlight] = colors[(int)ImGuiCol.HeaderHovered];
386387
colors[(int)ImGuiCol.NavWindowingHighlight] = new Vector4(0.70f, 0.70f, 0.70f, 0.70f);
387388
}
388389
}

‎Examples/Complete/RenderContextOnly/Blazor/Fusee.Examples.RenderContextOnly.Blazor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.12" />
1515
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.1" PrivateAssets="all" />
1616
</ItemGroup>
1717

‎Examples/Complete/Simple/Blazor/Fusee.Examples.Simple.Blazor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.12" />
1515
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.1" PrivateAssets="all" />
1616
</ItemGroup>
1717

‎src/Base/Core/Fusee.Base.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PrivateAssets>analyzers</PrivateAssets>
1717
</ProjectReference>
1818

19-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.1" />
2020
<PackageReference Include="SixLabors.Fonts" Version="2.0.8" />
2121
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
2222
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.5" />

‎src/Base/Imp/Blazor/Fusee.Base.Imp.Blazor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<ProjectReference Include="$(FuseeEngineRoot)\src\Base\Core\Fusee.Base.Core.csproj">
1717
<PrivateAssets>analyzers</PrivateAssets>
1818
</ProjectReference>
19-
<PackageReference Include="Microsoft.JSInterop" Version="8.0.11" />
19+
<PackageReference Include="Microsoft.JSInterop" Version="8.0.12" />
2020
</ItemGroup>
2121
</Project>

‎src/Engine/Imp/Graphics/Blazor/Fusee.Engine.Imp.Graphics.Blazor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Core\Fusee.Engine.Core.csproj">
2424
<PrivateAssets>analyzers</PrivateAssets>
2525
</ProjectReference>
26-
<PackageReference Include="Microsoft.JSInterop" Version="8.0.11" />
26+
<PackageReference Include="Microsoft.JSInterop" Version="8.0.12" />
2727
</ItemGroup>
2828

2929
<Import Project="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\SharedAll\Fusee.Engine.Imp.Graphics.SharedAll.projitems" Label="Shared" />

‎src/Engine/Player/Blazor/Fusee.Engine.Player.Blazor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.12" />
1515
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.1" PrivateAssets="all" />
1616
</ItemGroup>
1717

‎src/ImGui/Desktop/Fusee.ImGui.Desktop/Fusee.ImGuiImp.Desktop.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="ImGui.NET" Version="1.91.0.1" />
16+
<PackageReference Include="ImGui.NET" Version="1.91.6.1" />
1717
</ItemGroup>
1818

1919
</Project>

‎src/ImGui/Desktop/Fusee.ImGui.Desktop/ImGuiInputImp.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,7 @@ public static void InitImGuiInput(GameWindow gw)
221221
if (_hndl.Target != null)
222222
{
223223
/// overwrite clipboard copy (Strg+C). Use OpenTK <see cref="GameWindow"/> implementation
224-
io.SetClipboardTextFn =
225-
Marshal.GetFunctionPointerForDelegate<SetClipboardTextFn>((SetClipboardTextFn)_hndl.Target);
224+
//io.SetClipboardTextFn = Marshal.GetFunctionPointerForDelegate<SetClipboardTextFn>((SetClipboardTextFn)_hndl.Target);
226225
}
227226

228227
Input.Keyboard.ButtonValueChanged += (s, e) =>

‎src/ImGui/Desktop/Fusee.ImGui.Desktop/ImGuiRenderCanvasImp.cs

+7-8
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,20 @@ public override void DoUpdate()
7070
if (!_initialized) return;
7171
if (_isShuttingDown) return;
7272

73-
// HACK(mr): Fixme, don't know why
74-
//Input.Instance.PreUpdate();
75-
76-
base.DoUpdate();
77-
_controller.UpdateImGui(DeltaTimeUpdate);
78-
79-
//Input.Instance.PostUpdate();
73+
// Check if window is minimized - else imgui will throw an assert:
74+
// ((g.FrameCount == 0 || g.FrameCountEnded == g.FrameCount) && "Forgot to call Render() or EndFrame() at the end of the previous frame?"
75+
if (Width > 0 && Height > 0)
76+
{
77+
base.DoUpdate();
78+
_controller.UpdateImGui(DeltaTimeUpdate);
79+
}
8080
}
8181

8282
public override void DoRender()
8383
{
8484
if (!_initialized) return;
8585
if (_controller.GameWindowWidth <= 0) return;
8686
if (_isShuttingDown) return;
87-
8887
Input.Instance.PreUpdate();
8988

9089
base.DoRender();

‎src/Math/Core/Fusee.Math.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
16-
<PackageReference Include="protobuf-net" Version="3.2.45" />
16+
<PackageReference Include="protobuf-net" Version="3.2.46" />
1717
</ItemGroup>
1818

1919
</Project>

‎src/Serialization/Fusee.Serialization.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PrivateAssets>analyzers</PrivateAssets>
2020
</ProjectReference>
2121

22-
<PackageReference Include="protobuf-net" Version="3.2.45" />
22+
<PackageReference Include="protobuf-net" Version="3.2.46" />
2323
</ItemGroup>
2424

2525
</Project>

‎src/Tests/Render/Desktop/Fusee.Tests.Render.Desktop.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
3030
<PackageReference Include="NUnit" Version="4.3.2" />
3131
<PackageReference Include="NUnitLite" Version="4.3.2" />
32-
<PackageReference Include="NUnit.Analyzers" Version="4.4.0">
32+
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
3333
<PrivateAssets>all</PrivateAssets>
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3535
</PackageReference>

‎src/Tests/Serialization/V1/Fusee.Tests.Serialization.V1.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>
18-
<PackageReference Include="protobuf-net" Version="3.2.45" />
18+
<PackageReference Include="protobuf-net" Version="3.2.46" />
1919
</ItemGroup>
2020
</Project>

0 commit comments

Comments
 (0)