Skip to content

Commit 13088e0

Browse files
committed
Added resizing for example d3d11 #34, updated nuget deps
1 parent 730b0e9 commit 13088e0

File tree

6 files changed

+30
-5
lines changed

6 files changed

+30
-5
lines changed

ExampleD3D11/DX11Window.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ private void OnRenderDrawData()
5353
ImGuiImplD3D11.RenderDrawData(ImGui.GetDrawData());
5454
}
5555

56+
protected override void OnResized(ResizedEventArgs resizedEventArgs)
57+
{
58+
d3d11Manager.Resize(resizedEventArgs.Width, resizedEventArgs.Height);
59+
}
60+
5661
public override void Render()
5762
{
5863
imGuiManager.NewFrame();

ExampleFramework/CoreWindow.cs

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,28 @@ internal void Destroy()
7676

7777
internal void ProcessWindowEvent(WindowEvent windowEvent)
7878
{
79-
switch ((WindowEventID)windowEvent.Type)
79+
switch ((WindowEventID)windowEvent.Event)
8080
{
8181
case WindowEventID.Resized:
8282
var oldWidth = this.width;
8383
var oldHeight = this.height;
8484
int width = windowEvent.Data1;
8585
int height = windowEvent.Data2;
86-
Resized?.Invoke(this, new ResizedEventArgs(width, height, oldWidth, oldHeight));
86+
var resizedEventArgs = new ResizedEventArgs(width, height, oldWidth, oldHeight);
8787
this.width = width;
8888
this.height = height;
89+
OnResized(resizedEventArgs);
90+
if (!resizedEventArgs.Handled)
91+
{
92+
Resized?.Invoke(this, resizedEventArgs);
93+
}
94+
else
95+
{
96+
sdl.SetWindowSize(window, oldWidth, oldHeight);
97+
this.width = oldWidth;
98+
this.height = oldHeight;
99+
}
100+
89101
break;
90102

91103
case WindowEventID.Close:
@@ -101,6 +113,10 @@ internal void ProcessWindowEvent(WindowEvent windowEvent)
101113
}
102114
}
103115

116+
protected virtual void OnResized(ResizedEventArgs resizedEventArgs)
117+
{
118+
}
119+
104120
public virtual void InitGraphics()
105121
{
106122
}

ExampleFramework/ExampleFramework.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16+
<PackageReference Include="Hexa.NET.DebugDraw" Version="2.3.2" />
1617
<PackageReference Include="Silk.NET.SDL" Version="2.22.0" />
17-
<PackageReference Include="Hexa.NET.Utilities" Version="2.1.14" />
18+
<PackageReference Include="Hexa.NET.Utilities" Version="2.2.1" />
1819
<PackageReference Include="Hexa.NET.Math" Version="2.0.3" />
20+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
1921
</ItemGroup>
2022

2123
<ItemGroup>

ExampleFramework/ResizedEventArgs.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@ public ResizedEventArgs(int width, int height, int oldWidth, int oldHeight)
1919
public int OldWidth { get; }
2020

2121
public int OldHeight { get; }
22+
23+
public bool Handled { get; set; }
2224
}
2325
}

ExampleGLFWD3D11/ExampleGLFWD3D11.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Hexa.NET.ImGui.Widgets" Version="1.1.18" />
14-
<PackageReference Include="Hexa.NET.Utilities" Version="2.1.14" />
14+
<PackageReference Include="Hexa.NET.Utilities" Version="2.2.1" />
1515
<PackageReference Include="Hexa.NET.GLFW" Version="1.0.4" />
1616
<PackageReference Include="Silk.NET.Direct3D.Compilers" Version="2.22.0" />
1717
<PackageReference Include="Silk.NET.Direct3D11" Version="2.22.0" />

ExampleGLFWOpenGL3/ExampleGLFWOpenGL3.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<PackageReference Include="Hexa.NET.GLFW" Version="1.0.4" />
1414
<PackageReference Include="Hexa.NET.ImGui.Widgets" Version="1.1.18" />
15-
<PackageReference Include="Hexa.NET.Utilities" Version="2.1.14" />
15+
<PackageReference Include="Hexa.NET.Utilities" Version="2.2.1" />
1616
<PackageReference Include="Hexa.NET.OpenGL3" Version="1.1.0" />
1717
</ItemGroup>
1818

0 commit comments

Comments
 (0)